From 0cc04e6e1b70abc4817f275a898aa063da3de007 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 19 Mar 2008 19:35:42 +0000 Subject: - like() and ilike() take an optional keyword argument "escape=", which is set as the escape character using the syntax "x LIKE y ESCAPE ''" [ticket:993] --- lib/sqlalchemy/sql/compiler.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/sqlalchemy/sql/compiler.py') diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index bb9cc7597..6a048a780 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -76,10 +76,10 @@ OPERATORS = { operators.eq : '=', operators.distinct_op : 'DISTINCT', operators.concat_op : '||', - operators.like_op : 'LIKE', - operators.notlike_op : 'NOT LIKE', - operators.ilike_op : lambda x, y: "lower(%s) LIKE lower(%s)" % (x, y), - operators.notilike_op : lambda x, y: "lower(%s) NOT LIKE lower(%s)" % (x, y), + operators.like_op : lambda x, y, escape=None: '%s LIKE %s' % (x, y) + (escape and ' ESCAPE \'%s\'' % escape or ''), + operators.notlike_op : lambda x, y, escape=None: '%s NOT LIKE %s' % (x, y) + (escape and ' ESCAPE \'%s\'' % escape or ''), + operators.ilike_op : lambda x, y, escape=None: "lower(%s) LIKE lower(%s)" % (x, y) + (escape and ' ESCAPE \'%s\'' % escape or ''), + operators.notilike_op : lambda x, y, escape=None: "lower(%s) NOT LIKE lower(%s)" % (x, y) + (escape and ' ESCAPE \'%s\'' % escape or ''), operators.between_op : 'BETWEEN', operators.in_op : 'IN', operators.notin_op : 'NOT IN', @@ -394,7 +394,7 @@ class DefaultCompiler(engine.Compiled): def visit_binary(self, binary, **kwargs): op = self.operator_string(binary.operator) if callable(op): - return op(self.process(binary.left), self.process(binary.right)) + return op(self.process(binary.left), self.process(binary.right), **binary.modifiers) else: return self.process(binary.left) + " " + op + " " + self.process(binary.right) -- cgit v1.2.1