summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2008-11-22 20:37:16 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2008-11-22 20:37:16 +0000
commite7dd4efb3e26d600c38d6e7467a01b72881a8a0d (patch)
tree129c58ddf2ff6d71c89c115b8900a28805f94166 /lib/sqlalchemy
parent2c69cdb3502017d4b3a98d3c32466a95063939f3 (diff)
downloadsqlalchemy-e7dd4efb3e26d600c38d6e7467a01b72881a8a0d.tar.gz
- Extra checks added to ensure explicit
primaryjoin/secondaryjoin are ClauseElement instances, to prevent more confusing errors later on.
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/properties.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index dbc3430a0..bd493aaf2 100644
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -601,6 +601,7 @@ class PropertyLoader(StrategizedProperty):
for attr in ('primaryjoin', 'secondaryjoin'):
val = getattr(self, attr)
if val:
+ util.assert_arg_type(val, sql.ClauseElement, attr)
setattr(self, attr, _orm_deannotate(val))
if self.order_by: