Skip to content

Improve keyword query parameters #836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 20, 2022
Merged

Improve keyword query parameters #836

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21ac494
Improve keyword query parameters
robsdedude Oct 18, 2022
9edf245
Fix parameters fusion
robsdedude Oct 18, 2022
6873d2f
Fix typo in code
robsdedude Oct 18, 2022
38ede91
Add tests for query parameter precedence
robsdedude Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions neo4j/work/result.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,21 +63,19 @@ def _qid(self):
else:
return self._raw_qid

def _tx_ready_run(self, query, parameters, **kwparameters):
def _tx_ready_run(self, query, parameters):
# BEGIN+RUN does not carry any extra on the RUN message.
# BEGIN {extra}
# RUN "query" {parameters} {extra}
self._run(query, parameters, None, None, None, None, **kwparameters)
self._run(query, parameters, None, None, None, None)

def _run(self, query, parameters, db, imp_user, access_mode, bookmarks,
**kwparameters):
def _run(self, query, parameters, db, imp_user, access_mode, bookmarks):
query_text = str(query) # Query or string object
query_metadata = getattr(query, "metadata", None)
query_timeout = getattr(query, "timeout", None)

parameters = DataDehydrator.fix_parameters(
dict(parameters or {}, **kwparameters),
patch_utc="utc" in self._connection.bolt_patches
parameters, patch_utc="utc" in self._connection.bolt_patches
)

self._metadata = {
Expand Down
6 changes: 4 additions & 2 deletions neo4j/work/simple.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,8 @@ def run(self, query, parameters=None, **kwparameters):
:type query: str, neo4j.Query
:param parameters: dictionary of parameters
:type parameters: dict
:param kwparameters: additional keyword parameters
:param kwparameters: additional keyword parameters.
These take precedence over parameters passed as ``parameters``.
:returns: a new :class:`neo4j.Result` object
:rtype: :class:`neo4j.Result`
"""
Expand All @@ -212,10 +213,11 @@ def run(self, query, parameters=None, **kwparameters):
cx, hydrant, self._config.fetch_size, self._result_closed,
self._result_error
)
parameters = dict(parameters or {}, **kwparameters)
self._autoResult._run(
query, parameters, self._config.database,
self._config.impersonated_user, self._config.default_access_mode,
self._bookmarks, **kwparameters
self._bookmarks
)

return self._autoResult
Expand Down
6 changes: 4 additions & 2 deletions neo4j/work/transaction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ def run(self, query, parameters=None, **kwparameters):
:type query: str
:param parameters: dictionary of parameters
:type parameters: dict
:param kwparameters: additional keyword parameters
:param kwparameters: additional keyword parameters.
These take precedence over parameters passed as ``parameters``.
:returns: a new :class:`neo4j.Result` object
:rtype: :class:`neo4j.Result`
:raise TransactionError: if the transaction is already closed
Expand Down Expand Up @@ -138,7 +139,8 @@ def run(self, query, parameters=None, **kwparameters):
)
self._results.append(result)

result._tx_ready_run(query, parameters, **kwparameters)
parameters = dict(parameters or {}, **kwparameters)
result._tx_ready_run(query, parameters)

return result

Expand Down