Fixed a regression caused by :ticket:`2410` whereby a

:class:`.CheckConstraint` would apply itself back to the
original table during a :meth:`.Table.tometadata` operation, as
it would parse the SQL expression for a parent table. The
operation now copies the given expression to correspond to the
new table.
[ticket:2633]

diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst
index 31da6d2c5c6376c64f4e64b75ad2e44adce7a3f9..f8cf2c4d72863f6cd0ba247def634cca12f97798 100644 (file)
--- a/doc/build/changelog/changelog_08.rst
+++ b/doc/build/changelog/changelog_08.rst
@@ -6,6 +6,17 @@
 .. changelog::
     :version: 0.8.0b2
 
+    .. change::
+        :tags: sql, bug
+        :tickets: 2633
+
+      Fixed a regression caused by :ticket:`2410` whereby a
+      :class:`.CheckConstraint` would apply itself back to the
+      original table during a :meth:`.Table.tometadata` operation, as
+      it would parse the SQL expression for a parent table. The
+      operation now copies the given expression to correspond to the
+      new table.
+
     .. change::
         :tags: oracle, bug
         :tickets: 2619

diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index 553936299f273a7fed94765a77628ec20b42201d..84d133dad1f63ce711b77370d279ba4729fbd406 100644 (file)
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -659,12 +659,13 @@ class Table(SchemaItem, expression.TableClause):
         args = []
         for c in self.columns:
             args.append(c.copy(schema=schema))
-        for c in self.constraints:
-            args.append(c.copy(schema=schema))
         table = Table(
             self.name, metadata, schema=schema,
             *args, **self.kwargs
             )
+        for c in self.constraints:
+            table.append_constraint(c.copy(schema=schema, target_table=table))
+
         for index in self.indexes:
             # skip indexes that would be generated
             # by the 'index' flag on Column
@@ -2077,7 +2078,8 @@ class CheckConstraint(Constraint):
     """
 
     def __init__(self, sqltext, name=None, deferrable=None,
-                    initially=None, table=None, _create_rule=None):
+                    initially=None, table=None, _create_rule=None,
+                    _autoattach=True):
         """Construct a CHECK constraint.
 
         :param sqltext:
@@ -2102,7 +2104,7 @@ class CheckConstraint(Constraint):
         self.sqltext = expression._literal_as_text(sqltext)
         if table is not None:
             self._set_parent_with_dispatch(table)
-        else:
+        elif _autoattach:
             cols = sqlutil.find_columns(self.sqltext)
             tables = set([c.table for c in cols
                         if c.table is not None])
@@ -2117,12 +2119,23 @@ class CheckConstraint(Constraint):
             return "column_check_constraint"
     __visit_name__ = property(__visit_name__)
 
-    def copy(self, **kw):
-        c = CheckConstraint(self.sqltext,
+    def copy(self, target_table=None, **kw):
+        if target_table is not None:
+            def replace(col):
+                if self.table.c.contains_column(col):
+                    return target_table.c[col.key]
+                else:
+                    return None
+            sqltext = visitors.replacement_traverse(self.sqltext, {}, replace)
+        else:
+            sqltext = self.sqltext
+        c = CheckConstraint(sqltext,
                                 name=self.name,
                                 initially=self.initially,
                                 deferrable=self.deferrable,
-                                _create_rule=self._create_rule)
+                                _create_rule=self._create_rule,
+                                table=target_table,
+                                _autoattach=False)
         c.dispatch._update(self.dispatch)
         return c
 
@@ -2265,10 +2278,10 @@ class ForeignKeyConstraint(Constraint):
             event.listen(table.metadata, "before_drop",
                          DropConstraint(self, on=supports_alter))
 
-    def copy(self, **kw):
+    def copy(self, schema=None, **kw):
         fkc = ForeignKeyConstraint(
                     [x.parent.name for x in self._elements.values()],
-                    [x._get_colspec(**kw) for x in self._elements.values()],
+                    [x._get_colspec(schema=schema) for x in self._elements.values()],
                     name=self.name,
                     onupdate=self.onupdate,
                     ondelete=self.ondelete,

diff --git a/lib/sqlalchemy/util/langhelpers.py b/lib/sqlalchemy/util/langhelpers.py
index f43cb0b3a7416364ba1ec7f5c73b27b0c97ec65f..203b39c37945ca3786f9adfb1899142f1d3b7637 100644 (file)
--- a/lib/sqlalchemy/util/langhelpers.py
+++ b/lib/sqlalchemy/util/langhelpers.py
@@ -303,6 +303,8 @@ def generic_repr(obj, additional_kw=(), to_inspect=None):
     if to_inspect is None:
         to_inspect = obj
 
+    missing = object()
+
     def genargs():
         try:
             (args, vargs, vkw, defaults) = \
@@ -322,16 +324,16 @@ def generic_repr(obj, additional_kw=(), to_inspect=None):
                 yield repr(getattr(obj, arg, None))
             for (arg, defval) in zip(args[-default_len:], defaults):
                 try:
-                    val = getattr(obj, arg, None)
-                    if val != defval:
+                    val = getattr(obj, arg, missing)
+                    if val is not missing and val != defval:
                         yield '%s=%r' % (arg, val)
                 except:
                     pass
         if additional_kw:
             for arg, defval in additional_kw:
                 try:
-                    val = getattr(obj, arg, None)
-                    if val != defval:
+                    val = getattr(obj, arg, missing)
+                    if val is not missing and val != defval:
                         yield '%s=%r' % (arg, val)
                 except:
                     pass

diff --git a/test/sql/test_constraints.py b/test/sql/test_constraints.py
index 261932a7f9ca54bf1188e8306cfe932012fc6cbe..b0ecae791b2655d70e98d5f9877181be6f29b442 100644 (file)
--- a/test/sql/test_constraints.py
+++ b/test/sql/test_constraints.py
@@ -599,6 +599,45 @@ class ConstraintCompilationTest(fixtures.TestBase, AssertsCompiledSQL):
         c = Index('foo', t.c.a)
         assert c in t.indexes
 
+    def test_tometadata_ok(self):
+        m = MetaData()
+
+        t = Table('tbl', m,
+                  Column('a', Integer),
+                  Column('b', Integer)
+        )
+
+        t2 = Table('t2', m,
+                Column('a', Integer),
+                Column('b', Integer)
+        )
+
+        uq = UniqueConstraint(t.c.a)
+        ck = CheckConstraint(t.c.a > 5)
+        fk = ForeignKeyConstraint([t.c.a], [t2.c.a])
+        pk = PrimaryKeyConstraint(t.c.a)
+
+        m2 = MetaData()
+
+        t3 = t.tometadata(m2)
+
+        eq_(len(t3.constraints), 4)
+
+        for c in t3.constraints:
+            assert c.table is t3
+
+    def test_check_constraint_copy(self):
+        m = MetaData()
+        t = Table('tbl', m,
+                  Column('a', Integer),
+                  Column('b', Integer)
+        )
+        ck = CheckConstraint(t.c.a > 5)
+        ck2 = ck.copy()
+        assert ck in t.constraints
+        assert ck2 not in t.constraints
+
+
     def test_ambig_check_constraint_auto_append(self):
         m = MetaData()