diff options
author | Roman Podolyaka <roman.podolyaka@gmail.com> | 2013-06-22 15:57:03 +0300 |
---|---|---|
committer | Roman Podolyaka <roman.podolyaka@gmail.com> | 2013-06-23 13:35:19 +0300 |
commit | 3a80bf0d504ccc1e198249be27d87a6045c39ee4 (patch) | |
tree | ce02249b36a2583ec4912abb0cf86ec36652d6c2 | |
parent | 1ad06ea42c69c10f18c5d43d4d4a68223cbef52e (diff) | |
download | sqlalchemy-pr/11.tar.gz |
Fix unique constraints reflection in PostgreSQLpr/11
Reflection of unique constraints must preserve the order of columns.
-rw-r--r-- | lib/sqlalchemy/dialects/postgresql/base.py | 25 | ||||
-rw-r--r-- | lib/sqlalchemy/testing/suite/test_reflection.py | 4 |
2 files changed, 18 insertions, 11 deletions
diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py index 16ace0583..9d89fe160 100644 --- a/lib/sqlalchemy/dialects/postgresql/base.py +++ b/lib/sqlalchemy/dialects/postgresql/base.py @@ -205,6 +205,7 @@ underlying CREATE INDEX command, so it *must* be a valid index type for your version of PostgreSQL. """ +from collections import defaultdict import re from ... import sql, schema, exc, util @@ -2010,25 +2011,31 @@ class PGDialect(default.DefaultDialect): UNIQUE_SQL = """ SELECT cons.conname as name, - ARRAY_AGG(a.attname) as column_names + cons.conkey as key, + a.attnum as col_num, + a.attname as col_name FROM pg_catalog.pg_constraint cons - left outer join pg_attribute a - on cons.conrelid = a.attrelid and a.attnum = ANY(cons.conkey) + join pg_attribute a + on cons.conrelid = a.attrelid AND a.attnum = ANY(cons.conkey) WHERE cons.conrelid = :table_oid AND cons.contype = 'u' - GROUP BY - cons.conname """ - t = sql.text(UNIQUE_SQL, - typemap={'column_names': ARRAY(sqltypes.Unicode)}) + t = sql.text(UNIQUE_SQL, typemap={'col_name': sqltypes.Unicode}) c = connection.execute(t, table_oid=table_oid) + uniques = defaultdict(lambda: defaultdict(dict)) + for row in c.fetchall(): + uc = uniques[row.name] + uc["key"] = row.key + uc["cols"][row.col_num] = row.col_name + return [ - {'name': row.name, 'column_names': row.column_names} - for row in c.fetchall() + {'name': name, + 'column_names': [uc["cols"][i] for i in uc["key"]]} + for name, uc in uniques.items() ] def _load_enums(self, connection): diff --git a/lib/sqlalchemy/testing/suite/test_reflection.py b/lib/sqlalchemy/testing/suite/test_reflection.py index 7ab4097a1..255fd5595 100644 --- a/lib/sqlalchemy/testing/suite/test_reflection.py +++ b/lib/sqlalchemy/testing/suite/test_reflection.py @@ -370,9 +370,9 @@ class ComponentReflectionTest(fixtures.TablesTest): def _test_get_unique_constraints(self, schema=None): uniques = sorted( [ + {'name': 'unique_a', 'column_names': ['a']}, {'name': 'unique_a_b_c', 'column_names': ['a', 'b', 'c']}, - {'name': 'unique_a_c', 'column_names': ['a', 'c']}, - {'name': 'unique_b_c', 'column_names': ['b', 'c']}, + {'name': 'unique_c_a_b', 'column_names': ['c', 'a', 'b']}, {'name': 'unique_asc_key', 'column_names': ['asc', 'key']}, ], key=operator.itemgetter('name') |