Support vertex properties in CREATE Clause

JoshInnis · JoshInnis · commit f5f76557412d · 2025-08-17T03:43:06.000-07:00
diff --git a/regress/sql/cypher_create.sql b/regress/sql/cypher_create.sql
@@ -29,18 +29,16 @@ SELECT * FROM cypher_create._ag_label_vertex;
 
 MATCH () RETURN 1;
 
-CREATE VLABEL test;
-SELECT * FROM postgraph.ag_label;
+SELECT '{}'::postgraph.gtype;
+CREATE ({msg: 'Hello World'});
+MATCH (a) RETURN a;
+SELECT * FROM cypher_create._ag_label_vertex;
 
-CREATE (:test);
-SELECT * FROM postgraph.ag_label;
-SELECT * FROM cypher_create.test;
 
+CREATE VLABEL test;
+CREATE (:test);
 
 CREATE (:test2);
-SELECT * FROM postgraph.ag_label;
-SELECT * FROM cypher_create.test2;
-
 
 MATCH () RETURN 1;
 
@@ -52,11 +50,6 @@ CREATE ()-[]->();
 
 CREATE ()-[:elabel]->();
 
-
-EXPLAIN MATCH ()-[]->() RETURN 1;
-
-EXPLAIN ANALYZE MATCH ()-[]->() RETURN 1;
-
 MATCH ()-[]->() RETURN 1;
 
 MATCH ()<-[]-() RETURN 1;
@@ -73,12 +66,10 @@ MATCH ()-[]->(a) RETURN a;
 
 MATCH ()<-[]-(a) RETURN a;
 
-SELECT * FROM cypher_create._ag_label_vertex;
-
-SELECT * FROM cypher_create._adj__adj__ag_label_vertex;
-SELECT * FROM cypher_create._adj__ag_label_vertex;
-MATCH () RETURN 1;
+CREATE ()<-[{msg: 'Hello edge'}]-();
+CREATE ()-[{msg: 'Hello edge'}]->();
 
+MATCH ()<-[a]-() RETURN a;
 
 CYPHER WITH 1 as a
 CREATE ();
diff --git a/src/backend/executor/cypher_create.c b/src/backend/executor/cypher_create.c
@@ -267,8 +267,12 @@ static TupleTableSlot *exec_cypher_create(CustomScanState *csnode)
     EState *estate = css->css.ss.ps.state;
     ExprContext *econtext = css->css.ss.ps.ps_ExprContext;
 
-    TupleTableSlot *scanTupleSlot = econtext->ecxt_scantuple;
-
+    //TupleTableSlot *scanTupleSlot = econtext->ecxt_scantuple;
+    //econtext->ecxt_scantuple =
+      //      csnode->ss.ps.lefttree->ps_ProjInfo->pi_exprContext->ecxt_scantuple;
+    TupleTableSlot *slot = ExecProcNode(csnode->ss.ps.lefttree);
+    slot = csnode->ss.ps.lefttree->ps_ProjInfo->pi_exprContext->ecxt_scantuple;
+    slot->tts_ops->materialize(slot);
     if (list_length(css->pattern) != 1)
         ereport(ERROR, (errmsg_internal("executor create found a multi pattern")));
 
@@ -309,8 +313,16 @@ static TupleTableSlot *exec_cypher_create(CustomScanState *csnode)
         elemTupleSlot->tts_isnull[0] = false;
 
         // get the properties for this vertex
-        elemTupleSlot->tts_values[1] = NULL;
-        elemTupleSlot->tts_isnull[1] = true;
+        if (node->prop_attr_num == InvalidAttrNumber) {
+            elemTupleSlot->tts_values[1] = NULL;
+            elemTupleSlot->tts_isnull[1] = true;
+        } else {
+            //TupleTableSlot *scanTupleSlot = csnode->ss.ss_ScanTupleSlot;
+            //ereport(WARNING, errmsg("adsf %i", scanTupleSlot->tts_values[node->prop_attr_num]));
+            elemTupleSlot->tts_values[1] = slot->tts_values[node->prop_attr_num -  1];
+            elemTupleSlot->tts_isnull[1] = slot->tts_isnull[node->prop_attr_num - 1];
+        }
+
         // Insert the new vertex
         insert_entity_tuple(resultRelInfo, elemTupleSlot, estate);
 
