Create compatibility module

neo4j · Sep 22, 2017 · 626b61d · 626b61d
1 parent 6ba466f
commit 626b61d
Show file tree

Hide file tree

Showing 999 changed files with 26,117 additions and 2,687 deletions.
diff --git a/community/cypher/cypher-compiler-3.4/pom.xml b/community/cypher/cypher-compiler-3.4/pom.xml
@@ -8,11 +8,11 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>neo4j-cypher-compiler-3.3</artifactId>
+  <artifactId>neo4j-cypher-compiler-3.4</artifactId>
   <packaging>jar</packaging>
   <version>3.4.0-SNAPSHOT</version>
-  <name>Neo4j - Cypher Compiler 3.3</name>
-  <description>Compiler for Cypher 3.3</description>
+  <name>Neo4j - Cypher Compiler 3.4</name>
+  <description>Compiler for Cypher 3.4</description>
   <url>http://components.neo4j.org/${project.artifactId}/${project.version}</url>
 
   <scm>
@@ -22,7 +22,9 @@
   </scm>
 
   <properties>
-    <version-package>cypher.internal.compiler.v3_1</version-package>
+    <version-package>cypher.internal.compiler.v3_4</version-package>
+    <scala.version>2.11.11</scala.version>
+    <scala.binary.version>2.11</scala.binary.version>
   </properties>
 
   <licenses>
@@ -99,17 +101,17 @@
     </dependency>
     <dependency>
       <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-cypher-frontend-3.3</artifactId>
+      <artifactId>neo4j-cypher-frontend-3.4</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-cypher-ir-3.3</artifactId>
+      <artifactId>neo4j-cypher-ir-3.4</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-cypher-logical-plans-3.3</artifactId>
+      <artifactId>neo4j-cypher-logical-plans-3.4</artifactId>
       <version>${project.version}</version>
     </dependency>
 
@@ -124,7 +126,7 @@
 
     <dependency>
       <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-cypher-frontend-3.3</artifactId>
+      <artifactId>neo4j-cypher-frontend-3.4</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>

