Merge pull request #203 from cwida/41-allow-more-concise-syntax-when-…

…creating-property-graph

41 allow more concise syntax when creating property graph

src/parser/transform/statement/transform_create_property_graph.cpp

@@ -100,24 +100,32 @@ Transformer::TransformPropertyGraphTable(duckdb_libpgquery::PGPropertyGraphTable
 			pg_table->destination_reference = possible_dst_alias->second;
 		}
 
-		for (auto &src_key = graph_table->src_pk->head; src_key != nullptr; src_key = lnext(src_key)) {
-			auto key = reinterpret_cast<duckdb_libpgquery::PGValue *>(src_key->data.ptr_value);
-			pg_table->source_pk.emplace_back(key->val.str);
+		if (graph_table->src_pk) {
+			for (auto &src_key = graph_table->src_pk->head; src_key != nullptr; src_key = lnext(src_key)) {
+				auto key = reinterpret_cast<duckdb_libpgquery::PGValue *>(src_key->data.ptr_value);
+				pg_table->source_pk.emplace_back(key->val.str);
+			}
 		}
 
-		for (auto &dst_key = graph_table->dst_pk->head; dst_key != nullptr; dst_key = lnext(dst_key)) {
-			auto key = reinterpret_cast<duckdb_libpgquery::PGValue *>(dst_key->data.ptr_value);
-			pg_table->destination_pk.emplace_back(key->val.str);
+		if (graph_table->dst_pk) {
+			for (auto &dst_key = graph_table->dst_pk->head; dst_key != nullptr; dst_key = lnext(dst_key)) {
+				auto key = reinterpret_cast<duckdb_libpgquery::PGValue *>(dst_key->data.ptr_value);
+				pg_table->destination_pk.emplace_back(key->val.str);
+			}
 		}
 
-		for (auto &src_key = graph_table->src_fk->head; src_key != nullptr; src_key = lnext(src_key)) {
-			auto key = reinterpret_cast<duckdb_libpgquery::PGValue *>(src_key->data.ptr_value);
-			pg_table->source_fk.emplace_back(key->val.str);
+		if (graph_table->src_fk) {
+			for (auto &src_key = graph_table->src_fk->head; src_key != nullptr; src_key = lnext(src_key)) {
+				auto key = reinterpret_cast<duckdb_libpgquery::PGValue *>(src_key->data.ptr_value);
+				pg_table->source_fk.emplace_back(key->val.str);
+			}
 		}
 
-		for (auto &dst_key = graph_table->dst_fk->head; dst_key != nullptr; dst_key = lnext(dst_key)) {
-			auto key = reinterpret_cast<duckdb_libpgquery::PGValue *>(dst_key->data.ptr_value);
-			pg_table->destination_fk.emplace_back(key->val.str);
+		if (graph_table->dst_fk) {
+			for (auto &dst_key = graph_table->dst_fk->head; dst_key != nullptr; dst_key = lnext(dst_key)) {
+				auto key = reinterpret_cast<duckdb_libpgquery::PGValue *>(dst_key->data.ptr_value);
+				pg_table->destination_fk.emplace_back(key->val.str);
+			}
 		}
 	}
 	return pg_table;

third_party/libpg_query/grammar/statements/pgq.y

@@ -127,12 +127,26 @@ KeySpecification:
 		'(' name_list ')'			{ $$ = $2; }
 		;
 
-KeyDefinition:
-		KEY KeySpecification		{ $$ = $2; }
-		;
-
 KeyReference:
-		KeyDefinition REFERENCES	{ $$ = $1; }
+		KEY KeySpecification REFERENCES qualified_name '(' name_list ')'
+			{
+				/* Case where both KEY (id) and REFERENCES (id) are provided */
+				PGKeyReference *key_ref = makeNode(PGKeyReference);
+				key_ref->key_columns = $2;
+				key_ref->ref_table = $4;
+				key_ref->ref_columns = $6;
+				$$ = (PGNode *) key_ref;
+			}
+	|
+		qualified_name
+			{
+				/* Case where neither KEY (id) nor REFERENCES (id) are provided */
+				PGKeyReference *key_ref = makeNode(PGKeyReference);
+				key_ref->key_columns = NULL;
+				key_ref->ref_table = $1;
+				key_ref->ref_columns = NULL;
+				$$ = (PGNode *) key_ref;
+			}
 		;
 
 LabelList:
@@ -187,23 +201,25 @@ EdgeTableDefinitionList:
 
 EdgeTableDefinition:
 		QualifiednameOptionalAs
-		SOURCE KeyReference qualified_name KeySpecification
-		DESTINATION KeyReference qualified_name KeySpecification 
+		SOURCE KeyReference
+		DESTINATION KeyReference
 		PropertiesClause LabelOptional Discriminator
 			{
-				PGPropertyGraphTable *n = (PGPropertyGraphTable*) $12;
+				PGPropertyGraphTable *n = (PGPropertyGraphTable*) $8;
 				n->table = $1;
 				n->is_vertex_table = false;
-				n->src_fk = $3;
-				n->src_name = $4;
-				n->src_pk = $5;
-				n->dst_fk = $7;
-				n->dst_name = $8;
-				n->dst_pk = $9;
-				n->properties = $10;
-				/* Xth label in list is set iff discriminator Xth-bit==1 */
-				if (n->labels) n->labels = lappend(n->labels,makeString($11));
-				else n->labels = list_make1(makeString($11));
+				PGKeyReference *src_key_ref = (PGKeyReference *) $3;
+                n->src_fk = src_key_ref->key_columns;
+                n->src_name = src_key_ref->ref_table;
+                n->src_pk = src_key_ref->ref_columns;
+                PGKeyReference *dst_key_ref = (PGKeyReference *) $5;
+				n->dst_fk = dst_key_ref->key_columns;
+				n->dst_name = dst_key_ref->ref_table;
+				n->dst_pk = dst_key_ref->ref_columns;
+				n->properties = $6;
+				/* Handle labels and discriminator as before */
+				if (n->labels) n->labels = lappend(n->labels, makeString($7));
+				else n->labels = list_make1(makeString($7));
 				$$ = (PGNode *) n;
 			}
 		;

third_party/libpg_query/grammar/types/pgq.yh

@@ -6,8 +6,7 @@
 %type <list> VertexTableDefinitionList 
 %type <list> LabelList
 %type <list> KeySpecification
-%type <list> KeyDefinition
-%type <list> KeyReference
+%type <node> KeyReference
 %type <node> Discriminator
 %type <node> VertexTableDefinition 
 %type <list> EdgeTableDefinitionList 

third_party/libpg_query/include/nodes/nodes.hpp

@@ -502,6 +502,7 @@ typedef enum PGNodeTag {
     T_PGPathInfo,   /* SQL/PGQ extension */
     T_PGLabelTest,  /* SQL/PGQ extension */
     T_PGPathElement,/* SQL/PGQ extension */
+	T_PGKeyReference, /* SQL/PGQ extension */
 
 	/*
 	 * TAGS FOR REPLICATION GRAMMAR PARSE NODES (replnodes.h)

third_party/libpg_query/include/nodes/parsenodes.hpp

@@ -2203,6 +2203,13 @@ typedef struct PGCreatePropertyGraphStmt {
 	PGOnCreateConflict onconflict;        /* what to do on create conflict */
 } PGCreatePropertyGraphStmt;
 
+typedef struct PGKeyReference {
+	PGNodeTag type;
+	PGList	   *key_columns;   /* List of key column names (optional) */
+	PGRangeVar	   *ref_table;     /* The referenced table (mandatory) */
+	PGList	   *ref_columns;   /* List of referenced columns (optional) */
+} PGKeyReference;
+
 typedef struct PGPropertyGraphTable {
     PGNodeTag type;