@@ -331,9 +343,16 @@ static TupleTableSlot *exec_cypher_create(CustomScanState *csnode)
             
             elemTupleSlot->tts_values[2] = css->vertex_ids[0][i+1];
             elemTupleSlot->tts_isnull[2] = false;
-            // get the properties for this vertex
-            elemTupleSlot->tts_values[3] = NULL;
-            elemTupleSlot->tts_isnull[3] = true;
+
+
+            if (node->prop_attr_num == InvalidAttrNumber) {
+                elemTupleSlot->tts_values[3] = NULL;
+                elemTupleSlot->tts_isnull[3] = true;
+            } else {
+                //TupleTableSlot *scanTupleSlot = econtext->ecxt_scantuple;
+                elemTupleSlot->tts_values[3] = slot->tts_values[node->prop_attr_num];
+                elemTupleSlot->tts_isnull[3] = slot->tts_isnull[node->prop_attr_num];
+            }
 
             // Insert the new vertex
             insert_entity_tuple(resultRelInfo, elemTupleSlot, estate);
diff --git a/src/backend/nodes/cypher_copyfuncs.c b/src/backend/nodes/cypher_copyfuncs.c
@@ -100,6 +100,7 @@ void copy_cypher_target_node(ExtensibleNode *newnode, const ExtensibleNode *from
     COPY_SCALAR_FIELD(type);
     COPY_SCALAR_FIELD(flags);
     COPY_SCALAR_FIELD(dir);
+    COPY_SCALAR_FIELD(id_attr_num);
     COPY_SCALAR_FIELD(prop_attr_num);
     COPY_SCALAR_FIELD(relid);
     COPY_SCALAR_FIELD(adj_relid);
diff --git a/src/backend/nodes/cypher_outfuncs.c b/src/backend/nodes/cypher_outfuncs.c
@@ -367,6 +367,7 @@ void out_cypher_target_node(StringInfo str, const ExtensibleNode *node)
     WRITE_ENUM_FIELD(dir, cypher_rel_dir);
     WRITE_NODE_FIELD(id_expr);
     WRITE_NODE_FIELD(id_expr_state);
+    WRITE_INT32_FIELD(id_attr_num);
     WRITE_NODE_FIELD(prop_expr);
     WRITE_NODE_FIELD(prop_expr_state);
     WRITE_INT32_FIELD(prop_attr_num);
diff --git a/src/backend/nodes/cypher_readfuncs.c b/src/backend/nodes/cypher_readfuncs.c
@@ -216,6 +216,7 @@ void read_cypher_target_node(struct ExtensibleNode *node)
     READ_ENUM_FIELD(dir, cypher_rel_dir);
     READ_NODE_FIELD(id_expr);
     READ_NODE_FIELD(id_expr_state);
+    READ_INT_FIELD(id_attr_num);
     READ_NODE_FIELD(prop_expr);
     READ_NODE_FIELD(prop_expr_state);
     READ_INT_FIELD(prop_attr_num);
diff --git a/src/backend/parser/cypher_clause.c b/src/backend/parser/cypher_clause.c
@@ -301,6 +301,17 @@ static Node *make_edge_expr(cypher_parsestate *cpstate, ParseNamespaceItem *pnsi
     return (Node *)func_expr;
 }
 
+
+static Node *
+make_graphid_placeholder(cypher_parsestate *cpstate) {
+     
+    // typtypmod, typcollation, typlen, and typbyval of gtype are hard-coded.
+    Const *c = makeConst(GRAPHIDOID, -1, InvalidOid, -1, 0, false, false);
+    c->location = -1;
+
+    return (Node *)c;
+} 
+
 static Node *
 make_int_placeholder(cypher_parsestate *cpstate) {
         
@@ -400,6 +411,7 @@ static void validate_or_create_vlabel(cypher_parsestate *cpstate, cypher_node *n
     }
 }
 
+
 static Query *transform_cypher_create(cypher_parsestate *cpstate, cypher_clause *clause) {
     ParseState *pstate = (ParseState *)cpstate;
     cypher_create *self = (cypher_create *)clause->self;
@@ -439,53 +451,97 @@ static Query *transform_cypher_create(cypher_parsestate *cpstate, cypher_clause
             if (i % 2 == 1) {
                 cypher_node *node = (cypher_node *)lfirst(lc2);
 
+                cypher_target_node *target = make_ag_node(cypher_target_node);
+
                 if (node->label) 
                     validate_or_create_vlabel(cpstate, node);
                 else
                     node->label = AG_DEFAULT_LABEL_VERTEX;
                     
-                if (node->name)
-                    ereport(ERROR, (errmsg_internal("nodes in CREATE cannot have variable names")));
-
-                if (node->props)
-                    ereport(ERROR, (errmsg_internal("nodes in CREATE cannot have properties")));
-
-                cypher_target_node *target = make_ag_node(cypher_target_node);
+                if (node->name) {
+                           ereport(ERROR, (errmsg_internal("nodes in CREATE cannot be a variable")));
+  /* TODO: After props are supported
+                    target->variable_name = node->name;
+            
+                    query->targetList = lappend(query->targetList,
+                        makeTargetEntry(
+                            make_graphid_placeholder(cpstate),
+                            pstate->p_next_resno++,
+                            make_id_alias(get_next_default_alias(cpstate)), 
+                            false));
+                        }
+                    target->id_attr_num = list_length(query->targetList);
+
+                    query->targetList = lappend(query->targetList,
+                        makeTargetEntry(
+                            make_int_placeholder(cpstate),
+                            pstate->p_next_resno++,
+                            make_id_alias(get_next_default_alias(cpstate)), 
+                            false));
+                        }
+
+                    target->props_attr_num = list_length(query->targetList);
+*/
+                } else
+                    node->name = get_next_default_alias(cpstate);
+
+                if (node->props) {
+                    target->prop_attr_num = pstate->p_next_resno;
+                    query->targetList = lappend(query->targetList,
+                        makeTargetEntry(
+                            (Expr *)add_volatile_wrapper(
+                                transform_cypher_expr(cpstate, node->props, EXPR_KIND_INSERT_TARGET)),
+                            pstate->p_next_resno++,
+                            make_property_alias(node->name),
+                            false));
+    
+                } else {
+                    target->prop_attr_num = InvalidAttrNumber;
+                }
+        
 
                 label_cache_data *lcd = search_label_name_graph_cache(node->label, cpstate->graph_oid);
 
                 target->id_expr = (Expr *)build_column_default(RelationIdGetRelation(lcd->relation), 1);
                 target->relid = lcd->relation;
                 target->adj_relid = lcd->vertex_adjlist;
 
-                TargetEntry *te = makeTargetEntry(make_int_placeholder(cpstate), pstate->p_next_resno++, make_id_alias(get_next_default_alias(cpstate)), false);
-
                 ccp->target_nodes = lappend(ccp->target_nodes, target);
                 
-                query->targetList = lappend(query->targetList, te);
             } else {
                 cypher_relationship *edge = lfirst(lc2);
-
+                cypher_target_node *target = make_ag_node(cypher_target_node);
                 if (edge->label) 
                     validate_or_create_elabel(cpstate, edge);
                 else
                     edge->label = AG_DEFAULT_LABEL_EDGE;
 
                 if (edge->name)
                     ereport(ERROR, (errmsg_internal("edges in CREATE cannot have variable names")));
-
-                if (edge->props)
-                    ereport(ERROR, (errmsg_internal("edges in CREATE cannot have properties")));
-
+                else
+                    edge->name = get_next_default_alias(cpstate);
+                
+                if (edge->props) {
+                    target->prop_attr_num = pstate->p_next_resno;
+                    query->targetList = lappend(query->targetList,
+                        makeTargetEntry(
+                            (Expr *)add_volatile_wrapper(
+                                transform_cypher_expr(cpstate, edge->props, EXPR_KIND_INSERT_TARGET)),
+                            pstate->p_next_resno++,
+                            make_property_alias(edge->name),
+                            false));
+                } else {
+                    target->prop_attr_num = InvalidAttrNumber;
+                }
                 if (edge->dir != CYPHER_REL_DIR_RIGHT)
                     ereport(ERROR, (errmsg_internal("edges CREATE are right only right now")));
 
-                cypher_target_node *target = make_ag_node(cypher_target_node);
+
                 label_cache_data *lcd = search_label_name_graph_cache(edge->label, cpstate->graph_oid);
                 target->relid = lcd->relation;
 
                 target->id_expr = (Expr *)build_column_default(RelationIdGetRelation(lcd->relation), 1);
-
+                //target->prop_attr_num = InvalidAttrNumber;
                 ccp->target_nodes = lappend(ccp->target_nodes, target);
                 
             }
diff --git a/src/backend/utils/adt/vertex.c b/src/backend/utils/adt/vertex.c
@@ -102,13 +102,13 @@ build_vertex(PG_FUNCTION_ARGS) {
     graphid id = AG_GETARG_GRAPHID(0);
     Oid graph_oid = PG_GETARG_OID(1);
     gtype *properties = NULL;
-  /*  if (!PG_ARGISNULL(2)) {
+    if (!PG_ARGISNULL(2)) {
         properties = AG_GET_ARG_GTYPE_P(2);
 
         if (!AGT_ROOT_IS_OBJECT(properties))
             PG_RETURN_NULL();
     }
-*/
+
     AG_RETURN_VERTEX(create_vertex(id, graph_oid, properties));
 }
   
diff --git a/src/include/nodes/cypher_nodes.h b/src/include/nodes/cypher_nodes.h
@@ -348,52 +348,25 @@ typedef struct cypher_create_path
 typedef struct cypher_target_node
 {
     ExtensibleNode extensible;
-    // 'v' for vertex or 'e' for edge
     char type;
-    // flags defined below, prefaced with CYPHER_TARGET_NODE_FLAG_*
     uint32 flags;
-    // if an edge, denotes direction
     cypher_rel_dir dir;
-    /*
-     * Used to create the id for the vertex/edge,
-     * if the CYPHER_TARGET_NODE_FLAG_INSERT flag
-     * is set. Doing it this way will protect us when
-     * rescan gets implemented. By calling the function
-     * that creates the id ourselves, we won't have an
-     * issue where the id could be created then not used.
-     * Since there is a limited number of ids available, we
-     * don't want to waste them.
-     */
     Expr *id_expr;
     ExprState *id_expr_state;
-
+    AttrNumber id_attr_num;
     Expr *prop_expr;
     ExprState *prop_expr_state;
-    /*
-     * Attribute Number that this entity's properties
-     * are stored in the CustomScanState's child TupleTableSlot
-     */
     AttrNumber prop_attr_num;
-    // RelInfo for the table this entity will be stored in
     ResultRelInfo *resultRelInfo;
-    // elemTupleSlot used to insert the entity into its table
     TupleTableSlot *elemTupleSlot;
-    // relid that the label stores its entity
     Oid relid;
     
     Oid adj_relid;
     ResultRelInfo *adj_resultRelInfo;
-    // elemTupleSlot used to insert the entity into its table
     TupleTableSlot *adj_elemTupleSlot;
-    // label this entity belongs to.
     char *label_name;
-    // variable name for this entity
     char *variable_name;
-    /*
-     * Attribute number this entity needs to be stored in
-     * for parent execution nodes to reference it. If the
-     * entity is a varaible (CYPHER_TARGET_NODE_IS_VAR).
-     */
+    
     AttrNumber tuple_position;
 } cypher_target_node;
 

Original file line number	Diff line number	Diff line change
`@@ -102,13 +102,13 @@ build_vertex(PG_FUNCTION_ARGS) {`
`102`	`102`	`graphid id = AG_GETARG_GRAPHID(0);`
`103`	`103`	`Oid graph_oid = PG_GETARG_OID(1);`
`104`	`104`	`gtype *properties = NULL;`
`105`		`- /* if (!PG_ARGISNULL(2)) {`
	`105`	`+ if (!PG_ARGISNULL(2)) {`
`106`	`106`	`properties = AG_GET_ARG_GTYPE_P(2);`
`107`	`107`
`108`	`108`	`if (!AGT_ROOT_IS_OBJECT(properties))`
`109`	`109`	`PG_RETURN_NULL();`
`110`	`110`	`}`
`111`		`-*/`
	`111`	`+`
`112`	`112`	`AG_RETURN_VERTEX(create_vertex(id, graph_oid, properties));`
`113`	`113`	`}`
`114`	`114`