Skip to content

Commit d428945

Browse files
robsdeduderobsdedude
authored
Remove legacy handling for "COMMIT" query. (#717)
In BOLT <= v2, transactions would be committed with a `"COMMIT"` query, for which the driver had some special handling. Since this query is not in use anymore, this special handling (which got carried over) can be removed.
1 parent 99febd2 commit d428945

File tree

6 files changed

+8
-40
lines changed

6 files changed

+8
-40
lines changed

‎neo4j/_async/io/_bolt3.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,7 @@ def run(self, query, parameters=None, mode=None, bookmarks=None,
238238
raise ValueError("Timeout must be a positive number or 0.")
239239
fields = (query, parameters, extra)
240240
log.debug("[#%04X] C: RUN %s", self.local_port, " ".join(map(repr, fields)))
241-
if query.upper() == u"COMMIT":
242-
self._append(b"\x10", fields, CommitResponse(self, "run",
243-
**handlers))
244-
else:
245-
self._append(b"\x10", fields, Response(self, "run", **handlers))
241+
self._append(b"\x10", fields, Response(self, "run", **handlers))
246242

247243
def discard(self, n=-1, qid=-1, **handlers):
248244
# Just ignore n and qid, it is not supported in the Bolt 3 Protocol.

‎neo4j/_async/io/_bolt4.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,7 @@ def run(self, query, parameters=None, mode=None, bookmarks=None,
186186
raise ValueError("Timeout must be a positive number or 0.")
187187
fields = (query, parameters, extra)
188188
log.debug("[#%04X] C: RUN %s", self.local_port, " ".join(map(repr, fields)))
189-
if query.upper() == u"COMMIT":
190-
self._append(b"\x10", fields, CommitResponse(self, "run",
191-
**handlers))
192-
else:
193-
self._append(b"\x10", fields, Response(self, "run", **handlers))
189+
self._append(b"\x10", fields, Response(self, "run", **handlers))
194190

195191
def discard(self, n=-1, qid=-1, **handlers):
196192
extra = {"n": n}
@@ -467,11 +463,7 @@ def run(self, query, parameters=None, mode=None, bookmarks=None,
467463
fields = (query, parameters, extra)
468464
log.debug("[#%04X] C: RUN %s", self.local_port,
469465
" ".join(map(repr, fields)))
470-
if query.upper() == u"COMMIT":
471-
self._append(b"\x10", fields, CommitResponse(self, "run",
472-
**handlers))
473-
else:
474-
self._append(b"\x10", fields, Response(self, "run", **handlers))
466+
self._append(b"\x10", fields, Response(self, "run", **handlers))
475467

476468
def begin(self, mode=None, bookmarks=None, metadata=None, timeout=None,
477469
db=None, imp_user=None, **handlers):

‎neo4j/_async/io/_bolt5.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,7 @@ def run(self, query, parameters=None, mode=None, bookmarks=None,
184184
fields = (query, parameters, extra)
185185
log.debug("[#%04X] C: RUN %s", self.local_port,
186186
" ".join(map(repr, fields)))
187-
if query.upper() == u"COMMIT":
188-
self._append(b"\x10", fields, CommitResponse(self, "run",
189-
**handlers))
190-
else:
191-
self._append(b"\x10", fields, Response(self, "run", **handlers))
187+
self._append(b"\x10", fields, Response(self, "run", **handlers))
192188

193189
def discard(self, n=-1, qid=-1, **handlers):
194190
extra = {"n": n}

‎neo4j/_sync/io/_bolt3.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,7 @@ def run(self, query, parameters=None, mode=None, bookmarks=None,
238238
raise ValueError("Timeout must be a positive number or 0.")
239239
fields = (query, parameters, extra)
240240
log.debug("[#%04X] C: RUN %s", self.local_port, " ".join(map(repr, fields)))
241-
if query.upper() == u"COMMIT":
242-
self._append(b"\x10", fields, CommitResponse(self, "run",
243-
**handlers))
244-
else:
245-
self._append(b"\x10", fields, Response(self, "run", **handlers))
241+
self._append(b"\x10", fields, Response(self, "run", **handlers))
246242

247243
def discard(self, n=-1, qid=-1, **handlers):
248244
# Just ignore n and qid, it is not supported in the Bolt 3 Protocol.

‎neo4j/_sync/io/_bolt4.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,7 @@ def run(self, query, parameters=None, mode=None, bookmarks=None,
186186
raise ValueError("Timeout must be a positive number or 0.")
187187
fields = (query, parameters, extra)
188188
log.debug("[#%04X] C: RUN %s", self.local_port, " ".join(map(repr, fields)))
189-
if query.upper() == u"COMMIT":
190-
self._append(b"\x10", fields, CommitResponse(self, "run",
191-
**handlers))
192-
else:
193-
self._append(b"\x10", fields, Response(self, "run", **handlers))
189+
self._append(b"\x10", fields, Response(self, "run", **handlers))
194190

195191
def discard(self, n=-1, qid=-1, **handlers):
196192
extra = {"n": n}
@@ -467,11 +463,7 @@ def run(self, query, parameters=None, mode=None, bookmarks=None,
467463
fields = (query, parameters, extra)
468464
log.debug("[#%04X] C: RUN %s", self.local_port,
469465
" ".join(map(repr, fields)))
470-
if query.upper() == u"COMMIT":
471-
self._append(b"\x10", fields, CommitResponse(self, "run",
472-
**handlers))
473-
else:
474-
self._append(b"\x10", fields, Response(self, "run", **handlers))
466+
self._append(b"\x10", fields, Response(self, "run", **handlers))
475467

476468
def begin(self, mode=None, bookmarks=None, metadata=None, timeout=None,
477469
db=None, imp_user=None, **handlers):

‎neo4j/_sync/io/_bolt5.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,7 @@ def run(self, query, parameters=None, mode=None, bookmarks=None,
184184
fields = (query, parameters, extra)
185185
log.debug("[#%04X] C: RUN %s", self.local_port,
186186
" ".join(map(repr, fields)))
187-
if query.upper() == u"COMMIT":
188-
self._append(b"\x10", fields, CommitResponse(self, "run",
189-
**handlers))
190-
else:
191-
self._append(b"\x10", fields, Response(self, "run", **handlers))
187+
self._append(b"\x10", fields, Response(self, "run", **handlers))
192188

193189
def discard(self, n=-1, qid=-1, **handlers):
194190
extra = {"n": n}

0 commit comments

Comments
 (0)