Fix quoting schemas in _get_table_sql for the SQLite backend

Fixed issue where the "schema" name used for a SQLite database within table
reflection would not quote the schema name correctly.  Pull request
courtesy Phillip Cloud.

Change-Id: I2770788c1f094a7743209250ec26b5ef5fb2d9e8
Pull-request: https://github.com/zzzeek/sqlalchemy/pull/463
(cherry picked from commit 893eac06e511f3765c0c89bab76d7933d83ffccc)

diff --git a/doc/build/changelog/unreleased_12/pr824.rst b/doc/build/changelog/unreleased_12/pr824.rst
new file mode 100644 (file)
index 0000000..a78bf24
--- /dev/null
+++ b/doc/build/changelog/unreleased_12/pr824.rst
@@ -0,0 +1,6 @@
+.. change::
+    :tag: bug, sqlite
+
+    Fixed issue where the "schema" name used for a SQLite database within table
+    reflection would not quote the schema name correctly.  Pull request
+    courtesy Phillip Cloud.

diff --git a/lib/sqlalchemy/dialects/sqlite/base.py b/lib/sqlalchemy/dialects/sqlite/base.py
index 5117025fb0bf2e78768794e9ea09aa11670b54ab..6e0d430ced50e19318d427a8989058cacb09e417 100644 (file)
--- a/lib/sqlalchemy/dialects/sqlite/base.py
+++ b/lib/sqlalchemy/dialects/sqlite/base.py
@@ -1543,20 +1543,25 @@ class SQLiteDialect(default.DefaultDialect):
 
     @reflection.cache
     def _get_table_sql(self, connection, table_name, schema=None, **kw):
+        if schema:
+            schema_expr = "%s." % (
+                self.identifier_preparer.quote_identifier(schema))
+        else:
+            schema_expr = ""
         try:
             s = ("SELECT sql FROM "
                  " (SELECT * FROM %(schema)ssqlite_master UNION ALL "
                  "  SELECT * FROM %(schema)ssqlite_temp_master) "
                  "WHERE name = '%(table)s' "
                  "AND type = 'table'" % {
-                     "schema": ("%s." % schema) if schema else "",
+                     "schema": schema_expr,
                      "table": table_name})
             rs = connection.execute(s)
         except exc.DBAPIError:
             s = ("SELECT sql FROM %(schema)ssqlite_master "
                  "WHERE name = '%(table)s' "
                  "AND type = 'table'" % {
-                     "schema": ("%s." % schema) if schema else "",
+                     "schema": schema_expr,
                      "table": table_name})
             rs = connection.execute(s)
         return rs.scalar()

diff --git a/test/dialect/test_sqlite.py b/test/dialect/test_sqlite.py
index d2d563208e77f9c4937c9f0f4b74eecaddfb681f..230361f65850f475171239815e3ddee7a0bcf6ec 100644 (file)
--- a/test/dialect/test_sqlite.py
+++ b/test/dialect/test_sqlite.py
@@ -1065,6 +1065,31 @@ class ReflectHeadlessFKsTest(fixtures.TestBase):
         assert b.c.id.references(a.c.id)
 
 
+class KeywordInDatabaseNameTest(fixtures.TestBase):
+    __only_on__ = 'sqlite'
+
+    @classmethod
+    def setup_class(cls):
+        with testing.db.begin() as conn:
+            conn.execute("ATTACH %r AS \"default\"" % conn.engine.url.database)
+            conn.execute('CREATE TABLE "default".a (id INTEGER PRIMARY KEY)')
+
+    @classmethod
+    def teardown_class(cls):
+        with testing.db.begin() as conn:
+            try:
+                conn.execute('drop table "default".a')
+            except Exception:
+                pass
+            conn.execute('DETACH DATABASE "default"')
+
+    def test_reflect(self):
+        with testing.db.begin() as conn:
+            meta = MetaData(bind=conn, schema='default')
+            meta.reflect()
+            assert 'default.a' in meta.tables
+
+
 class ConstraintReflectionTest(fixtures.TestBase):
     __only_on__ = 'sqlite'