Improve keyword query parameters

neo4j/_async/work/result.py

@@ -106,24 +106,19 @@ def _qid(self):
         else:
             return self._raw_qid
 
-    async def _tx_ready_run(self, query, parameters, **kwargs):
+    async def _tx_ready_run(self, query, parameters):
         # BEGIN+RUN does not carry any extra on the RUN message.
         # BEGIN {extra}
         # RUN "query" {parameters} {extra}
-        await self._run(
-            query, parameters, None, None, None, None, **kwargs
-        )
+        await self._run(query, parameters, None, None, None, None)
 
     async def _run(
-        self, query, parameters, db, imp_user, access_mode, bookmarks,
-        **kwargs
+        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 = dict(parameters or {}, **kwargs)
-
         self._metadata = {
             "query": query_text,
             "parameters": parameters,

neo4j/_async/work/session.py

@@ -258,7 +258,8 @@ async def run(
 
         :param query: cypher query
         :param parameters: dictionary of parameters
-        :param kwargs: additional keyword parameters
+        :param kwargs: additional keyword parameters.
+            These take precedence over parameters passed as ``parameters``.
 
         :raises SessionError: if the session has been closed.
 
@@ -286,10 +287,11 @@ async def run(
             self._result_error
         )
         bookmarks = await self._get_all_bookmarks()
+        parameters = dict(parameters or {}, **kwargs)
         await self._auto_result._run(
             query, parameters, self._config.database,
             self._config.impersonated_user, self._config.default_access_mode,
-            bookmarks, **kwargs
+            bookmarks
         )
 
         return self._auto_result

neo4j/_async/work/transaction.py

@@ -119,7 +119,8 @@ async def run(
 
         :param query: cypher query
         :param parameters: dictionary of parameters
-        :param kwparameters: additional keyword parameters
+        :param kwparameters: additional keyword parameters.
+            These take precedence over parameters passed as ``parameters``.
 
         :raise TransactionError: if the transaction is already closed
 
@@ -147,7 +148,8 @@ async def run(
         )
         self._results.append(result)
 
-        await result._tx_ready_run(query, parameters, **kwparameters)
+        parameters = dict(parameters or {}, **kwparameters)
+        await result._tx_ready_run(query, parameters)
 
         return result
 

neo4j/_sync/work/result.py

@@ -106,24 +106,19 @@ def _qid(self):
         else:
             return self._raw_qid
 
-    def _tx_ready_run(self, query, parameters, **kwargs):
+    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, **kwargs
-        )
+        self._run(query, parameters, None, None, None, None)
 
     def _run(
-        self, query, parameters, db, imp_user, access_mode, bookmarks,
-        **kwargs
+        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 = dict(parameters or {}, **kwargs)
-
         self._metadata = {
             "query": query_text,
             "parameters": parameters,

neo4j/_sync/work/session.py

@@ -258,7 +258,8 @@ def run(
 
         :param query: cypher query
         :param parameters: dictionary of parameters
-        :param kwargs: additional keyword parameters
+        :param kwargs: additional keyword parameters.
+            These take precedence over parameters passed as ``parameters``.
 
         :raises SessionError: if the session has been closed.
 
@@ -286,10 +287,11 @@ def run(
             self._result_error
         )
         bookmarks = self._get_all_bookmarks()
+        parameters = dict(parameters or {}, **kwargs)
         self._auto_result._run(
             query, parameters, self._config.database,
             self._config.impersonated_user, self._config.default_access_mode,
-            bookmarks, **kwargs
+            bookmarks
         )
 
         return self._auto_result

neo4j/_sync/work/transaction.py

@@ -119,7 +119,8 @@ def run(
 
         :param query: cypher query
         :param parameters: dictionary of parameters
-        :param kwparameters: additional keyword parameters
+        :param kwparameters: additional keyword parameters.
+            These take precedence over parameters passed as ``parameters``.
 
         :raise TransactionError: if the transaction is already closed
 
@@ -147,7 +148,8 @@ def run(
         )
         self._results.append(result)
 
-        result._tx_ready_run(query, parameters, **kwparameters)
+        parameters = dict(parameters or {}, **kwparameters)
+        result._tx_ready_run(query, parameters)
 
         return result