summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/util.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/sql/util.py')
-rw-r--r--lib/sqlalchemy/sql/util.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py
index 7bcc8e7d7..1b4bc67fc 100644
--- a/lib/sqlalchemy/sql/util.py
+++ b/lib/sqlalchemy/sql/util.py
@@ -104,6 +104,9 @@ def determine_date_affinity(expr):
left_affin, right_affin = \
determine_date_affinity(expr.left), \
determine_date_affinity(expr.right)
+
+ if left_affin is None or right_affin is None:
+ return None
if operators.is_commutative(expr.operator):
key = tuple(sorted([left_affin, right_affin], key=lambda cls:cls.__name__))