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]

1 files changed, 12 insertions, 3 deletions

diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index 3a74cbd59..3d59e8291 100644
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -2711,13 +2711,22 @@ class MetaData(SchemaItem):
                     bind.dialect.get_view_names(conn, schema)
                 )
 
+            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: