From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 3 Jun 2013 20:40:59 +0000 (-0400)
Subject: Fixed bug whereby using :meth:`.MetaData.reflect` across a remote
X-Git-Tag: rel_0_8_2~61
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f38e2aa46064f4a29600c3871758d63f3fa87595;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Fixed bug whereby using :meth:`.MetaData.reflect` across a remote
schema as well as a local schema could produce wrong results
in the case where both schemas had a table of the same name.
[ticket:2728]

Conflicts:
	doc/build/changelog/changelog_09.rst
	lib/sqlalchemy/schema.py
---

diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst
index 7e8e618a4e..ed633ec676 100644
--- a/doc/build/changelog/changelog_08.rst
+++ b/doc/build/changelog/changelog_08.rst
@@ -6,6 +6,14 @@
 .. changelog::
     :version: 0.8.2
 
+    .. change::
+        :tags: bug, sql, reflection
+        :tickets: 2728
+
+        Fixed bug whereby using :meth:`.MetaData.reflect` across a remote
+        schema as well as a local schema could produce wrong results
+        in the case where both schemas had a table of the same name.
+
     .. change::
         :tags: bug, sql
         :tickets: 2726
diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index f894e6c31c..d0964c37ac 100644
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -2723,13 +2723,22 @@ class MetaData(SchemaItem):
                     bind.dialect.get_view_names(conn, schema)
                 )
 
-            current = set(self.tables.iterkeys())
+            if schema is not None:
+                available_w_schema = util.OrderedSet(["%s.%s" % (schema, name)
+                                        for name in available])
+            else:
+                available_w_schema = available
+
+            current = set(self.tables)
 
             if only is None:
-                load = [name for name in available if name not in current]
+                load = [name for name, schname in
+                            zip(available, available_w_schema)
+                            if schname not in current]
             elif util.callable(only):
-                load = [name for name in available
-                    if name not in current and only(name, self)]
+                load = [name for name, schname in
+                            zip(available, available_w_schema)
+                            if schname not in current and only(name, self)]
             else:
                 missing = [name for name in only if name not in available]
                 if missing:
diff --git a/test/engine/test_reflection.py b/test/engine/test_reflection.py
index a2f6b37962..066dbf0b3e 100644
--- a/test/engine/test_reflection.py
+++ b/test/engine/test_reflection.py
@@ -1243,6 +1243,30 @@ class SchemaTest(fixtures.TestBase):
                 'test_schema.email_addresses'])
         )
 
+    @testing.requires.schemas
+    @testing.provide_metadata
+    def test_reflect_all_schemas_default_overlap(self):
+        t1 = Table('t', self.metadata,
+                Column('id', Integer, primary_key=True))
+
+        t2 = Table('t', self.metadata,
+            Column('id1', sa.ForeignKey('t.id')),
+            schema="test_schema"
+        )
+
+        self.metadata.create_all()
+        m2 = MetaData()
+        m2.reflect(testing.db, schema="test_schema")
+
+        m3 = MetaData()
+        m3.reflect(testing.db)
+        m3.reflect(testing.db, schema="test_schema")
+
+        eq_(
+            set((t.name, t.schema) for t in m2.tables.values()),
+            set((t.name, t.schema) for t in m3.tables.values())
+        )
+