Merge pull request #384 from tonioo/master

Fix query performance when retrieving constraints (avoid full scan).
bernardopires · Sep 23, 2016 · eceab7a · eceab7a
2 parents baf6046 + e431105
commit eceab7a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/tenant_schemas/postgresql_backend/introspection.py b/tenant_schemas/postgresql_backend/introspection.py
@@ -88,14 +88,15 @@ class DatabaseSchemaIntrospection(DatabaseIntrospection):
             AND n.nspname = %(schema)s
     """
 
-    _get_constaints_query = """
+    _get_constraints_query = """
         SELECT
             kc.constraint_name,
             kc.column_name,
             c.constraint_type,
             array(SELECT table_name::text || '.' || column_name::text
                   FROM information_schema.constraint_column_usage
-                  WHERE constraint_name = kc.constraint_name)
+                  WHERE constraint_name = kc.constraint_name
+                  AND table_schema = kc.table_schema)
         FROM information_schema.key_column_usage AS kc
         JOIN information_schema.table_constraints AS c ON
             kc.table_schema = c.table_schema AND
@@ -240,7 +241,7 @@ def get_constraints(self, cursor, table_name):
 
         # Loop over the key table, collecting things as constraints
         # This will get PKs, FKs, and uniques, but not CHECK
-        cursor.execute(self._get_constaints_query, {
+        cursor.execute(self._get_constraints_query, {
             'schema': self.connection.schema_name,
             'table': table_name,
         })