Bug fix to clear last statement on ignored/failure

Author: technige

neo4j/bolt/connection.py

@@ -270,12 +270,15 @@ def fetch(self):
             log_info("S: SUCCESS (%r)", summary_metadata)
             response.on_success(summary_metadata or {})
         elif summary_signature == IGNORED:
+            self._last_run_statement = None
             log_info("S: IGNORED (%r)", summary_metadata)
             response.on_ignored(summary_metadata or {})
         elif summary_signature == FAILURE:
+            self._last_run_statement = None
             log_info("S: FAILURE (%r)", summary_metadata)
             response.on_failure(summary_metadata or {})
         else:
+            self._last_run_statement = None
             raise ProtocolError("Unexpected response message with signature %02X" % summary_signature)
 
         return len(details), 1

test/integration/test_session.py

@@ -347,6 +347,19 @@ def test_broken_transaction_should_not_break_session(self):
             with session.begin_transaction() as tx:
                 tx.run("RETURN 1")
 
+    def test_last_run_statement_should_be_cleared_on_failure(self):
+        with self.driver.session() as session:
+            tx = session.begin_transaction()
+            tx.run("RETURN 1").consume()
+            connection_1 = session._connection
+            assert connection_1._last_run_statement == "RETURN 1"
+            with self.assertRaises(CypherSyntaxError):
+                tx.run("X").consume()
+            connection_2 = session._connection
+            assert connection_2 is connection_1
+            assert connection_2._last_run_statement is None
+            tx.close()
+
 
 class BookmarkingTestCase(DirectIntegrationTestCase):