- Table objects declared in the MetaData can now be used

in string expressions sent to primaryjoin/secondaryjoin/
secondary - the name is pulled from the MetaData of the
declarative base.  [ticket:1527]

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py
index c37211ac3..80faea36b 100644
--- a/lib/sqlalchemy/ext/declarative.py
+++ b/lib/sqlalchemy/ext/declarative.py
@@ -600,9 +600,11 @@ def _deferred_relation(cls, prop):
         import sqlalchemy
         
         def access_cls(key):
-            try:
+            if key in cls._decl_class_registry:
                 return _GetColumns(cls._decl_class_registry[key])
-            except KeyError:
+            elif key in cls.metadata.tables:
+                return cls.metadata.tables[key]
+            else:
                 return sqlalchemy.__dict__[key]
 
         d = util.PopulateDict(access_cls)