Merge pull request #195 from cwida/19-support-create-or-replace-prope…

…rty-graph Add support for CREATE OR REPLACE PROPERTY GRAPH
cwida · Mar 8, 2024 · 8bd29f5 · 8bd29f5
2 parents e55aa6d + 65a432e
commit 8bd29f5
Show file tree

Hide file tree

Showing 5 changed files with 18,355 additions and 18,296 deletions.
diff --git a/src/parser/transform/statement/transform_create_property_graph.cpp b/src/parser/transform/statement/transform_create_property_graph.cpp
@@ -136,7 +136,7 @@ Transformer::TransformCreatePropertyGraph(duckdb_libpgquery::PGCreatePropertyGra
 	case_insensitive_map_t<string> table_alias_map;
 	auto property_graph_name = TransformQualifiedName(*stmt.name);
 	info->property_graph_name = property_graph_name.name;
-
+	info->on_conflict = TransformOnConflict(stmt.onconflict);
 	D_ASSERT(stmt.vertex_tables);
 	for (auto &vertex_table = stmt.vertex_tables->head; vertex_table != nullptr; vertex_table = lnext(vertex_table)) {
 		auto node = reinterpret_cast<duckdb_libpgquery::PGNode *>(vertex_table->data.ptr_value);

diff --git a/third_party/libpg_query/grammar/statements/pgq.y b/third_party/libpg_query/grammar/statements/pgq.y
@@ -87,9 +87,24 @@ CreatePropertyGraphStmt:
 				n->name = $4;
 				n->vertex_tables = $9?lappend($9,$8):list_make1($8);
 				n->edge_tables = $11;
+				n->onconflict = PG_ERROR_ON_CONFLICT;
 				$$ = (PGNode *)n;
 			}
 		;
+		|
+		CREATE_P OR REPLACE PROPERTY GRAPH qualified_name
+        		VertexOrNode TABLES '(' VertexTableDefinition VertexTableDefinitionList ')'
+        		EdgeTablesClauseOptional
+        			{
+        				PGCreatePropertyGraphStmt *n = makeNode(PGCreatePropertyGraphStmt);
+        				n->name = $6;
+        				n->vertex_tables = $11?lappend($11,$10):list_make1($10);
+        				n->edge_tables = $13;
+        				n->onconflict = PG_REPLACE_ON_CONFLICT;
+        				$$ = (PGNode *)n;
+        			}
+        		;
+
 
 VertexTableDefinitionList:
 		',' VertexTableDefinition 

diff --git a/third_party/libpg_query/include/nodes/nodes.hpp b/third_party/libpg_query/include/nodes/nodes.hpp
@@ -431,8 +431,8 @@ typedef enum PGNodeTag {
 	T_PGAttachStmt,
 	T_PGDetachStmt,
 	T_PGUseStmt,
-    T_PGDropPropertyGraphStmt,   /* SQL/PGQ extension */
-    T_PGCreatePropertyGraphStmt, /* SQL/PGQ extension */
+	T_PGDropPropertyGraphStmt,   /* SQL/PGQ extension */
+	T_PGCreatePropertyGraphStmt, /* SQL/PGQ extension */
 
 	/*
 	 * TAGS FOR PARSE TREE NODES (parsenodes.h)

diff --git a/third_party/libpg_query/include/nodes/parsenodes.hpp b/third_party/libpg_query/include/nodes/parsenodes.hpp
@@ -2178,6 +2178,7 @@ typedef struct PGCreatePropertyGraphStmt {
     PGRangeVar *name;
     PGList *vertex_tables;
     PGList *edge_tables;
+	PGOnCreateConflict onconflict;        /* what to do on create conflict */
 } PGCreatePropertyGraphStmt;
 
 typedef struct PGPropertyGraphTable {