diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-03-17 15:09:49 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-03-17 15:09:49 +0000 |
| commit | 3ecf84f5adb428f814cd18b47ac65d133112cbf0 (patch) | |
| tree | 98e0384b23f941331584c2d4af62059d36708cdd /lib | |
| parent | 53deb98918263cd0a89d1a0aeb73f7010d8907bf (diff) | |
| download | sqlalchemy-3ecf84f5adb428f814cd18b47ac65d133112cbf0.tar.gz | |
- Fixed SQLite reflection methods so that non-present
cursor.description, which triggers an auto-cursor
close, will be detected so that no results doesn't
fail on recent versions of pysqlite which raise
an error when fetchone() called with no rows present.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/databases/sqlite.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py index 8b46132f3..77eb30ff8 100644 --- a/lib/sqlalchemy/databases/sqlite.py +++ b/lib/sqlalchemy/databases/sqlite.py @@ -439,7 +439,8 @@ class SQLiteDialect(default.DefaultDialect): else: pragma = "PRAGMA " qtable = quote(table_name) - cursor = connection.execute("%stable_info(%s)" % (pragma, qtable)) + cursor = _pragma_cursor(connection.execute("%stable_info(%s)" % (pragma, qtable))) + row = cursor.fetchone() # consume remaining rows, to work around @@ -457,7 +458,7 @@ class SQLiteDialect(default.DefaultDialect): pragma = "PRAGMA %s." % preparer.quote_identifier(table.schema) qtable = preparer.format_table(table, False) - c = connection.execute("%stable_info(%s)" % (pragma, qtable)) + c = _pragma_cursor(connection.execute("%stable_info(%s)" % (pragma, qtable))) found_table = False while True: row = c.fetchone() @@ -496,7 +497,7 @@ class SQLiteDialect(default.DefaultDialect): if not found_table: raise exc.NoSuchTableError(table.name) - c = connection.execute("%sforeign_key_list(%s)" % (pragma, qtable)) + c = _pragma_cursor(connection.execute("%sforeign_key_list(%s)" % (pragma, qtable))) fks = {} while True: row = c.fetchone() @@ -524,7 +525,7 @@ class SQLiteDialect(default.DefaultDialect): for name, value in fks.iteritems(): table.append_constraint(schema.ForeignKeyConstraint(value[0], value[1], link_to_name=True)) # check for UNIQUE indexes - c = connection.execute("%sindex_list(%s)" % (pragma, qtable)) + c = _pragma_cursor(connection.execute("%sindex_list(%s)" % (pragma, qtable))) unique_indexes = [] while True: row = c.fetchone() @@ -542,7 +543,11 @@ class SQLiteDialect(default.DefaultDialect): break cols.append(row[2]) - +def _pragma_cursor(cursor): + if cursor.closed: + cursor._fetchone_impl = lambda: None + return cursor + class SQLiteCompiler(compiler.DefaultCompiler): functions = compiler.DefaultCompiler.functions.copy() functions.update ( |