Push clause to call_subquery

src/ast/ast_rewrite_call_subquery.c

@@ -232,25 +232,7 @@
 	// -------------------------------------------------------------------------
 	// replace original clause with fully populated one
 	// -------------------------------------------------------------------------
-
-	cypher_astnode_t *query = cypher_ast_call_subquery_get_query(callsubquery);
-
-	uint n_clauses = cypher_ast_query_nclauses(query);
-	cypher_astnode_t *clauses[n_clauses + 1];
-	for(uint i = 0; i < first_ind; i++) {
-		clauses[i] = cypher_ast_clone(cypher_ast_query_get_clause(query, i));
-	}
-
-	clauses[first_ind] = new_clause;
-
-	for(uint i = first_ind; i < n_clauses; i++) {
-		clauses[i + 1] = cypher_ast_clone(cypher_ast_query_get_clause(query, i));
-	}
-
-	cypher_astnode_t *q = cypher_ast_query(NULL, 0, clauses, n_clauses + 1,
-		clauses, n_clauses + 1, range);
-
-	cypher_ast_call_subquery_replace_query(callsubquery, q);
+	cypher_ast_call_subquery_push_clause(callsubquery, new_clause, first_ind);
 }
 
 // replace all intermediate WITH clauses in the query with new WITH clauses,
@@ -563,29 +545,15 @@
 		query = cypher_ast_call_subquery_get_query(node);
 	}
 
-	uint nclauses = cypher_ast_query_nclauses(query);
-
 	// create a star projection
 	struct cypher_input_range range = {0};
 	cypher_astnode_t *star_projection = cypher_ast_with(false, true, NULL, 0,
 		NULL, NULL, NULL, NULL, NULL, 0, range);
 
-	cypher_astnode_t *clauses[nclauses + 1];
-	for(uint i = 0; i < idx; i++) {
-		clauses[i] = cypher_ast_clone(cypher_ast_query_get_clause(query, i));
-	}
-	clauses[idx] = star_projection;
-	for(uint i = idx; i < nclauses; i++) {
-		clauses[i + 1] = cypher_ast_clone(cypher_ast_query_get_clause(query, i));
-	}
-
-	cypher_astnode_t *new_query = cypher_ast_query(NULL, 0, clauses,
-		nclauses + 1, clauses, nclauses + 1, range);
-
 	if(type == CYPHER_AST_STATEMENT) {
-		cypher_ast_statement_replace_body(node, new_query);
+		cypher_ast_statement_push_clause(node, star_projection, idx);
 	} else {
-		cypher_ast_call_subquery_replace_query(node, new_query);
+		cypher_ast_call_subquery_push_clause(node, star_projection, idx);
 	}
 }
 
@@ -641,7 +609,7 @@
 	const cypher_astnode_t *root  // root of AST
 ) {
 	if(cypher_astnode_type(root) != CYPHER_AST_STATEMENT) {
 		return false;
 	}
 
 	// retrieve the root's body