summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/properties.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-07-17 20:04:22 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-07-17 20:04:22 -0400
commitde115ae40695d8e9fa6d85c629222bec2ea01ff6 (patch)
tree61cb3580b0b0d98d2740c169034e17863ea3499d /lib/sqlalchemy/orm/properties.py
parent6051636d89d65ea33f7bf52103110ea274bf062a (diff)
downloadsqlalchemy-de115ae40695d8e9fa6d85c629222bec2ea01ff6.tar.gz
- a big renaming of all the _Underscore classes to have
plain names. The old names are still defined for backwards compatibility. - _BindParamClause renamed to BindParameter
Diffstat (limited to 'lib/sqlalchemy/orm/properties.py')
-rw-r--r--lib/sqlalchemy/orm/properties.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index 044ba8e2c..dde0e2908 100644
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -393,7 +393,7 @@ class RelationshipProperty(StrategizedProperty):
or many-to-many context produce a NOT EXISTS clause.
"""
- if isinstance(other, (NoneType, expression._Null)):
+ if isinstance(other, (NoneType, expression.Null)):
if self.property.direction in [ONETOMANY, MANYTOMANY]:
return ~self._criterion_exists()
else:
@@ -691,7 +691,7 @@ class RelationshipProperty(StrategizedProperty):
or many-to-many context produce an EXISTS clause.
"""
- if isinstance(other, (NoneType, expression._Null)):
+ if isinstance(other, (NoneType, expression.Null)):
if self.property.direction == MANYTOONE:
return sql.or_(*[x != None for x in
self.property._calculated_foreign_keys])