From f14ee65a3baba06b5b92fd09c17356a07a346dc5 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Fri, 31 Oct 2014 16:46:30 +0100
Subject: [PATCH] full text: revert non-required change in ComparisonOperator.
---
product/ZSQLCatalog/Operator/ComparisonOperator.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/product/ZSQLCatalog/Operator/ComparisonOperator.py b/product/ZSQLCatalog/Operator/ComparisonOperator.py
index 4dff21f410..21b9dc84e4 100644
--- a/product/ZSQLCatalog/Operator/ComparisonOperator.py
+++ b/product/ZSQLCatalog/Operator/ComparisonOperator.py
@@ -99,8 +99,7 @@ verifyClass(IOperator, MultivaluedComparisonOperator)
class MatchComparisonOperator(MonovaluedComparisonOperator):
def __init__(self, operator, mode=''):
MonovaluedComparisonOperator.__init__(self, operator, '')
- self.mode = mode
- self.where_expression_format_string = 'MATCH (%(column)s) AGAINST (%(value_list)s%(mode)s)'
+ self.where_expression_format_string = 'MATCH (%%(column)s) AGAINST (%%(value_list)s%s)' % (mode, )
def asSQLExpression(self, column, value_list, only_group_columns):
"""
@@ -111,11 +110,9 @@ class MatchComparisonOperator(MonovaluedComparisonOperator):
if value_list == '':
column, value_list = self.render(column, value_list)
return SQLExpression(self, where_expression='%s %s %s' % (column, '=', value_list))
- value_list = self.renderValue(value_list)
match_string = self.where_expression_format_string % {
'column': column,
- 'value_list': value_list,
- 'mode':self.mode,
+ 'value_list': self.renderValue(value_list),
}
select_dict = {}
if not only_group_columns:
--
2.30.9