Changeset 160
- Timestamp:
- 09/04/07 04:55:51
- Files:
-
- trunk/geniusql/providers/sqlite.py (modified) (1 diff)
- trunk/geniusql/test/test_sqlite.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/geniusql/providers/sqlite.py
r159 r160 13 13 import _sqlite3 as _sqlite 14 14 _version = providers.Version(_sqlite.sqlite_version) 15 _cursor_required = True16 _fetchall_required = True17 _lastrowid_support = True18 15 except ImportError: 19 16 # Use _sqlite directly to avoid all of the DB-API overhead. 20 17 # This will import the "old API for SQLite 3.x", 21 18 # using e.g. pysqlite 1.1.7 22 import _sqlite 23 _version = providers.Version(_sqlite.sqlite_version()) 24 _cursor_required = False 25 _fetchall_required = False 26 _lastrowid_support = False 27 19 try: 20 # Is the single module on the python path? 21 import _sqlite 22 except ImportError: 23 # Try pysqlite2 24 from pysqlite2 import _sqlite 25 _version = _sqlite.sqlite_version 26 if callable(_version): 27 # Newer versions of pysqlite have a string instead of a function. 28 _version = _version() 29 _version = providers.Version(_version) 30 31 _driver_version = providers.Version(getattr(_sqlite, "version", "1")) 32 if _driver_version >= 2: 33 _cursor_required = True 34 _fetchall_required = True 35 _lastrowid_support = True 36 else: 37 _cursor_required = True 38 _fetchall_required = True 39 _lastrowid_support = True 28 40 29 41 # ESCAPE keyword was added Nov 2004, 1 month after 3.0.8 release. trunk/geniusql/test/test_sqlite.py
r159 r160 13 13 # This will import the "old API for SQLite 3.x", 14 14 # using e.g. pysqlite 1.1.7 15 import _sqlite 15 try: 16 # Is the single module on the python path? 17 import _sqlite 18 except ImportError: 19 # Try pysqlite2 20 from pysqlite2 import _sqlite 16 21 except ImportError: 17 22 def run(memonly=False):
