diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-12-29 16:19:09 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2009-12-29 16:19:09 +0000 |
| commit | ebb54d1bc249306a08067cefce93d1676fdb14ba (patch) | |
| tree | 5038045c5021224b9e7532f7b3c9aa4d12342b4c /lib/sqlalchemy/sql/util.py | |
| parent | 67481f534f073015e7fd003111cc1e04028a16c2 (diff) | |
| download | sqlalchemy-ebb54d1bc249306a08067cefce93d1676fdb14ba.tar.gz | |
merge r6591, r6592 from 0.5 branch for PGInterval etc. /extract
Diffstat (limited to 'lib/sqlalchemy/sql/util.py')
| -rw-r--r-- | lib/sqlalchemy/sql/util.py | 3 |
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__)) |