From 7d03ca9e86e366c2c369101621d011eb6ee8b2c2 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 24 Feb 2009 11:15:31 +0000 Subject: Fixed #10161 -- Modified evaluation of query expressions to allow for operators that take the form of functions. This is mostly for the benefit of Oracle, but it should prove useful later on. Thanks to Ian for the report and feedback on the fix. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9898 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/sql/expressions.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'django/db/models/sql') diff --git a/django/db/models/sql/expressions.py b/django/db/models/sql/expressions.py index ef9fcb00c3..f011db2165 100644 --- a/django/db/models/sql/expressions.py +++ b/django/db/models/sql/expressions.py @@ -74,9 +74,8 @@ class SQLEvaluator(object): if sql: expressions.append(format % sql) expression_params.extend(params) - conn = ' %s ' % node.connector - return conn.join(expressions), expression_params + return connection.ops.combine_expression(node.connector, expressions), expression_params def evaluate_leaf(self, node, qn): if not qn: -- cgit v1.3