Update Cypher compiler dependencies to match new 3.3.7 release

neo4j · Sep 14, 2018 · 6d00bbd · 6d00bbd
1 parent d8b8104
commit 6d00bbd
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/enterprise/cypher/acceptance-spec-suite/src/test/resources/blacklists/compatibility-33.txt b/enterprise/cypher/acceptance-spec-suite/src/test/resources/blacklists/compatibility-33.txt
@@ -1,4 +1 @@
-Feature "OptionalMatchAcceptance": Scenario "optional match with distinct"
 Feature "ProcedureCallAcceptance": Scenario "Standalone call to procedure should fail if implicit argument is missing"
-Feature "ReturnAcceptance": Scenario "RETURN true AND list"
-Feature "ReturnAcceptance": Scenario "RETURN false OR list"
diff --git a/...ite/src/test/scala/org/neo4j/internal/cypher/acceptance/NodeIndexSeekAcceptanceTest.scala b/...ite/src/test/scala/org/neo4j/internal/cypher/acceptance/NodeIndexSeekAcceptanceTest.scala
@@ -371,9 +371,7 @@ class NodeIndexSeekAcceptanceTest extends ExecutionEngineFunSuite with CypherCom
     // When
     val result = executeWith(Configs.Interpreted, "MATCH (n:Label1:Label2) WHERE n.prop1 = 'val' OR n.prop2 = 'val' RETURN n",
       planComparisonStrategy = ComparePlansWithAssertion(_ should useOperatorTimes("NodeIndexSeek", 2),
-        expectPlansToFail = Configs.OldAndRule),
-      //TODO: Remove when 3.3.7 is released
-      expectedDifferentResults = Configs.Version3_3)
+        expectPlansToFail = Configs.OldAndRule))
 
     // Then
     result.toList should be (empty)
@@ -410,9 +408,7 @@ class NodeIndexSeekAcceptanceTest extends ExecutionEngineFunSuite with CypherCom
     // When
     val result = executeWith(Configs.Interpreted, "MATCH (n:Label1:Label2) WHERE n.prop1 = 'val' OR n.prop2 = 'val' RETURN n",
       planComparisonStrategy = ComparePlansWithAssertion(_ should useOperatorTimes("NodeIndexSeek", 4),
-        expectPlansToFail = Configs.OldAndRule),
-      //TODO: Remove when 3.3.7 is released
-      expectedDifferentResults = Configs.Version3_3)
+        expectPlansToFail = Configs.OldAndRule))
 
     // Then
     result.toList should be (empty)

diff --git a/.../test/scala/org/neo4j/internal/cypher/acceptance/PatternComprehensionAcceptanceTest.scala b/.../test/scala/org/neo4j/internal/cypher/acceptance/PatternComprehensionAcceptanceTest.scala
@@ -511,8 +511,7 @@ class PatternComprehensionAcceptanceTest extends ExecutionEngineFunSuite with Cy
     graph.execute(setup)
 
     val res = executeWith(Configs.Interpreted - Configs.Version2_3 - Configs.AllRulePlanners, query,
-      // TODO remove this for 3.3 after depending on 3.3.7
-      expectedDifferentResults = Configs.Version3_3 + Configs.Version3_1)
+      expectedDifferentResults = Configs.Version3_1)
     // If the (b)-->(:C) does not get correctly evaluated, this will be two instead
     res.toList should equal(List(Map("arraySize" -> 1)))
   }

diff --git a/pom.xml b/pom.xml
@@ -98,7 +98,7 @@
     <currentYear>2018</currentYear>
     <cypher.compatibility.23>2.3.12</cypher.compatibility.23>
     <cypher.compatibility.31>3.1.9</cypher.compatibility.31>
-    <cypher.compatibility.33>3.3.6</cypher.compatibility.33>
+    <cypher.compatibility.33>3.3.7</cypher.compatibility.33>
     <caffeine.version>2.6.2</caffeine.version>
   </properties>