From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 23 Sep 2012 16:42:38 +0000 (-0400)
Subject:   - [feature] An explicit error is raised when
X-Git-Tag: rel_0_8_0b1~137
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e354dd10f8c3cc19e9cb3a6536f98798ba3538f1;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

  - [feature] An explicit error is raised when
    a ForeignKeyConstraint() that was
    constructed to refer to multiple remote tables
    is first used. [ticket:2455]
---

diff --git a/CHANGES b/CHANGES
index 8d5cf36ced..be72bcab75 100644
--- a/CHANGES
+++ b/CHANGES
@@ -587,6 +587,11 @@ underneath "0.7.xx".
     column object itself, consistent with the behavior
     of label(column, None).  [ticket:2168]
 
+  - [feature] An explicit error is raised when
+    a ForeignKeyConstraint() that was
+    constructed to refer to multiple remote tables
+    is first used. [ticket:2455]
+
 - sqlite
   - [feature] the SQLite date and time types
     have been overhauled to support a more open
diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index 1c535461a9..fdff37d3fe 100644
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -1391,10 +1391,10 @@ class ForeignKey(SchemaItem):
                 schema = parenttable.metadata.schema
 
             if (len(m) == 1):
-                tname   = m.pop()
+                tname = m.pop()
             else:
                 colname = m.pop()
-                tname   = m.pop()
+                tname = m.pop()
 
             if (len(m) > 0):
                 schema = '.'.join(m)
@@ -1403,11 +1403,24 @@ class ForeignKey(SchemaItem):
                 raise exc.NoReferencedTableError(
                     "Foreign key associated with column '%s' could not find "
                     "table '%s' with which to generate a "
-                    "foreign key to target column '%s'" % (self.parent, tname, colname),
+                    "foreign key to target column '%s'" %
+                    (self.parent, tname, colname),
                     tname)
             table = Table(tname, parenttable.metadata,
                           mustexist=True, schema=schema)
 
+            if not hasattr(self.constraint, '_referred_table'):
+                self.constraint._referred_table = table
+            elif self.constraint._referred_table is not table:
+                raise exc.ArgumentError(
+                    'ForeignKeyConstraint on %s(%s) refers to '
+                    'multiple remote tables: %s and %s' % (
+                    parenttable,
+                    self.constraint._col_description,
+                    self.constraint._referred_table,
+                    table
+                ))
+
             _column = None
             if colname is None:
                 # colname is None in the case that ForeignKey argument
@@ -2167,6 +2180,10 @@ class ForeignKeyConstraint(Constraint):
             self._set_parent_with_dispatch(columns[0].table)
 
 
+    @property
+    def _col_description(self):
+        return ", ".join(self._elements)
+
     @property
     def columns(self):
         return self._elements.keys()
@@ -2177,6 +2194,7 @@ class ForeignKeyConstraint(Constraint):
 
     def _set_parent(self, table):
         super(ForeignKeyConstraint, self)._set_parent(table)
+
         for col, fk in self._elements.iteritems():
             # string-specified column names now get
             # resolved to Column objects
diff --git a/test/sql/test_metadata.py b/test/sql/test_metadata.py
index 3891f58c69..c7321d7d96 100644
--- a/test/sql/test_metadata.py
+++ b/test/sql/test_metadata.py
@@ -1057,6 +1057,34 @@ class ConstraintTest(fixtures.TestBase):
         assert s1.c.a.references(t1.c.a)
         assert not s1.c.a.references(t1.c.b)
 
+    def test_invalid_composite_fk_check(self):
+        m = MetaData()
+        t1 = Table('t1', m, Column('x', Integer), Column('y', Integer),
+            ForeignKeyConstraint(['x', 'y'], ['t2.x', 't3.y'])
+        )
+        t2 = Table('t2', m, Column('x', Integer))
+        t3 = Table('t3', m, Column('y', Integer))
+
+        assert_raises_message(
+            exc.ArgumentError,
+            r"ForeignKeyConstraint on t1\(x, y\) refers to "
+                "multiple remote tables: t2 and t3",
+            t1.join, t2
+        )
+        assert_raises_message(
+            exc.ArgumentError,
+            r"ForeignKeyConstraint on t1\(x, y\) refers to "
+                "multiple remote tables: t2 and t3",
+            t1.join, t3
+        )
+
+        assert_raises_message(
+            exc.ArgumentError,
+            r"ForeignKeyConstraint on t1\(x, y\) refers to "
+                "multiple remote tables: t2 and t3",
+            schema.CreateTable(t1).compile
+        )
+
 class ColumnDefinitionTest(AssertsCompiledSQL, fixtures.TestBase):
     """Test Column() construction."""