Add CREATE GRAPH to Grammar

Author: JoshInnis

src/backend/parser/cypher_analyze.c

@@ -1399,20 +1399,8 @@ cypher_parse_analyze(RawStmt *parseTree, const char *sourceText,
     if (numParams > 0)
         parse_fixed_parameters(pstate, paramTypes, numParams);
 
-    pstate->p_queryEnv = queryEnv;
-	query = parse_analyze(parseTree, sourceText, paramTypes, numParams,
-						  queryEnv);
-
-    return query;
-    //query = transformTopLevelStmt(pstate, parseTree);
-    if (list_length(parseTree->stmt) == 1 ) {
-      Node *n = linitial(parseTree->stmt);
-
-      
-
-       if (is_ag_node(n, cypher_create_graph)) {
-        cypher_create_graph *ccg = n;
-        //ereport(ERROR, errmsg("Here"));
+    if (is_ag_node(parseTree->stmt, cypher_create_graph)) {
+        cypher_create_graph *ccg = parseTree->stmt;
 
         query = cypher_create_graph_utility(pstate, ccg->graph_name);
 
@@ -1424,11 +1412,10 @@ cypher_parse_analyze(RawStmt *parseTree, const char *sourceText,
         free_parsestate(pstate);
 
         pgstat_report_query_id(query->queryId, false);
-        //PushActiveSnapshot(GetTransactionSnapshot());
         return query;
 
-      } else if (is_ag_node(n, cypher_use_graph)) {
-        cypher_use_graph *ccg = n;
+    } else if (is_ag_node(parseTree->stmt, cypher_use_graph)) {
+        cypher_use_graph *ccg = parseTree->stmt;
 
         query = cypher_use_graph_utility(pstate, ccg->graph_name);
 
@@ -1440,10 +1427,9 @@ cypher_parse_analyze(RawStmt *parseTree, const char *sourceText,
         free_parsestate(pstate);
 
         pgstat_report_query_id(query->queryId, false);
-        //PushActiveSnapshot(GetTransactionSnapshot());
         return query;
-      } else if (is_ag_node(n, cypher_drop_graph)) {
-        cypher_drop_graph *ccg = n;
+    } else if (is_ag_node(parseTree->stmt, cypher_drop_graph)) {
+        cypher_drop_graph *ccg = parseTree->stmt;
 
         query = cypher_drop_graph_utility(pstate, ccg->graph_name);
 
@@ -1455,22 +1441,21 @@ cypher_parse_analyze(RawStmt *parseTree, const char *sourceText,
         free_parsestate(pstate);
 
         pgstat_report_query_id(query->queryId, false);
-        //PushActiveSnapshot(GetTransactionSnapshot());
-        return query;
-        
-      }
-      else if (!IsA(n, List)){
-	        query = parse_analyze((makeRawStmt(n, 0)), sourceText, paramTypes, numParams,
+        return query;    
+    }
+
+    pstate->p_queryEnv = queryEnv;
+	query = parse_analyze(parseTree, sourceText, paramTypes, numParams,
 						  queryEnv);
 
-            return query;
-      }
-    }
+    return query;
+    //query = transformTopLevelStmt(pstate, parseTree);
+   /*
     Oid graph_oid = get_session_graph_oid();
     graph_cache_data *gcd = search_graph_namespace_cache(graph_oid);
 
-cpstate->graph_name = gcd->name.data;
-cpstate->graph_oid = graph_oid;
+    cpstate->graph_name = gcd->name.data;
+    cpstate->graph_oid = graph_oid;
 
     query = analyze_cypher(parseTree->stmt, pstate, sourceText, 0, gcd->name.data, graph_oid, NULL);
     //PushActiveSnapshot(GetTransactionSnapshot());
@@ -1485,6 +1470,7 @@ cpstate->graph_oid = graph_oid;
     pgstat_report_query_id(query->queryId, false);
 
     return query;
+    */
 }