Merge branch '5.0' into bolt-utc-datetimes-refactoring

Author: robsdedude

neo4j/_codec/hydration/v1/hydration_handler.py

@@ -63,16 +63,17 @@ def __init__(self):
 
     def hydrate_node(self, id_, labels=None,
                      properties=None, element_id=None):
+        assert isinstance(self.graph, Graph)
         # backwards compatibility with Neo4j < 5.0
         if element_id is None:
             element_id = str(id_)
 
         try:
             inst = self.graph._nodes[element_id]
         except KeyError:
-            inst = self.graph._nodes[element_id] = Node(
-                self.graph, element_id, id_, labels, properties
-            )
+            inst = Node(self.graph, element_id, id_, labels, properties)
+            self.graph._nodes[element_id] = inst
+            self.graph._legacy_nodes[id_] = inst
         else:
             # If we have already hydrated this node as the endpoint of
             # a relationship, it won't have any labels or properties.
@@ -112,9 +113,11 @@ def hydrate_unbound_relationship(self, id_, type_, properties=None,
             inst = self.graph._relationships[element_id]
         except KeyError:
             r = self.graph.relationship_type(type_)
-            inst = self.graph._relationships[element_id] = r(
+            inst = r(
                 self.graph, element_id, id_, properties
             )
+            self.graph._relationships[element_id] = inst
+            self.graph._legacy_relationships[id_] = inst
         return inst
 
     def hydrate_path(self, nodes, relationships, sequence):
@@ -139,14 +142,6 @@ def hydrate_path(self, nodes, relationships, sequence):
             last_node = next_node
         return Path(*entities)
 
-    def _hydrate(self, value):
-        pass
-
-    def _dehydrate(self, value):
-        raise NotImplementedError(
-            "GraphHydrationHandler cannot be used for dehydration."
-        )
-
 
 class HydrationHandler(HydrationHandlerABC):
     def __init__(self):

neo4j/graph/__init__.py

@@ -44,10 +44,13 @@ class Graph:
 
     def __init__(self):
         self._nodes = {}
+        self._legacy_nodes = {}  # TODO: 6.0 - remove
         self._relationships = {}
+        self._legacy_relationships = {}  # TODO: 6.0 - remove
         self._relationship_types = {}
-        self._node_set_view = EntitySetView(self._nodes)
-        self._relationship_set_view = EntitySetView(self._relationships)
+        self._node_set_view = EntitySetView(self._nodes, self._legacy_nodes)
+        self._relationship_set_view = EntitySetView(self._relationships,
+                                                    self._legacy_relationships)
 
     @property
     def nodes(self):
@@ -176,8 +179,9 @@ class EntitySetView(Mapping):
     """ View of a set of :class:`.Entity` instances within a :class:`.Graph`.
     """
 
-    def __init__(self, entity_dict):
+    def __init__(self, entity_dict, legacy_entity_dict):
         self._entity_dict = entity_dict
+        self._legacy_entity_dict = legacy_entity_dict  # TODO: 6.0 - remove
 
     def __getitem__(self, e_id):
         # TODO: 6.0 - remove this compatibility shim
@@ -186,14 +190,7 @@ def __getitem__(self, e_id):
                 "Accessing entities by an integer id is deprecated, "
                 "use the new style element_id (str) instead"
             )
-            if isinstance(e_id, float) and int(e_id) == e_id:
-                # Non-int floats would always fail for legacy IDs
-                e_id = int(e_id)
-            elif isinstance(e_id, complex) and int(e_id.real) == e_id:
-                # complex numbers with imaginary parts or non-integer real
-                # parts would always fail for legacy IDs
-                e_id = int(e_id.real)
-            e_id = str(e_id)
+            return self._legacy_entity_dict[e_id]
         return self._entity_dict[e_id]
 
     def __len__(self):

testkitbackend/test_config.json

@@ -54,8 +54,6 @@
     "Optimization:PullPipelining": true,
     "Optimization:ResultListFetchAll": "The idiomatic way to cast to list is indistinguishable from iterating over the result.",
 
-    "Detail:NullOnMissingId": true,
-
     "ConfHint:connection.recv_timeout_seconds": true,
 
     "Backend:RTFetch": true,

tests/unit/common/codec/hydration/v1/test_graph_hydration.py

@@ -41,7 +41,7 @@ def test_can_hydrate_node_structure(self, hydration_scope):
         assert isinstance(alice, Node)
         with pytest.warns(DeprecationWarning, match="element_id"):
             assert alice.id == 123
-        # for backwards compatibility, the driver should compy the element_id
+        # for backwards compatibility, the driver should compute the element_id
         assert alice.element_id == "123"
         assert alice.labels == {"Person"}
         assert set(alice.keys()) == {"name"}
@@ -58,7 +58,7 @@ def test_can_hydrate_relationship_structure(self, hydration_scope):
             assert rel.start_node.id == 456
         with pytest.warns(DeprecationWarning, match="element_id"):
             assert rel.end_node.id == 789
-        # for backwards compatibility, the driver should compy the element_id
+        # for backwards compatibility, the driver should compute the element_id
         assert rel.element_id == "123"
         assert rel.start_node.element_id == "456"
         assert rel.end_node.element_id == "789"

tests/unit/common/codec/hydration/v2/test_graph_hydration.py

@@ -58,7 +58,7 @@ def test_can_hydrate_relationship_structure(self, hydration_scope):
             assert rel.start_node.id == 456
         with pytest.warns(DeprecationWarning, match="element_id"):
             assert rel.end_node.id == 789
-        # for backwards compatibility, the driver should compy the element_id
+        # for backwards compatibility, the driver should compute the element_id
         assert rel.element_id == "abc"
         assert rel.start_node.element_id == "def"
         assert rel.end_node.element_id == "ghi"

tests/unit/common/test_record.py

@@ -288,7 +288,7 @@ def test_data_relationship():
     gh = hydration_scope._graph_hydrator
     alice = gh.hydrate_node(1, {"Person"}, {"name": "Alice", "age": 33})
     bob = gh.hydrate_node(2, {"Person"}, {"name": "Bob", "age": 44})
-    alice_knows_bob = gh.hydrate_relationship(1, alice._id, bob._id, "KNOWS",
+    alice_knows_bob = gh.hydrate_relationship(1, 1, 2, "KNOWS",
                                               {"since": 1999})
     record = Record(zip(["a", "b", "r"], [alice, bob, alice_knows_bob]))
     assert record.data() == {