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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alecs_myu
erp5
Commits
455b24e5
Commit
455b24e5
authored
Mar 07, 2017
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ZSQLCatalog: Drop compatibility support for "operator" argument.
parent
b6f4d46d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
4 deletions
+1
-4
product/ZSQLCatalog/Query/ComplexQuery.py
product/ZSQLCatalog/Query/ComplexQuery.py
+1
-4
No files found.
product/ZSQLCatalog/Query/ComplexQuery.py
View file @
455b24e5
...
@@ -55,9 +55,6 @@ class ComplexQuery(Query):
...
@@ -55,9 +55,6 @@ class ComplexQuery(Query):
Default: 'and'
Default: 'and'
Deprecated
Deprecated
operator ('and', 'or', 'not')
See logical_operator.
logical_operator takes precedence if given.
unknown_column_dict (dict)
unknown_column_dict (dict)
Only one key of this dictionnary is used here:
Only one key of this dictionnary is used here:
key: 'from_expression'
key: 'from_expression'
...
@@ -66,7 +63,7 @@ class ComplexQuery(Query):
...
@@ -66,7 +63,7 @@ class ComplexQuery(Query):
provided, this ComplexQuery must have no subquery (regular
provided, this ComplexQuery must have no subquery (regular
SQLExpression limitation)
SQLExpression limitation)
"""
"""
self
.
logical_operator
=
kw
.
pop
(
'logical_operator'
,
kw
.
pop
(
'operator'
,
'and'
)
).
lower
()
self
.
logical_operator
=
kw
.
pop
(
'logical_operator'
,
'and'
).
lower
()
assert
self
.
logical_operator
in
(
'and'
,
'or'
,
'not'
),
self
.
logical_operator
assert
self
.
logical_operator
in
(
'and'
,
'or'
,
'not'
),
self
.
logical_operator
unknown_column_dict
=
kw
.
pop
(
'unknown_column_dict'
,
{})
unknown_column_dict
=
kw
.
pop
(
'unknown_column_dict'
,
{})
self
.
from_expression
=
unknown_column_dict
.
pop
(
'from_expression'
,
None
)
self
.
from_expression
=
unknown_column_dict
.
pop
(
'from_expression'
,
None
)
...
...
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