wip improve statement generation

Author: Syndesi

src/EventListener/OpenCypher/NodeMergeToStatementEventListener.php

@@ -45,10 +45,7 @@ public static function nodeStatement(NodeInterface $node): Statement
         return new Statement(
             sprintf(
                 "MERGE (node%s {%s})\n".
-                "ON CREATE\n".
-                "  SET node += \$properties\n".
-                "ON MATCH\n".
-                "  SET node += \$properties",
+                "SET node += \$properties",
                 ToCypherHelper::nodeLabelStorageToCypherLabelString($node->getNodeLabels()),
                 StructureHelper::getIdentifiersFromElementAsCypherVariableString($node, '$identifier')
             ),

src/EventListener/OpenCypher/SimilarNodeQueueCreateToStatementEventListener.php

@@ -62,8 +62,8 @@ public static function similarNodeQueueStatement(SimilarNodeQueueInterface $simi
         return new Statement(
             sprintf(
                 "UNWIND \$batch as row\n".
-                "CREATE (n%s {%s})\n".
-                "SET n += row.property",
+                "CREATE (node%s {%s})\n".
+                "SET node += row.property",
                 ToCypherHelper::nodeLabelStorageToCypherLabelString($firstNode->getNodeLabels()),
                 StructureHelper::getIdentifiersFromElementAsCypherVariableString($firstNode, 'row.identifier')
             ),

src/EventListener/OpenCypher/SimilarNodeQueueDeleteToStatementEventListener.php

@@ -59,8 +59,8 @@ public static function similarNodeQueueStatement(SimilarNodeQueueInterface $simi
         return new Statement(
             sprintf(
                 "UNWIND \$batch as row\n".
-                "MATCH (n%s {%s})\n".
-                "DETACH DELETE n",
+                "MATCH (node%s {%s})\n".
+                "DETACH DELETE node",
                 ToCypherHelper::nodeLabelStorageToCypherLabelString($firstNode->getNodeLabels()),
                 StructureHelper::getIdentifiersFromElementAsCypherVariableString($firstNode, 'row')
             ),

src/EventListener/OpenCypher/SimilarNodeQueueMergeToStatementEventListener.php

@@ -62,11 +62,8 @@ public static function similarNodeQueueStatement(SimilarNodeQueueInterface $simi
         return new Statement(
             sprintf(
                 "UNWIND \$batch as row\n".
-                "MERGE (n%s {%s})\n".
-                "ON CREATE\n".
-                "  SET n += row.property\n".
-                "ON MATCH\n".
-                "  SET n += row.property",
+                "MERGE (node%s {%s})\n".
+                "SET node += row.property",
                 ToCypherHelper::nodeLabelStorageToCypherLabelString($firstNode->getNodeLabels()),
                 StructureHelper::getIdentifiersFromElementAsCypherVariableString($firstNode, 'row.identifier')
             ),

tests/EventListener/OpenCypher/NodeMergeToStatementEventListenerTest.php

@@ -84,10 +84,7 @@ public function testNodeStatement(): void
 
         $this->assertSame(
             "MERGE (node:NodeLabel {id: \$identifier.id})\n".
-            "ON CREATE\n".
-            "  SET node += \$properties\n".
-            "ON MATCH\n".
-            "  SET node += \$properties",
+            "SET node += \$properties",
             $statement->getText()
         );
         $this->assertCount(2, $statement->getParameters());

tests/EventListener/OpenCypher/SimilarNodeQueueCreateToStatementEventListenerTest.php

@@ -147,8 +147,8 @@ public function testNodeStatement(): void
 
         $this->assertSame(
             "UNWIND \$batch as row\n".
-            "CREATE (n:Node {identifier: row.identifier.identifier})\n".
-            "SET n += row.property",
+            "CREATE (node:Node {identifier: row.identifier.identifier})\n".
+            "SET node += row.property",
             $statement->getText()
         );
         $this->assertCount(1, $statement->getParameters());

tests/EventListener/OpenCypher/SimilarNodeQueueDeleteToStatementEventListenerTest.php

@@ -140,8 +140,8 @@ public function testNodeStatement(): void
 
         $this->assertSame(
             "UNWIND \$batch as row\n".
-            "MATCH (n:Node {identifier: row.identifier})\n".
-            "DETACH DELETE n",
+            "MATCH (node:Node {identifier: row.identifier})\n".
+            "DETACH DELETE node",
             $statement->getText()
         );
         $this->assertCount(1, $statement->getParameters());

tests/EventListener/OpenCypher/SimilarNodeQueueMergeToStatementEventListenerTest.php

@@ -140,11 +140,8 @@ public function testNodeStatement(): void
 
         $this->assertSame(
             "UNWIND \$batch as row\n".
-            "MERGE (n:Node {identifier: row.identifier.identifier})\n".
-            "ON CREATE\n".
-            "  SET n += row.property\n".
-            "ON MATCH\n".
-            "  SET n += row.property",
+            "MERGE (node:Node {identifier: row.identifier.identifier})\n".
+            "SET node += row.property",
             $statement->getText()
         );
         $this->assertCount(1, $statement->getParameters());