Making fixes

Author: angelosantos4

nodestream_plugin_neo4j/neo4j_database.py

@@ -119,8 +119,7 @@ async def _execute_query(
             self.log_error_messages_from_statistics(statistics)
             statistics.update_metrics_from_summary()
 
-        for record in neo4j_result.records:
-            yield record
+        return neo4j_result.records
 
     def log_error_messages_from_statistics(self, statistics: Neo4jQueryStatistics):
         for error in statistics.error_messages:

nodestream_plugin_neo4j/result.py

@@ -211,7 +211,7 @@ def update_metrics_from_summary(self):
         metric_updates: list[tuple[Metric, int]] = [
             (PLANNING_TIME, self.timing.planning_time_ms),
             (PROCESSING_TIME, self.timing.processing_time_ms),
-            (TOTAL_TIME, self.timing.total_time_ms + self.timing.processing_time_ms),
+            (TOTAL_TIME, self.timing.planning_time_ms + self.timing.processing_time_ms),
             (APOC_TIME, self.timing.apoc_time_ms),
             (NODES_CREATED, self.write_metrics.nodes_created),
             (NODES_DELETED, self.write_metrics.nodes_deleted),
@@ -229,7 +229,8 @@ def update_metrics_from_summary(self):
             (ERROR_MESSAGES, len(self.error_messages)),
         ]
 
-        metrics.increment(*metric_updates)
+        for metric, value in metric_updates:
+            metrics.increment(metric, value)
 
 
 class Neo4jResult:

tests/unit/test_query.py

@@ -3,7 +3,7 @@
 from nodestream_plugin_neo4j.query import (
     APOC_BATCH_QUERY_RESPONSE_FIELDS,
     COMMIT_QUERY,
-    NON_APOCH_COMMIT_QUERY,
+    NON_APOC_COMMIT_QUERY,
     RETURN_CLAUSE,
     UNWIND_QUERY,
     YIELD_CLAUSE,
@@ -59,23 +59,13 @@ def test_apoc_batch_response_default_initialization():
     assert_that(response.updateStatistics, is_(ApocUpdateStatistics))
 
 
-def test_apoc_batch_response_post_init_with_none_values():
-    response = ApocBatchResponse(batches=5, errorMessages=None, updateStatistics=None)
-    # __post_init__ should initialize these to defaults
-    assert_that(response.errorMessages, equal_to({}))
-    assert_that(response.updateStatistics, not_none())
-    assert_that(response.updateStatistics, is_(ApocUpdateStatistics))
-    assert_that(response.batches, equal_to(5))
-
-
 def test_apoc_batch_response_post_init_with_existing_values():
     existing_errors = {"error1": "message1"}
     existing_stats = ApocUpdateStatistics(nodesCreated=10)
 
     response = ApocBatchResponse(
         errorMessages=existing_errors, updateStatistics=existing_stats
     )
-    # __post_init__ should not overwrite existing values
     assert_that(response.errorMessages, equal_to(existing_errors))
     assert_that(response.updateStatistics, equal_to(existing_stats))
     assert_that(response.updateStatistics.nodesCreated, equal_to(10))
@@ -228,7 +218,7 @@ def test_query_batch_as_query_with_apoc_iterate_false():
 
     result = batch.as_query(apoc_iterate=False)
 
-    assert_that(result.query_statement, equal_to(NON_APOCH_COMMIT_QUERY))
+    assert_that(result.query_statement, equal_to(NON_APOC_COMMIT_QUERY))
     assert_that(result.is_apoc, equal_to(False))
     assert_that(
         result.parameters,
@@ -308,6 +298,6 @@ def test_commit_query_structure():
 
 
 def test_non_apoc_commit_query_structure():
-    assert_that("UNWIND" in NON_APOCH_COMMIT_QUERY, equal_to(True))
-    assert_that("CALL apoc.cypher.doIt" in NON_APOCH_COMMIT_QUERY, equal_to(True))
-    assert_that("RETURN" in NON_APOCH_COMMIT_QUERY, equal_to(True))
+    assert_that("UNWIND" in NON_APOC_COMMIT_QUERY, equal_to(True))
+    assert_that("CALL apoc.cypher.doIt" in NON_APOC_COMMIT_QUERY, equal_to(True))
+    assert_that("RETURN" in NON_APOC_COMMIT_QUERY, equal_to(True))

tests/unit/test_result.py

@@ -366,6 +366,7 @@ def test_update_metrics_from_summary(mocker):
         constraints_added=2,
         constraints_removed=1,
         indexes_added=3,
+        indexes_removed=1,
     )
 
     stats = Neo4jQueryStatistics(
@@ -394,13 +395,14 @@ def test_update_metrics_from_summary(mocker):
         mocker.call(CONSTRAINTS_ADDED, 2),
         mocker.call(CONSTRAINTS_REMOVED, 1),
         mocker.call(INDEXES_ADDED, 3),
+        mocker.call(INDEXES_REMOVED, 1),
         mocker.call(WAS_TERMINATED, 1),  # True converted to int
         mocker.call(RETRIES, 2),
         mocker.call(ERROR_MESSAGES, 2),  # len(error_messages)
     ]
 
     mock_metrics.increment.assert_has_calls(expected_calls, any_order=True)
-    assert_that(mock_metrics.increment.call_count, equal_to(17))
+    assert_that(mock_metrics.increment.call_count, equal_to(18))
 
 
 def test_metric_constants_are_defined():