From ebb54d1bc249306a08067cefce93d1676fdb14ba Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 29 Dec 2009 16:19:09 +0000 Subject: merge r6591, r6592 from 0.5 branch for PGInterval etc. /extract --- lib/sqlalchemy/sql/util.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/sqlalchemy/sql/util.py') 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__)) -- cgit v1.2.1