summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/relationships.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-05-24 11:12:39 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-05-24 11:12:39 -0400
commite2c612d24d714ba2a4fb805d9e7bdb9023dc0af8 (patch)
treee47cf33b84de0f7a0faccf15502ead1f3e842f2a /lib/sqlalchemy/orm/relationships.py
parent33986147a3aff8f10976aabbe860ce3dae8e8ca3 (diff)
downloadsqlalchemy-e2c612d24d714ba2a4fb805d9e7bdb9023dc0af8.tar.gz
get __clause_element__ for remote()/foreign() annotation, [ticket:2493]
Diffstat (limited to 'lib/sqlalchemy/orm/relationships.py')
-rw-r--r--lib/sqlalchemy/orm/relationships.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/relationships.py b/lib/sqlalchemy/orm/relationships.py
index 55c5071df..0fcf04e6e 100644
--- a/lib/sqlalchemy/orm/relationships.py
+++ b/lib/sqlalchemy/orm/relationships.py
@@ -66,7 +66,7 @@ def remote(expr):
* :func:`.remote_foreign`
"""
- return _annotate_columns(expr, {"remote":True})
+ return _annotate_columns(expression._clause_element_as_expr(expr), {"remote":True})
def foreign(expr):
"""Annotate a portion of a primaryjoin expression
@@ -78,7 +78,7 @@ def foreign(expr):
"""
- return _annotate_columns(expr, {"foreign":True})
+ return _annotate_columns(expression._clause_element_as_expr(expr), {"foreign":True})
def remote_foreign(expr):
"""Annotate a portion of a primaryjoin expression