From: fulpm <8397318+fulpm@users.noreply.github.com>
Date: Tue, 20 Oct 2020 20:50:16 +0000 (-0400)
Subject: Fixes: #5661 - Correct reflection for composite primary keys in MSSQL
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b568dec7070b4f3ee46a528bdf16fb237baade2a;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Fixes: #5661 - Correct reflection for composite primary keys in MSSQL
---

diff --git a/lib/sqlalchemy/dialects/mssql/base.py b/lib/sqlalchemy/dialects/mssql/base.py
index c8f2b4ca3b..0d4bb5a4c6 100644
--- a/lib/sqlalchemy/dialects/mssql/base.py
+++ b/lib/sqlalchemy/dialects/mssql/base.py
@@ -3177,7 +3177,7 @@ class MSDialect(default.DefaultDialect):
                 C.c.table_name == tablename,
                 C.c.table_schema == owner,
             ),
-        )
+        ).order_by(TC.c.constraint_name, C.c.ordinal_position)
         c = connection.execution_options(future_result=True).execute(s)
         constraint_name = None
         for row in c.mappings():
diff --git a/test/dialect/mssql/test_reflection.py b/test/dialect/mssql/test_reflection.py
index d791e9ec14..edd61fdb3d 100644
--- a/test/dialect/mssql/test_reflection.py
+++ b/test/dialect/mssql/test_reflection.py
@@ -7,6 +7,7 @@ from sqlalchemy import DDL
 from sqlalchemy import event
 from sqlalchemy import exc
 from sqlalchemy import ForeignKey
+from sqlalchemy import ForeignKeyConstraint
 from sqlalchemy import Identity
 from sqlalchemy import Index
 from sqlalchemy import inspect
@@ -241,6 +242,63 @@ class ReflectionTest(fixtures.TestBase, ComparesTables, AssertsCompiledSQL):
             ],
         )
 
+    @testing.provide_metadata
+    def test_pk_fk_column_order(self):
+        # test for issue #5661
+        metadata = self.metadata
+
+        Table(
+            "primary",
+            metadata,
+            Column("id", Integer),
+            Column("attr", Integer),
+            Column("name", types.VARCHAR(20)),
+            PrimaryKeyConstraint("name", "id", "attr", name="primary_pk"),
+            schema=testing.config.test_schema,
+        )
+
+        Table(
+            "foreign",
+            metadata,
+            Column("id", Integer, primary_key=True),
+            Column("pid", Integer),
+            Column("pattr", Integer),
+            Column("pname", types.VARCHAR(20)),
+            ForeignKeyConstraint(
+                ["pname", "pid", "pattr"],
+                [
+                    "%s.primary.name" % testing.config.test_schema,
+                    "%s.primary.id" % testing.config.test_schema,
+                    "%s.primary.attr" % testing.config.test_schema
+                ],
+                name="fk_primary_name_id_attr",
+            ),
+            schema=testing.config.test_schema,
+        )
+
+        metadata.create_all()
+
+        insp = inspect(testing.db)
+        eq_(
+            insp.get_pk_constraint("primary", testing.config.test_schema),
+            {
+                "name": "primary_pk",
+                "constrained_columns": ["name", "id", "attr"],
+            },
+        )
+        eq_(
+            insp.get_foreign_keys("foreign", testing.config.test_schema),
+            [
+                {
+                    "name": "fk_primary_name_id_attr",
+                    "constrained_columns": ["pname", "pid", "pattr"],
+                    "referred_schema": "test_schema",
+                    "referred_table": "primary",
+                    "referred_columns": ["name", "id", "attr"],
+                }
+            ],
+        )
+
     @testing.provide_metadata
     def test_table_name_that_is_greater_than_16_chars(self):
         metadata = self.metadata