Commit 455b24e5 authored by Vincent Pelletier's avatar Vincent Pelletier

ZSQLCatalog: Drop compatibility support for "operator" argument.

parent b6f4d46d
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment