diff --git a/community/cypher/cypher/pom.xml b/community/cypher/cypher/pom.xml index 2fa931bbb03fc..0d1cc82d2033e 100644 --- a/community/cypher/cypher/pom.xml +++ b/community/cypher/cypher/pom.xml @@ -246,7 +246,7 @@ org.neo4j neo4j-cypher-compiler-3.2 - 3.2.11 + 3.2.12 org.neo4j diff --git a/enterprise/cypher/acceptance-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/HintAcceptanceTest.scala b/enterprise/cypher/acceptance-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/HintAcceptanceTest.scala index e35726017f955..828aa0475817d 100644 --- a/enterprise/cypher/acceptance-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/HintAcceptanceTest.scala +++ b/enterprise/cypher/acceptance-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/enterprise/cypher/acceptance-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/MiscAcceptanceTest.scala b/enterprise/cypher/acceptance-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/MiscAcceptanceTest.scala index 97ca7d3e929d2..30e8d4bd57160 100644 --- a/enterprise/cypher/acceptance-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/MiscAcceptanceTest.scala +++ b/enterprise/cypher/acceptance-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/enterprise/cypher/acceptance-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/ProfilerAcceptanceTest.scala b/enterprise/cypher/acceptance-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/ProfilerAcceptanceTest.scala index 6df4b28417a81..d042c2dd51e49 100644 --- a/enterprise/cypher/acceptance-spec-suite/src/test/scala/org/neo4j/internal/cypher/acceptance/ProfilerAcceptanceTest.scala +++ b/enterprise/cypher/acceptance-spec-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") }