Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Sven Franck
erp5
Commits
f14ee65a
Commit
f14ee65a
authored
Oct 31, 2014
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
full text: revert non-required change in ComparisonOperator.
parent
af7d3e4a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
5 deletions
+2
-5
product/ZSQLCatalog/Operator/ComparisonOperator.py
product/ZSQLCatalog/Operator/ComparisonOperator.py
+2
-5
No files found.
product/ZSQLCatalog/Operator/ComparisonOperator.py
View file @
f14ee65a
...
@@ -99,8 +99,7 @@ verifyClass(IOperator, MultivaluedComparisonOperator)
...
@@ -99,8 +99,7 @@ verifyClass(IOperator, MultivaluedComparisonOperator)
class
MatchComparisonOperator
(
MonovaluedComparisonOperator
):
class
MatchComparisonOperator
(
MonovaluedComparisonOperator
):
def
__init__
(
self
,
operator
,
mode
=
''
):
def
__init__
(
self
,
operator
,
mode
=
''
):
MonovaluedComparisonOperator
.
__init__
(
self
,
operator
,
''
)
MonovaluedComparisonOperator
.
__init__
(
self
,
operator
,
''
)
self
.
mode
=
mode
self
.
where_expression_format_string
=
'MATCH (%%(column)s) AGAINST (%%(value_list)s%s)'
%
(
mode
,
)
self
.
where_expression_format_string
=
'MATCH (%(column)s) AGAINST (%(value_list)s%(mode)s)'
def
asSQLExpression
(
self
,
column
,
value_list
,
only_group_columns
):
def
asSQLExpression
(
self
,
column
,
value_list
,
only_group_columns
):
"""
"""
...
@@ -111,11 +110,9 @@ class MatchComparisonOperator(MonovaluedComparisonOperator):
...
@@ -111,11 +110,9 @@ class MatchComparisonOperator(MonovaluedComparisonOperator):
if
value_list
==
''
:
if
value_list
==
''
:
column
,
value_list
=
self
.
render
(
column
,
value_list
)
column
,
value_list
=
self
.
render
(
column
,
value_list
)
return
SQLExpression
(
self
,
where_expression
=
'%s %s %s'
%
(
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
%
{
match_string
=
self
.
where_expression_format_string
%
{
'column'
:
column
,
'column'
:
column
,
'value_list'
:
value_list
,
'value_list'
:
self
.
renderValue
(
value_list
),
'mode'
:
self
.
mode
,
}
}
select_dict
=
{}
select_dict
=
{}
if
not
only_group_columns
:
if
not
only_group_columns
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment