Commit a0b641bd authored by Vincent Pelletier's avatar Vincent Pelletier

Pass RelatedKey.buildQuery's related_key_definition and sql_catalog parameters...

Pass RelatedKey.buildQuery's related_key_definition and sql_catalog parameters by name to make them easier to grep for.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@25884 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent bba7dbc5
...@@ -1887,7 +1887,8 @@ class Catalog(Folder, ...@@ -1887,7 +1887,8 @@ class Catalog(Folder,
result = None result = None
else: else:
if related_key_definition is not None: if related_key_definition is not None:
search_key = search_key.getSearchKey(self, related_key_definition) search_key = search_key.getSearchKey(sql_catalog=self,
related_key_definition=related_key_definition)
return search_key return search_key
@profiler_decorator @profiler_decorator
...@@ -1905,12 +1906,14 @@ class Catalog(Folder, ...@@ -1905,12 +1906,14 @@ class Catalog(Folder,
if related_key_definition is None: if related_key_definition is None:
build_key = search_key build_key = search_key
else: else:
build_key = search_key.getSearchKey(self, related_key_definition, build_key = search_key.getSearchKey(sql_catalog=self,
related_key_definition=related_key_definition,
search_key_name=search_key_name) search_key_name=search_key_name)
result = build_key.buildQuery(value, logical_operator=logical_operator, result = build_key.buildQuery(value, logical_operator=logical_operator,
comparison_operator=comparison_operator) comparison_operator=comparison_operator)
if related_key_definition is not None: if related_key_definition is not None:
result = search_key.buildQuery(self, related_key_definition, result = search_key.buildQuery(sql_catalog=self,
related_key_definition=related_key_definition,
search_value=result) search_value=result)
else: else:
result = script(value) result = script(value)
...@@ -1966,10 +1969,12 @@ class Catalog(Folder, ...@@ -1966,10 +1969,12 @@ class Catalog(Folder,
if related_key_definition is None: if related_key_definition is None:
build_key = search_key build_key = search_key
else: else:
build_key = search_key.getSearchKey(self, related_key_definition) build_key = search_key.getSearchKey(sql_catalog=self,
related_key_definition=related_key_definition)
result = self._buildQueryFromAbstractSyntaxTreeNode(node, build_key) result = self._buildQueryFromAbstractSyntaxTreeNode(node, build_key)
if related_key_definition is not None: if related_key_definition is not None:
result = search_key.buildQuery(self, related_key_definition, result = search_key.buildQuery(sql_catalog=self,
related_key_definition=related_key_definition,
search_value=result) search_value=result)
return result return result
......
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