summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/ext/declarative.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/ext/declarative.py')
-rwxr-xr-xlib/sqlalchemy/ext/declarative.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py
index faf575da1..07a2a3b95 100755
--- a/lib/sqlalchemy/ext/declarative.py
+++ b/lib/sqlalchemy/ext/declarative.py
@@ -1398,6 +1398,10 @@ class _GetTable(object):
def _deferred_relationship(cls, prop):
def resolve_arg(arg):
import sqlalchemy
+ from sqlalchemy.orm import foreign, remote
+
+ fallback = sqlalchemy.__dict__.copy()
+ fallback.update({'foreign':foreign, 'remote':remote})
def access_cls(key):
if key in cls._decl_class_registry:
@@ -1407,7 +1411,7 @@ def _deferred_relationship(cls, prop):
elif key in cls.metadata._schemas:
return _GetTable(key, cls.metadata)
else:
- return sqlalchemy.__dict__[key]
+ return fallback[key]
d = util.PopulateDict(access_cls)
def return_cls():