cypher2relalg: fix code comment bug as variable chaining between subq…

…ueries are already implemented. Ref #16
ftsrg · Apr 10, 2017 · eb2aadf · eb2aadf
1 parent e6c7165
commit eb2aadf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ingraph-cypher2relalg/src/main/java/ingraph/cypher2relalg/RelalgBuilder.xtend b/ingraph-cypher2relalg/src/main/java/ingraph/cypher2relalg/RelalgBuilder.xtend
@@ -204,7 +204,6 @@ class RelalgBuilder {
 				 * for each subQuery, but we retain the the label factories as well as
 				 * top-level container not to break the containment hierarchy and separate variable namespaces.
 				 */
-				// FIXME: chain "return" variables forward to the next builder
 				variableBuilderChain = variableBuilderChain.cloneBuilderWithNewVariableFactories
 				val builder = new RelalgBuilder(topLevelContainer, variableBuilderChain)
 				ops.add(

diff --git a/ingraph-cypher2relalg/src/main/java/ingraph/cypher2relalg/VariableBuilder.xtend b/ingraph-cypher2relalg/src/main/java/ingraph/cypher2relalg/VariableBuilder.xtend
@@ -135,6 +135,8 @@ class VariableBuilder {
 	/**
 	 * Creates a new VariableBuilder instance that has new variable factory instances
 	 * but retains label factories and the topLevelContainer.
+	 * 
+	 * This also chains forward expression variables, i.e. those from a WITH or RETURN clause
 	 */
 	def cloneBuilderWithNewVariableFactories() {
 		new VariableBuilder(topLevelContainer, vertexLabelFactory, edgeLabelFactory, expressionVariableFactoryExtended.elements.values,  logger)