From: Mike Bayer Date: Sat, 28 Jan 2012 20:23:56 +0000 (-0500) Subject: - [bug] removed an erroneous "raise" in the X-Git-Tag: rel_0_7_5~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=feadcfe82304d0950d92ec8150e99e9781ed6349;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - [bug] removed an erroneous "raise" in the SQLite dialect when getting table names and view names, where logic is in place to fall back to an older version of SQLite that doesn't have the "sqlite_temp_master" table. --- diff --git a/CHANGES b/CHANGES index 9c86e50a81..4b58cb4a4c 100644 --- a/CHANGES +++ b/CHANGES @@ -123,6 +123,13 @@ CHANGES - [bug] sql.false() and sql.true() compile to 0 and 1, respectively in sqlite [ticket:2368] + - [bug] removed an erroneous "raise" in the + SQLite dialect when getting table names + and view names, where logic is in place + to fall back to an older version of + SQLite that doesn't have the + "sqlite_temp_master" table. + - mysql - [bug] fixed regexp that filters out warnings for non-reflected "PARTITION" directives, diff --git a/lib/sqlalchemy/dialects/sqlite/base.py b/lib/sqlalchemy/dialects/sqlite/base.py index 06c41b2eef..a82add86c5 100644 --- a/lib/sqlalchemy/dialects/sqlite/base.py +++ b/lib/sqlalchemy/dialects/sqlite/base.py @@ -556,7 +556,6 @@ class SQLiteDialect(default.DefaultDialect): "WHERE type='table' ORDER BY name") rs = connection.execute(s) except exc.DBAPIError: - raise s = ("SELECT name FROM sqlite_master " "WHERE type='table' ORDER BY name") rs = connection.execute(s) @@ -596,7 +595,6 @@ class SQLiteDialect(default.DefaultDialect): "WHERE type='view' ORDER BY name") rs = connection.execute(s) except exc.DBAPIError: - raise s = ("SELECT name FROM sqlite_master " "WHERE type='view' ORDER BY name") rs = connection.execute(s) @@ -621,7 +619,6 @@ class SQLiteDialect(default.DefaultDialect): "AND type='view'") % view_name rs = connection.execute(s) except exc.DBAPIError: - raise s = ("SELECT sql FROM sqlite_master WHERE name = '%s' " "AND type='view'") % view_name rs = connection.execute(s)