diff --git a/...er-3.4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/CypherCompilerFactory.scala b/...er-3.4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/CypherCompilerFactory.scala
@@ -28,7 +28,7 @@ import org.neo4j.cypher.internal.frontend.v3_4.helpers.rewriting.RewriterStepSeq
 import org.neo4j.cypher.internal.frontend.v3_4.phases.{Monitors, Transformer}
 
 class CypherCompilerFactory[C <: CompilerContext, T <: Transformer[C, LogicalPlanState, LogicalPlanState]] {
-  val monitorTag = "cypher3.3"
+  val monitorTag = "cypher3.4"
 
   def costBasedCompiler(config: CypherCompilerConfiguration,
                         clock: Clock,

diff --git a/...ala/org/neo4j/cypher/internal/compiler/v3_4/ProcedureCallOrSchemaCommandPlanBuilder.scala b/...ala/org/neo4j/cypher/internal/compiler/v3_4/ProcedureCallOrSchemaCommandPlanBuilder.scala
@@ -27,7 +27,7 @@ import org.neo4j.cypher.internal.frontend.v3_4.phases.CompilationPhaseTracer.Com
 import org.neo4j.cypher.internal.frontend.v3_4.phases.{BaseState, Condition, Phase}
 import org.neo4j.cypher.internal.ir.v3_4.IdName
 import org.neo4j.cypher.internal.v3_4.logical
-import org.neo4j.cypher.internal.v3_4.logical.plans.{LogicalPlan, StandAloneProcedureCall}
+import org.neo4j.cypher.internal.v3_4.logical.plans.{LogicalPlan, ResolvedCall, StandAloneProcedureCall}
 
 /**
   * This planner takes on queries that requires no planning such as procedures and schema commands

diff --git a/...4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/phases/DeprecationWarnings.scala b/...4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/phases/DeprecationWarnings.scala
@@ -24,7 +24,7 @@ import org.neo4j.cypher.internal.frontend.v3_4.ast.{ProcedureResultItem, Stateme
 import org.neo4j.cypher.internal.frontend.v3_4.notification.{DeprecatedFieldNotification, DeprecatedProcedureNotification, InternalNotification, ProcedureWarningNotification}
 import org.neo4j.cypher.internal.frontend.v3_4.phases.CompilationPhaseTracer.CompilationPhase.DEPRECATION_WARNINGS
 import org.neo4j.cypher.internal.frontend.v3_4.phases.{BaseContext, BaseState, VisitorPhase}
-import org.neo4j.cypher.internal.v3_4.logical.plans.FieldSignature
+import org.neo4j.cypher.internal.v3_4.logical.plans.{FieldSignature, ProcedureSignature, ResolvedCall}
 
 object ProcedureDeprecationWarnings extends VisitorPhase[BaseContext, BaseState] {
   override def visit(value: BaseState, context: BaseContext): Unit = {

diff --git a/....4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/Eagerness.scala b/....4/src/main/scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/Eagerness.scala
@@ -22,7 +22,7 @@ package org.neo4j.cypher.internal.compiler.v3_4.planner.logical
 import org.neo4j.cypher.internal.frontend.v3_4.helpers.fixedPoint
 import org.neo4j.cypher.internal.frontend.v3_4.{Rewriter, bottomUp}
 import org.neo4j.cypher.internal.ir.v3_4.{IdName, PlannerQuery, QueryGraph}
-import org.neo4j.cypher.internal.v3_4.logical.plans.{Apply, LogicalPlan, NodeLogicalLeafPlan}
+import org.neo4j.cypher.internal.v3_4.logical.plans._
 
 import scala.annotation.tailrec
 

diff --git a/...org/neo4j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/cleanUpEager.scala b/...org/neo4j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/cleanUpEager.scala
@@ -20,6 +20,7 @@
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical.plans.rewriter
 
 import org.neo4j.cypher.internal.frontend.v3_4.{Rewriter, bottomUp}
+import org.neo4j.cypher.internal.v3_4.logical.plans.{Eager, Limit, LoadCSV, UnwindCollection}
 
 case object cleanUpEager extends Rewriter {
 

diff --git a/...scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/useTop.scala b/...scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/plans/rewriter/useTop.scala
@@ -20,7 +20,7 @@
 package org.neo4j.cypher.internal.compiler.v3_4.planner.logical.plans.rewriter
 
 import org.neo4j.cypher.internal.frontend.v3_4.{Rewriter, bottomUp}
-import org.neo4j.cypher.internal.v3_4.logical.plans.{DoNotIncludeTies, Top}
+import org.neo4j.cypher.internal.v3_4.logical.plans.{DoNotIncludeTies, Limit, Sort, Top}
 
 /**
   * When doing ORDER BY c1,c2,...,cn LIMIT e, we don't have to sort the full result in one go

diff --git a/...a/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/steps/LogicalPlanProducer.scala b/...a/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/steps/LogicalPlanProducer.scala
@@ -27,7 +27,7 @@ import org.neo4j.cypher.internal.frontend.v3_4.ast._
 import org.neo4j.cypher.internal.frontend.v3_4.symbols._
 import org.neo4j.cypher.internal.frontend.v3_4.{InternalException, SemanticDirection, ast, _}
 import org.neo4j.cypher.internal.ir.v3_4._
-import org.neo4j.cypher.internal.v3_3.logical.plans.{DeleteExpression => DeleteExpressionPlan, Limit => LimitPlan, LoadCSV => LoadCSVPlan, Skip => SkipPlan}
+import org.neo4j.cypher.internal.v3_4.logical.plans.{DeleteExpression => DeleteExpressionPlan, Limit => LimitPlan, LoadCSV => LoadCSVPlan, Skip => SkipPlan}
 import org.neo4j.cypher.internal.v3_4.logical.plans.{DeleteExpression => _, _}
 
 /*

diff --git a/...rg/neo4j/cypher/internal/compiler/v3_4/planner/logical/steps/triadicSelectionFinder.scala b/...rg/neo4j/cypher/internal/compiler/v3_4/planner/logical/steps/triadicSelectionFinder.scala
@@ -23,7 +23,7 @@ import org.neo4j.cypher.internal.compiler.v3_4.planner.logical.{CandidateGenerat
 import org.neo4j.cypher.internal.frontend.v3_4.SemanticDirection
 import org.neo4j.cypher.internal.frontend.v3_4.ast.{Expression, _}
 import org.neo4j.cypher.internal.ir.v3_4.{IdName, QueryGraph}
-import org.neo4j.cypher.internal.v3_4.logical.plans.{Expand, ExpandAll, LogicalPlan}
+import org.neo4j.cypher.internal.v3_4.logical.plans.{Expand, ExpandAll, LogicalPlan, Selection}
 
 object triadicSelectionFinder extends CandidateGenerator[LogicalPlan] {
 

diff --git a/....4/src/test/scala/org/neo4j/cypher/internal/compiler/v3_4/RewriteProcedureCallsTest.scala b/....4/src/test/scala/org/neo4j/cypher/internal/compiler/v3_4/RewriteProcedureCallsTest.scala
@@ -22,6 +22,7 @@ package org.neo4j.cypher.internal.compiler.v3_4
 import org.neo4j.cypher.internal.compiler.v3_4.phases.RewriteProcedureCalls
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
 import org.neo4j.cypher.internal.frontend.v3_4.symbols._
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.v3_4.logical.plans._
 
 class RewriteProcedureCallsTest extends CypherFunSuite with AstConstructionTestSupport {

diff --git a/....4/src/test/scala/org/neo4j/cypher/internal/compiler/v3_4/ScopeTreeVerificationTest.scala b/....4/src/test/scala/org/neo4j/cypher/internal/compiler/v3_4/ScopeTreeVerificationTest.scala
@@ -20,6 +20,7 @@
 package org.neo4j.cypher.internal.compiler.v3_4
 
 import org.neo4j.cypher.internal.frontend.v3_4.helpers.StringHelper._
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.frontend.v3_4.{Scope, ScopeTreeVerifier}
 
 class ScopeTreeVerificationTest extends CypherFunSuite {

diff --git a/...piler-3.4/src/test/scala/org/neo4j/cypher/internal/compiler/v3_4/ast/CallClauseTest.scala b/...piler-3.4/src/test/scala/org/neo4j/cypher/internal/compiler/v3_4/ast/CallClauseTest.scala
@@ -21,6 +21,7 @@ package org.neo4j.cypher.internal.compiler.v3_4.ast
 
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
 import org.neo4j.cypher.internal.frontend.v3_4.symbols._
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.frontend.v3_4.{SemanticCheckResult, SemanticState}
 import org.neo4j.cypher.internal.v3_4.logical.plans._
 

diff --git a/...eo4j/cypher/internal/compiler/v3_4/ast/convert/plannerQuery/StatementConvertersTest.scala b/...eo4j/cypher/internal/compiler/v3_4/ast/convert/plannerQuery/StatementConvertersTest.scala
@@ -24,6 +24,7 @@ import org.neo4j.cypher.internal.frontend.v3_4.SemanticDirection.{BOTH, INCOMING
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
 import org.neo4j.cypher.internal.frontend.v3_4.helpers.StringHelper._
 import org.neo4j.cypher.internal.frontend.v3_4.symbols._
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.ir.v3_4._
 import org.neo4j.cypher.internal.v3_4.logical.plans.{FieldSignature, ProcedureReadOnlyAccess, ProcedureSignature, QualifiedName}
 

diff --git a/...ala/org/neo4j/cypher/internal/compiler/v3_4/ast/rewriters/CollapseInCollectionsTest.scala b/...ala/org/neo4j/cypher/internal/compiler/v3_4/ast/rewriters/CollapseInCollectionsTest.scala
@@ -22,6 +22,7 @@ package org.neo4j.cypher.internal.compiler.v3_4.ast.rewriters
 import org.neo4j.cypher.internal.compiler.v3_4.planner.AstRewritingTestSupport
 import org.neo4j.cypher.internal.compiler.v3_4.test_helpers.ContextHelper
 import org.neo4j.cypher.internal.frontend.v3_4.ast.rewriters.{CNFNormalizer, collapseMultipleInPredicates}
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 
 class CollapseInCollectionsTest extends CypherFunSuite with AstRewritingTestSupport {
 

diff --git a/...neo4j/cypher/internal/compiler/v3_4/ast/rewriters/ReturnItemSafeTopDownRewriterTest.scala b/...neo4j/cypher/internal/compiler/v3_4/ast/rewriters/ReturnItemSafeTopDownRewriterTest.scala
@@ -22,6 +22,7 @@ package org.neo4j.cypher.internal.compiler.v3_4.ast.rewriters
 import org.neo4j.cypher.internal.frontend.v3_4.Rewriter
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
 import org.neo4j.cypher.internal.frontend.v3_4.ast.rewriters.ReturnItemSafeTopDownRewriter
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 
 class ReturnItemSafeTopDownRewriterTest extends CypherFunSuite with AstConstructionTestSupport {
 

diff --git a/....4/src/test/scala/org/neo4j/cypher/internal/compiler/v3_4/helpers/ZeroOneOrManyTest.scala b/....4/src/test/scala/org/neo4j/cypher/internal/compiler/v3_4/helpers/ZeroOneOrManyTest.scala
@@ -19,6 +19,7 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.helpers
 
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.v3_4.logical.plans.{Many, One, Zero, ZeroOneOrMany}
 
 class ZeroOneOrManyTest extends CypherFunSuite {

diff --git a/...st/scala/org/neo4j/cypher/internal/compiler/v3_4/planner/LogicalPlanningTestSupport.scala b/...st/scala/org/neo4j/cypher/internal/compiler/v3_4/planner/LogicalPlanningTestSupport.scala
@@ -38,6 +38,7 @@ import org.neo4j.cypher.internal.frontend.v3_4.helpers.rewriting.RewriterStepSeq
 import org.neo4j.cypher.internal.frontend.v3_4.parser.CypherParser
 import org.neo4j.cypher.internal.frontend.v3_4.phases._
 import org.neo4j.cypher.internal.frontend.v3_4.symbols._
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.{CypherFunSuite, CypherTestSupport}
 import org.neo4j.cypher.internal.ir.v3_4._
 import org.neo4j.cypher.internal.v3_4.logical.plans._
 

diff --git a/...t/scala/org/neo4j/cypher/internal/compiler/v3_4/planner/LogicalPlanningTestSupport2.scala b/...t/scala/org/neo4j/cypher/internal/compiler/v3_4/planner/LogicalPlanningTestSupport2.scala
@@ -37,6 +37,7 @@ import org.neo4j.cypher.internal.frontend.v3_4.helpers.rewriting.RewriterStepSeq
 import org.neo4j.cypher.internal.frontend.v3_4.helpers.rewriting.RewriterStepSequencer.newPlain
 import org.neo4j.cypher.internal.frontend.v3_4.parser.CypherParser
 import org.neo4j.cypher.internal.frontend.v3_4.phases._
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.{CypherFunSuite, CypherTestSupport}
 import org.neo4j.cypher.internal.frontend.v3_4.{Foldable, PropertyKeyId, SemanticTable}
 import org.neo4j.cypher.internal.ir.v3_4._
 import org.neo4j.cypher.internal.v3_4.logical.plans.{LogicalPlan, ProduceResult}

diff --git a/...-3.4/src/test/scala/org/neo4j/cypher/internal/compiler/v3_4/planner/UpdateGraphTest.scala b/...-3.4/src/test/scala/org/neo4j/cypher/internal/compiler/v3_4/planner/UpdateGraphTest.scala
@@ -19,8 +19,9 @@
  */
 package org.neo4j.cypher.internal.compiler.v3_4.planner
 
-import org.neo4j.cypher.internal.frontend.v3_4.SemanticDirection
+import org.neo4j.cypher.internal.frontend.v3_4.{DummyPosition, SemanticDirection}
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.ir.v3_4._
 
 class UpdateGraphTest extends CypherFunSuite {

diff --git a/...la/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/CardinalityCostModelTest.scala b/...la/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/CardinalityCostModelTest.scala
@@ -22,7 +22,8 @@ package org.neo4j.cypher.internal.compiler.v3_4.planner.logical
 import org.neo4j.cypher.internal.compiler.v3_4.planner.LogicalPlanningTestSupport
 import org.neo4j.cypher.internal.compiler.v3_4.planner.logical.Metrics.QueryGraphSolverInput
 import org.neo4j.cypher.internal.frontend.v3_4.SemanticDirection
-import org.neo4j.cypher.internal.frontend.v3_4.ast.{HasLabels, LabelName}
+import org.neo4j.cypher.internal.frontend.v3_4.ast.{AstConstructionTestSupport, HasLabels, LabelName}
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.ir.v3_4.{Cost, LazyMode}
 import org.neo4j.cypher.internal.v3_4.logical.plans._
 

diff --git a/...pher/internal/compiler/v3_4/planner/logical/CartesianProductPlanningIntegrationTest.scala b/...pher/internal/compiler/v3_4/planner/logical/CartesianProductPlanningIntegrationTest.scala
@@ -21,6 +21,7 @@ package org.neo4j.cypher.internal.compiler.v3_4.planner.logical
 
 import org.neo4j.cypher.internal.compiler.v3_4.planner.BeLikeMatcher._
 import org.neo4j.cypher.internal.compiler.v3_4.planner.LogicalPlanningTestSupport2
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.ir.v3_4.{IdName, RegularPlannerQuery}
 import org.neo4j.cypher.internal.v3_4.logical.plans.{AllNodesScan, CartesianProduct, NodeByLabelScan, Selection}
 

diff --git a/...o4j/cypher/internal/compiler/v3_4/planner/logical/CreateNodePlanningIntegrationTest.scala b/...o4j/cypher/internal/compiler/v3_4/planner/logical/CreateNodePlanningIntegrationTest.scala
@@ -21,6 +21,7 @@ package org.neo4j.cypher.internal.compiler.v3_4.planner.logical
 
 import org.neo4j.cypher.internal.compiler.v3_4.planner.LogicalPlanningTestSupport2
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.ir.v3_4.IdName
 import org.neo4j.cypher.internal.v3_4.logical.plans._
 

diff --git a/...er/internal/compiler/v3_4/planner/logical/CreateRelationshipPlanningIntegrationTest.scala b/...er/internal/compiler/v3_4/planner/logical/CreateRelationshipPlanningIntegrationTest.scala
@@ -21,6 +21,7 @@ package org.neo4j.cypher.internal.compiler.v3_4.planner.logical
 
 import org.neo4j.cypher.internal.compiler.v3_4.planner.LogicalPlanningTestSupport2
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.ir.v3_4.IdName
 import org.neo4j.cypher.internal.v3_4.logical.plans._
 

diff --git a/...ala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/DefaultQueryPlannerTest.scala b/...ala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/DefaultQueryPlannerTest.scala
@@ -28,6 +28,7 @@ import org.neo4j.cypher.internal.compiler.v3_4.spi.PlanContext
 import org.neo4j.cypher.internal.frontend.v3_4.ast.{ASTAnnotationMap, Expression, Hint}
 import org.neo4j.cypher.internal.frontend.v3_4.phases.devNullLogger
 import org.neo4j.cypher.internal.frontend.v3_4.symbols._
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.frontend.v3_4.{ExpressionTypeInfo, SemanticTable}
 import org.neo4j.cypher.internal.ir.v3_4._
 import org.neo4j.cypher.internal.v3_4.logical.plans.{LogicalPlan, ProduceResult, Projection, SingleRow}

diff --git a/...g/neo4j/cypher/internal/compiler/v3_4/planner/logical/ExpandPlanningIntegrationTest.scala b/...g/neo4j/cypher/internal/compiler/v3_4/planner/logical/ExpandPlanningIntegrationTest.scala
@@ -22,6 +22,7 @@ package org.neo4j.cypher.internal.compiler.v3_4.planner.logical
 import org.neo4j.cypher.internal.compiler.v3_4.planner.BeLikeMatcher._
 import org.neo4j.cypher.internal.compiler.v3_4.planner.LogicalPlanningTestSupport2
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.frontend.v3_4.{LabelId, PropertyKeyId, SemanticDirection}
 import org.neo4j.cypher.internal.ir.v3_4.{Cardinality, IdName, PlannerQuery, RegularPlannerQuery}
 import org.neo4j.cypher.internal.v3_4.logical.plans._

diff --git a/...her/internal/compiler/v3_4/planner/logical/FindShortestPathsPlanningIntegrationTest.scala b/...her/internal/compiler/v3_4/planner/logical/FindShortestPathsPlanningIntegrationTest.scala
@@ -22,6 +22,7 @@ package org.neo4j.cypher.internal.compiler.v3_4.planner.logical
 import org.neo4j.cypher.internal.compiler.v3_4.planner.LogicalPlanningTestSupport2
 import org.neo4j.cypher.internal.frontend.v3_4.SemanticDirection
 import org.neo4j.cypher.internal.frontend.v3_4.ast.{Equals, Not, Variable}
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.ir.v3_4._
 import org.neo4j.cypher.internal.v3_4.logical.plans._
 

diff --git a/...org/neo4j/cypher/internal/compiler/v3_4/planner/logical/LeafPlanningIntegrationTest.scala b/...org/neo4j/cypher/internal/compiler/v3_4/planner/logical/LeafPlanningIntegrationTest.scala
@@ -27,9 +27,11 @@ import org.neo4j.cypher.internal.compiler.v3_4.planner.logical.Metrics.QueryGrap
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
 import org.neo4j.cypher.internal.frontend.v3_4.helpers.NonEmptyList
 import org.neo4j.cypher.internal.frontend.v3_4.symbols._
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.frontend.v3_4.{ExclusiveBound, InclusiveBound, LabelId, PropertyKeyId}
 import org.neo4j.cypher.internal.ir.v3_4.{Cost, IdName}
 import org.neo4j.cypher.internal.v3_4.logical.plans._
+import org.neo4j.cypher.internal.v3_4.logical.plans.Union
 
 class LeafPlanningIntegrationTest extends CypherFunSuite with LogicalPlanningTestSupport2 with AstConstructionTestSupport {
 

diff --git a/...eo4j/cypher/internal/compiler/v3_4/planner/logical/MergeNodePlanningIntegrationTest.scala b/...eo4j/cypher/internal/compiler/v3_4/planner/logical/MergeNodePlanningIntegrationTest.scala
@@ -21,6 +21,7 @@ package org.neo4j.cypher.internal.compiler.v3_4.planner.logical
 
 import org.neo4j.cypher.internal.compiler.v3_4.planner.LogicalPlanningTestSupport2
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.ir.v3_4.IdName
 import org.neo4j.cypher.internal.v3_4.logical.plans._
 

diff --git a/...her/internal/compiler/v3_4/planner/logical/MergeRelationshipPlanningIntegrationTest.scala b/...her/internal/compiler/v3_4/planner/logical/MergeRelationshipPlanningIntegrationTest.scala
@@ -22,6 +22,7 @@ package org.neo4j.cypher.internal.compiler.v3_4.planner.logical
 import org.neo4j.cypher.internal.compiler.v3_4.planner.LogicalPlanningTestSupport2
 import org.neo4j.cypher.internal.frontend.v3_4.SemanticDirection.OUTGOING
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.ir.v3_4.IdName
 import org.neo4j.cypher.internal.v3_4.logical.plans._
 

diff --git a/...r/internal/compiler/v3_4/planner/logical/NamedPathProjectionPlanningIntegrationTest.scala b/...r/internal/compiler/v3_4/planner/logical/NamedPathProjectionPlanningIntegrationTest.scala
@@ -22,6 +22,7 @@ package org.neo4j.cypher.internal.compiler.v3_4.planner.logical
 import org.neo4j.cypher.internal.compiler.v3_4.planner.LogicalPlanningTestSupport2
 import org.neo4j.cypher.internal.frontend.v3_4.SemanticDirection
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.v3_4.logical.plans.{Expand, NodeByLabelScan, Projection, Selection}
 
 class NamedPathProjectionPlanningIntegrationTest extends CypherFunSuite with LogicalPlanningTestSupport2 {

diff --git a/...j/cypher/internal/compiler/v3_4/planner/logical/NodeHashJoinPlanningIntegrationTest.scala b/...j/cypher/internal/compiler/v3_4/planner/logical/NodeHashJoinPlanningIntegrationTest.scala
@@ -22,6 +22,7 @@ package org.neo4j.cypher.internal.compiler.v3_4.planner.logical
 import org.neo4j.cypher.internal.compiler.v3_4.planner.LogicalPlanningTestSupport2
 import org.neo4j.cypher.internal.frontend.v3_4.SemanticDirection
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.ir.v3_4.{IdName, RegularPlannerQuery}
 import org.neo4j.cypher.internal.v3_4.logical.plans._
 

diff --git a/.../cypher/internal/compiler/v3_4/planner/logical/OptionalMatchPlanningIntegrationTest.scala b/.../cypher/internal/compiler/v3_4/planner/logical/OptionalMatchPlanningIntegrationTest.scala
@@ -24,8 +24,10 @@ import org.neo4j.cypher.internal.compiler.v3_4.planner.logical.plans.rewriter.un
 import org.neo4j.cypher.internal.frontend.v3_4.Foldable._
 import org.neo4j.cypher.internal.frontend.v3_4.SemanticDirection
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.ir.v3_4.{Cardinality, IdName, SimplePatternLength}
 import org.neo4j.cypher.internal.v3_4.logical.plans._
+import org.neo4j.cypher.internal.v3_4.logical.plans.Limit
 import org.neo4j.kernel.impl.util.dbstructure.DbStructureLargeOptionalMatchStructure
 
 class OptionalMatchPlanningIntegrationTest extends CypherFunSuite with LogicalPlanningTestSupport2 {

diff --git a/...pher/internal/compiler/v3_4/planner/logical/PatternPredicatePlanningIntegrationTest.scala b/...pher/internal/compiler/v3_4/planner/logical/PatternPredicatePlanningIntegrationTest.scala
@@ -25,6 +25,7 @@ import org.neo4j.cypher.internal.compiler.v3_4.planner._
 import org.neo4j.cypher.internal.frontend.v3_4.SemanticDirection
 import org.neo4j.cypher.internal.frontend.v3_4.SemanticDirection.OUTGOING
 import org.neo4j.cypher.internal.frontend.v3_4.ast._
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.ir.v3_4.{QueryGraph, RegularPlannerQuery}
 import org.neo4j.cypher.internal.v3_4.logical.plans._
 

diff --git a/...o4j/cypher/internal/compiler/v3_4/planner/logical/PickBestPlanUsingHintsAndCostTest.scala b/...o4j/cypher/internal/compiler/v3_4/planner/logical/PickBestPlanUsingHintsAndCostTest.scala
@@ -23,6 +23,7 @@ import org.neo4j.cypher.internal.compiler.v3_4.planner.LogicalPlanningTestSuppor
 import org.neo4j.cypher.internal.compiler.v3_4.planner.logical.steps.{LogicalPlanProducer, pickBestPlanUsingHintsAndCost}
 import org.neo4j.cypher.internal.frontend.v3_4.ast.{LabelName, PropertyKeyName, UsingIndexHint}
 import org.neo4j.cypher.internal.frontend.v3_4.phases.devNullLogger
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.ir.v3_4.{CardinalityEstimation, Cost, PlannerQuery}
 import org.neo4j.cypher.internal.v3_4.logical.plans.LogicalPlan
 

diff --git a/.../scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/PlanEventHorizonTest.scala b/.../scala/org/neo4j/cypher/internal/compiler/v3_4/planner/logical/PlanEventHorizonTest.scala
@@ -22,9 +22,10 @@ package org.neo4j.cypher.internal.compiler.v3_4.planner.logical
 import org.neo4j.cypher.internal.compiler.v3_4.planner.ProcedureCallProjection
 import org.neo4j.cypher.internal.compiler.v3_4.planner.logical.steps.LogicalPlanProducer
 import org.neo4j.cypher.internal.compiler.v3_4.spi.PlanContext
-import org.neo4j.cypher.internal.frontend.v3_4.SemanticTable
+import org.neo4j.cypher.internal.frontend.v3_4.{DummyPosition, SemanticTable}
 import org.neo4j.cypher.internal.frontend.v3_4.ast.SignedDecimalIntegerLiteral
 import org.neo4j.cypher.internal.frontend.v3_4.phases.InternalNotificationLogger
+import org.neo4j.cypher.internal.frontend.v3_4.test_helpers.CypherFunSuite
 import org.neo4j.cypher.internal.ir.v3_4.{Cardinality, CardinalityEstimation, RegularPlannerQuery, RegularQueryProjection}
 import org.neo4j.cypher.internal.v3_4.logical.plans.{ProcedureCall, Projection, ResolvedCall, SingleRow}