diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-03-19 19:35:42 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-03-19 19:35:42 +0000 |
| commit | 0cc04e6e1b70abc4817f275a898aa063da3de007 (patch) | |
| tree | ef3635ca30317f49fa296deea56a263dad2d8167 /lib/sqlalchemy/sql/compiler.py | |
| parent | a86dc8cbac51893e400e9e49f5e9d358c9845897 (diff) | |
| download | sqlalchemy-0cc04e6e1b70abc4817f275a898aa063da3de007.tar.gz | |
- like() and ilike() take an optional keyword argument
"escape=<somestring>", which is set as the escape character
using the syntax "x LIKE y ESCAPE '<somestring>'"
[ticket:993]
Diffstat (limited to 'lib/sqlalchemy/sql/compiler.py')
| -rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 10 |
1 files changed, 5 insertions, 5 deletions
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) |