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
Labels
Merge Requests
139
Merge Requests
139
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
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
455b24e5
Commit
455b24e5
authored
Mar 07, 2017
by
Vincent Pelletier
16
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):
Default: 'and'
Deprecated
operator ('and', 'or', 'not')
See logical_operator.
logical_operator takes precedence if given.
unknown_column_dict (dict)
Only one key of this dictionnary is used here:
key: 'from_expression'
...
...
@@ -66,7 +63,7 @@ class ComplexQuery(Query):
provided, this ComplexQuery must have no subquery (regular
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
unknown_column_dict
=
kw
.
pop
(
'unknown_column_dict'
,
{})
self
.
from_expression
=
unknown_column_dict
.
pop
(
'from_expression'
,
None
)
...
...
Rafael Monnerat
@rafael
mentioned in commit
slapos.core@2eb77cb9
·
Jul 29, 2017
mentioned in commit
slapos.core@2eb77cb9
mentioned in commit nexedi/slapos.core@2eb77cb947ebfa82e07f1d017bf8a1f2fd4ec59a
Toggle commit list
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