Update cypher dependency to 3.2.12

Null-forward merge to 3.4 and onwards.
neo4j · Jun 13, 2018 · 7260dba · 7260dba
1 parent 2e0a1bd
commit 7260dba
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/community/cypher/cypher/pom.xml b/community/cypher/cypher/pom.xml
@@ -246,7 +246,7 @@
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-cypher-compiler-3.2</artifactId>
-      <version>3.2.11</version>
+      <version>3.2.12</version>
       <exclusions>
         <exclusion>
           <groupId>org.neo4j</groupId>

diff --git a/...e-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/HintAcceptanceTest.scala b/...e-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/HintAcceptanceTest.scala
@@ -89,8 +89,7 @@ class HintAcceptanceTest
                   |RETURN a.prop, b.prop
                 """.stripMargin
 
-    // TODO: Once 3.2 comes out with this feature added, we should change the following line to not exclude 3.2
-    executeWith(Configs.CommunityInterpreted - Configs.AllRulePlanners - Configs.Cost2_3 - Configs.Cost3_1 - Configs.Cost3_2, query,
+    executeWith(Configs.CommunityInterpreted - Configs.AllRulePlanners - Configs.Cost2_3 - Configs.Cost3_1, query,
       planComparisonStrategy = ComparePlansWithAssertion((p) => {
         p should useOperatorTimes("NodeIndexSeek", 2)
       }, expectPlansToFail = Configs.AllRulePlanners + Configs.Cost2_3 + Configs.Cost3_1))

diff --git a/...e-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/MiscAcceptanceTest.scala b/...e-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/MiscAcceptanceTest.scala
@@ -78,9 +78,8 @@ class MiscAcceptanceTest extends ExecutionEngineFunSuite with CypherComparisonSu
     // If we would use Ints for storing the limit, then we would end up with "limit 0"
     // thus, if we actually return the two nodes, then it proves that we used a long
     val query = "MATCH (n) RETURN n LIMIT " + limit
-    val worksCorrectlyInConfig = Configs.Version3_3 - Configs.AllRulePlanners
+    val worksCorrectlyInConfig = Configs.Version3_3 + Configs.Version3_2 - Configs.AllRulePlanners
     // the query will work in all configs, but only have the correct result in those specified configs
-    // Also: It Will work on 3.2 once 3.2.12 is out
     val result = executeWith(Configs.All, query, Configs.All - worksCorrectlyInConfig)
     result.toList should equal(List(Map("n" -> a), Map("n" -> b)))
   }

diff --git a/...ec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/ProfilerAcceptanceTest.scala b/...ec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/ProfilerAcceptanceTest.scala
@@ -318,8 +318,7 @@ class ProfilerAcceptanceTest extends ExecutionEngineFunSuite with CreateTempFile
 
       test("LIMIT should influence cardinality estimation by default value when expression contains timestamp()") {
         (0 until 100).map(i => createLabeledNode("Person"))
-        val wrongResultsConfig = Configs.Version3_2 + Configs.Version3_1 + Configs.Version2_3 + Configs.AllRulePlanners
-        // This will work on 3.2 when 3.2.12 is out
+        val wrongResultsConfig = Configs.Version3_1 + Configs.Version2_3 + Configs.AllRulePlanners
         val result = executeWith(Configs.Interpreted, s"PROFILE MATCH (p:Person) with 10 as x, p RETURN p LIMIT timestamp()", wrongResultsConfig)
         assertEstimatedRows(GraphStatistics.DEFAULT_LIMIT_CARDINALITY.amount.toInt)(result)("Limit")
       }