1 files changed, 66 insertions, 1 deletions
diff --git a/test/sql/test_ddlemit.py b/test/sql/test_ddlemit.py
index 825f8228b..e191beed3 100644
--- a/test/sql/test_ddlemit.py
+++ b/test/sql/test_ddlemit.py
@@ -1,6 +1,6 @@
 from sqlalchemy.testing import fixtures
 from sqlalchemy.sql.ddl import SchemaGenerator, SchemaDropper
-from sqlalchemy import MetaData, Table, Column, Integer, Sequence
+from sqlalchemy import MetaData, Table, Column, Integer, Sequence, ForeignKey
 from sqlalchemy import schema
 from sqlalchemy.testing.mock import Mock
 
@@ -42,6 +42,31 @@ class EmitDDLTest(fixtures.TestBase):
             for i in range(1, 6)
         )
 
+    def _use_alter_fixture_one(self):
+        m = MetaData()
+
+        t1 = Table(
+            't1', m, Column('id', Integer, primary_key=True),
+            Column('t2id', Integer, ForeignKey('t2.id'))
+        )
+        t2 = Table(
+            't2', m, Column('id', Integer, primary_key=True),
+            Column('t1id', Integer, ForeignKey('t1.id'))
+        )
+        return m, t1, t2
+
+    def _fk_fixture_one(self):
+        m = MetaData()
+
+        t1 = Table(
+            't1', m, Column('id', Integer, primary_key=True),
+            Column('t2id', Integer, ForeignKey('t2.id'))
+        )
+        t2 = Table(
+            't2', m, Column('id', Integer, primary_key=True),
+        )
+        return m, t1, t2
+
     def _table_seq_fixture(self):
         m = MetaData()
 
@@ -172,6 +197,32 @@ class EmitDDLTest(fixtures.TestBase):
 
         self._assert_drop_tables([t1, t2, t3, t4, t5], generator, m)
 
+    def test_create_metadata_auto_alter_fk(self):
+        m, t1, t2 = self._use_alter_fixture_one()
+        generator = self._mock_create_fixture(
+            False, [t1, t2]
+        )
+        self._assert_create_w_alter(
+            [t1, t2] +
+            list(t1.foreign_key_constraints) +
+            list(t2.foreign_key_constraints),
+            generator,
+            m
+        )
+
+    def test_create_metadata_inline_fk(self):
+        m, t1, t2 = self._fk_fixture_one()
+        generator = self._mock_create_fixture(
+            False, [t1, t2]
+        )
+        self._assert_create_w_alter(
+            [t1, t2] +
+            list(t1.foreign_key_constraints) +
+            list(t2.foreign_key_constraints),
+            generator,
+            m
+        )
+
     def _assert_create_tables(self, elements, generator, argument):
         self._assert_ddl(schema.CreateTable, elements, generator, argument)
 
@@ -188,6 +239,16 @@ class EmitDDLTest(fixtures.TestBase):
             (schema.DropTable, schema.DropSequence),
             elements, generator, argument)
 
+    def _assert_create_w_alter(self, elements, generator, argument):
+        self._assert_ddl(
+            (schema.CreateTable, schema.CreateSequence, schema.AddConstraint),
+            elements, generator, argument)
+
+    def _assert_drop_w_alter(self, elements, generator, argument):
+        self._assert_ddl(
+            (schema.DropTable, schema.DropSequence, schema.DropConstraint),
+            elements, generator, argument)
+
     def _assert_ddl(self, ddl_cls, elements, generator, argument):
         generator.traverse_single(argument)
         for call_ in generator.connection.execute.mock_calls:
@@ -196,4 +257,8 @@ class EmitDDLTest(fixtures.TestBase):
             assert c.element in elements, "element %r was not expected"\
                 % c.element
             elements.remove(c.element)
+            if getattr(c, 'include_foreign_key_constraints', None) is not None:
+                elements[:] = [
+                    e for e in elements
+                    if e not in set(c.include_foreign_key_constraints)]
         assert not elements, "elements remain in list: %r" % elements