Changeset 3830

Timestamp:

10/03/06 12:29:10 (3 years ago)

Author:

cboos

Message:

Experimental support for pooling pysqlite2 connections, if the SQLite engine used is recent enough to support that (see  SQLite Multi Threading and #3446).

Files:

• trunk/trac/db/sqlite_backend.py (modified) (3 diffs)

trunk/trac/db/sqlite_backend.py

@@ -135 +135 @@
 
     __slots__ = ['_active_cursors']
-    poolable = False
+    poolable = have_pysqlite and sqlite_version >= 30301
 
     def __init__(self, path, params={}):
@@ -148 +148 @@
                    not os.access(dbdir, os.R_OK + os.W_OK):
                 from getpass import getuser
-                raise TracError, 'The user %s requires read _and_ write ' \
-                                 'permission to the database file %s and the ' \
-                                 'directory it is located in.' \
-                                 % (getuser(), path)
+                raise TracError('The user %s requires read _and_ write ' \
+                                'permission to the database file %s and the ' \
+                                'directory it is located in.' \
+                                % (getuser(), path))
 
         if have_pysqlite == 2:
@@ -157 +157 @@
             timeout = int(params.get('timeout', 10.0))
             cnx = sqlite.connect(path, detect_types=sqlite.PARSE_DECLTYPES,
+                                 check_same_thread=sqlite_version < 30301,
                                  timeout=timeout)
         else: