Fixed OGM scenario

py2neo/ogm/__init__.py

@@ -572,7 +572,9 @@ def __init__(self, object_class, repository):
     def match(self, primary_value=None):
         cls = self._object_class
         if cls.__primarykey__ == "__id__":
-            match = NodeMatcher.match(self, cls.__primarylabel__).where("id(_) = %d" % primary_value)
+            match = NodeMatcher.match(self, cls.__primarylabel__)
+            if primary_value is not None:
+                match = match.where("id(_) = %d" % primary_value)
         elif primary_value is None:
             match = NodeMatcher.match(self, cls.__primarylabel__)
         else:

test/integration/conftest.py

@@ -193,6 +193,13 @@ def graph(uri):
     return Graph(uri)
 
 
+@fixture(scope="function")
+def repo(graph):
+    graph.delete_all()
+    yield Repository.wrap(graph)
+    graph.delete_all()
+
+
 @fixture(scope="function")
 def movie_graph(graph):
     graph.delete_all()

test/integration/test_ogm.py

@@ -44,6 +44,13 @@ def test_simple_push(graph):
     assert thing.__node__.identity is not None
 
 
+def test_simple_match_with_no_id(repo):
+    repo.save(SimpleThing())
+    thing = repo.match(SimpleThing).first()
+    assert thing.__node__.graph is repo.graph
+    assert thing.__node__.identity is not None
+
+
 class A(Model):
 
     b = RelatedTo("B")