diff options
| author | Sean Dunn <sean.dunn@ihsmarkit.com> | 2018-06-29 10:26:57 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2018-06-29 10:52:47 -0400 |
| commit | ca94ea8ab583f8ab366ee5971bfc1bdd96e54cc9 (patch) | |
| tree | a32d239376d13586f8e16db4f123c7a6c6573962 /lib/sqlalchemy | |
| parent | b694a309e89e7c3e57e83dd10e9a75c66672c396 (diff) | |
| download | sqlalchemy-ca94ea8ab583f8ab366ee5971bfc1bdd96e54cc9.tar.gz | |
Add unique_constraint_name to MSSQL FK reflection
Fixed bug in MSSQL reflection where when two same-named tables in different
schemas had same-named primary key constraints, foreign key constraints
referring to one of the tables would have their columns doubled, causing
errors. Pull request courtesy Sean Dunn.
Fixes: #4228
Change-Id: I7dabaaee0944e1030048826ba39fc574b0d63031
Pull-request: https://github.com/zzzeek/sqlalchemy/pull/457
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/dialects/mssql/base.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/mssql/information_schema.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/provision.py | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py index bc3905535..c10b75c02 100644 --- a/lib/sqlalchemy/dialects/mssql/base.py +++ b/lib/sqlalchemy/dialects/mssql/base.py @@ -2251,6 +2251,8 @@ class MSDialect(default.DefaultDialect): C.c.constraint_name == RR.c.constraint_name, R.c.constraint_name == RR.c.unique_constraint_name, + R.c.constraint_schema == + RR.c.unique_constraint_schema, C.c.ordinal_position == R.c.ordinal_position ), order_by=[RR.c.constraint_name, R.c.ordinal_position] diff --git a/lib/sqlalchemy/dialects/mssql/information_schema.py b/lib/sqlalchemy/dialects/mssql/information_schema.py index 103458705..3682fae48 100644 --- a/lib/sqlalchemy/dialects/mssql/information_schema.py +++ b/lib/sqlalchemy/dialects/mssql/information_schema.py @@ -103,6 +103,8 @@ key_constraints = Table("KEY_COLUMN_USAGE", ischema, key="column_name"), Column("CONSTRAINT_NAME", CoerceUnicode, key="constraint_name"), + Column("CONSTRAINT_SCHEMA", CoerceUnicode, + key="constraint_schema"), Column("ORDINAL_POSITION", Integer, key="ordinal_position"), schema="INFORMATION_SCHEMA") diff --git a/lib/sqlalchemy/testing/provision.py b/lib/sqlalchemy/testing/provision.py index 8abfa3301..4c749d382 100644 --- a/lib/sqlalchemy/testing/provision.py +++ b/lib/sqlalchemy/testing/provision.py @@ -369,6 +369,7 @@ def _mssql_create_db(cfg, eng, ident): "ALTER DATABASE %s SET READ_COMMITTED_SNAPSHOT ON" % ident) conn.execute("use %s" % ident) conn.execute("create schema test_schema") + conn.execute("create schema test_schema_2") @_drop_db.for_db("mssql") |