Merge branch 'rc/5.4.5' into feature/unique_variable_names

Author: mariusconjeaud

doc/source/configuration.rst

@@ -32,7 +32,7 @@ Adjust driver configuration - these options are only available for this connecti
     config.MAX_TRANSACTION_RETRY_TIME = 30.0  # default
     config.RESOLVER = None  # default
     config.TRUST = neo4j.TRUST_SYSTEM_CA_SIGNED_CERTIFICATES  # default
-    config.USER_AGENT = neomodel/v5.4.4  # default
+    config.USER_AGENT = neomodel/v5.4.5  # default
 
 Setting the database name, if different from the default one::
 

neomodel/_version.py

@@ -1 +1 @@
-__version__ = "5.4.4"
+__version__ = "5.4.5"

neomodel/async_/match.py

@@ -615,14 +615,16 @@ def build_traversal_from_path(
             rhs_label = relationship.definition["node_class"].__label__
             if relation.get("relation_filtering"):
                 rhs_name = rel_ident
+                rhs_ident = f":{rhs_label}"
             else:
                 if index + 1 == len(parts) and "alias" in relation:
                     # If an alias is defined, use it to store the last hop in the path
                     rhs_name = relation["alias"]
                 else:
                     rhs_name = f"{rhs_label.lower()}_{rel_iterator}"
-                    rhs_name = self.create_node_identifier(rhs_name, rel_iterator)
-            rhs_ident = f"{rhs_name}:{rhs_label}"
+                    rhs_name = self.create_node_identifier(rhs_name)
+                rhs_ident = f"{rhs_name}:{rhs_label}"
+
             if relation["include_in_return"] and not already_present:
                 self._additional_return(rhs_name)
 

neomodel/sync_/match.py

@@ -613,14 +613,16 @@ def build_traversal_from_path(
             rhs_label = relationship.definition["node_class"].__label__
             if relation.get("relation_filtering"):
                 rhs_name = rel_ident
+                rhs_ident = f":{rhs_label}"
             else:
                 if index + 1 == len(parts) and "alias" in relation:
                     # If an alias is defined, use it to store the last hop in the path
                     rhs_name = relation["alias"]
                 else:
                     rhs_name = f"{rhs_label.lower()}_{rel_iterator}"
-                    rhs_name = self.create_node_identifier(rhs_name, rel_iterator)
-            rhs_ident = f"{rhs_name}:{rhs_label}"
+                    rhs_name = self.create_node_identifier(rhs_name)
+                rhs_ident = f"{rhs_name}:{rhs_label}"
+
             if relation["include_in_return"] and not already_present:
                 self._additional_return(rhs_name)
 

test/async_/test_match_api.py

@@ -631,6 +631,11 @@ async def test_relation_prop_filtering():
     await nescafe.suppliers.connect(supplier2, {"since": datetime(2010, 4, 1, 0, 0)})
     await nescafe.species.connect(arabica)
 
+    result = await Coffee.nodes.filter(
+        **{"suppliers|since__gt": datetime(2010, 4, 1, 0, 0)}
+    ).all()
+    assert len(result) == 1
+
     results = await Supplier.nodes.filter(
         **{"coffees__name": "Nescafe", "coffees|since__gt": datetime(2018, 4, 1, 0, 0)}
     ).all()

test/sync_/test_match_api.py

@@ -623,6 +623,11 @@ def test_relation_prop_filtering():
     nescafe.suppliers.connect(supplier2, {"since": datetime(2010, 4, 1, 0, 0)})
     nescafe.species.connect(arabica)
 
+    result = Coffee.nodes.filter(
+        **{"suppliers|since__gt": datetime(2010, 4, 1, 0, 0)}
+    ).all()
+    assert len(result) == 1
+
     results = Supplier.nodes.filter(
         **{"coffees__name": "Nescafe", "coffees|since__gt": datetime(2018, 4, 1, 0, 0)}
     ).all()