summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-01-28 15:23:56 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2012-01-28 15:23:56 -0500
commitfeadcfe82304d0950d92ec8150e99e9781ed6349 (patch)
treec482a57f6a8122e168bf5ba081dae53c27180921
parent45e6875752fcaf7d3a60907959ed9d154cca0d5d (diff)
downloadsqlalchemy-feadcfe82304d0950d92ec8150e99e9781ed6349.tar.gz
- [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.
-rw-r--r--CHANGES7
-rw-r--r--lib/sqlalchemy/dialects/sqlite/base.py3
2 files changed, 7 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 9c86e50a8..4b58cb4a4 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 06c41b2ee..a82add86c 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)