From 2986531d3292f48c5481add7e542f59e0fe7cf7c Mon Sep 17 00:00:00 2001
From: Anton Lydike <me@antonlydike.de>
Date: Sat, 17 Sep 2022 17:27:34 +0200
Subject: [PATCH 1/2] RelationshipManager: return NodeSet from match()

The documentation states, that a call to match() should return a
NodeSet. This change will however break existing code which expects
match() to return a Traversal.
---
 neomodel/match.py                |  6 +++---
 neomodel/relationship_manager.py |  6 +++---
 test/test_issue277.py            | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 test/test_issue277.py

diff --git a/neomodel/match.py b/neomodel/match.py
index bf6e7139..ece5c263 100644
--- a/neomodel/match.py
+++ b/neomodel/match.py
@@ -783,14 +783,14 @@ def __init__(self, source, name, definition):
         self.name = name
         self.filters = []
 
-    def match(self, **kwargs):
+    def match(self, **kwargs) -> NodeSet:
         """
         Traverse relationships with properties matching the given parameters.
 
             e.g: `.match(price__lt=10)`
 
         :param kwargs: see `NodeSet.filter()` for syntax
-        :return: self
+        :return: NodeSet
         """
         if kwargs:
             if self.definition.get('model') is None:
@@ -798,4 +798,4 @@ def match(self, **kwargs):
             output = process_filter_args(self.definition['model'], kwargs)
             if output:
                 self.filters.append(output)
-        return self
+        return NodeSet(self)
diff --git a/neomodel/relationship_manager.py b/neomodel/relationship_manager.py
index 6b8232f5..e115662f 100644
--- a/neomodel/relationship_manager.py
+++ b/neomodel/relationship_manager.py
@@ -325,12 +325,12 @@ def single(self):
         except IndexError:
             pass
 
-    def match(self, **kwargs):
+    def match(self, **kwargs) -> NodeSet:
         """
-        Return set of nodes who's relationship properties match supplied args
+        Return set of nodes whose relationship properties match supplied args
 
         :param kwargs: same syntax as `NodeSet.filter()`
-        :return: NodeSet
+        :return: NodeSet of the resulting traversal
         """
         return self._new_traversal().match(**kwargs)
 
diff --git a/test/test_issue277.py b/test/test_issue277.py
new file mode 100644
index 00000000..50691309
--- /dev/null
+++ b/test/test_issue277.py
@@ -0,0 +1,18 @@
+from neomodel import StructuredNode, StructuredRel, StringProperty, UniqueIdProperty, RelationshipTo, NodeSet
+
+
+class SomeRel(StructuredRel):
+    prop = StringProperty()
+
+
+class SomeNode(StructuredNode):
+    identifier = UniqueIdProperty()
+
+    connected_to = RelationshipTo('SomeNode', 'CONNECTED', model=SomeRel)
+
+
+def test_rel_match_returns_node_set():
+    a = SomeNode()
+    a.save()
+
+    assert type(a.connected_to.match(prop="asdf")) is NodeSet

From 8c75f0dd5d53fdf12d9adfb020e223edbdb07f6b Mon Sep 17 00:00:00 2001
From: Anton Lydike <me@antonlydike.de>
Date: Sat, 17 Sep 2022 17:28:05 +0200
Subject: [PATCH 2/2] NodeSet: Allow construction using a NodeSet object

This change was added to allow some backwards compatibility when working
with RelationshipManager.match(), which now returns a NodeSet as
was originally described in the documentation.
---
 neomodel/match.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/neomodel/match.py b/neomodel/match.py
index ece5c263..9efd8cad 100644
--- a/neomodel/match.py
+++ b/neomodel/match.py
@@ -574,6 +574,9 @@ def __init__(self, source):
             self.source_class = source
         elif isinstance(source, StructuredNode):
             self.source_class = source.__class__
+        elif isinstance(source, NodeSet):
+            self.source_class = source.source_class
+            self.source = source.source
         else:
             raise ValueError("Bad source for nodeset " + repr(source))