Revert changes to the transformer

Author: Dtenwolde

src/include/duckdb/parser/transformer.hpp

@@ -339,12 +339,12 @@ class Transformer {
 	                                                           case_insensitive_set_t &global_label_set,
 	                                                           case_insensitive_map_t<string> &table_alias_map);
 	//! Transform a path pattern (SQL/PGQ)
-	unique_ptr<PathPattern> TransformPath(duckdb_libpgquery::PGPathPattern *root, case_insensitive_map_t<idx_t>& anonymous_variable_map);
+	unique_ptr<PathPattern> TransformPath(duckdb_libpgquery::PGPathPattern *root);
 	//! Transform a path element (SQL/PGQ)
-	static unique_ptr<PathElement> TransformPathElement(duckdb_libpgquery::PGPathElement *element, case_insensitive_map_t<idx_t>& anonymous_variable_map);
+	static unique_ptr<PathElement> TransformPathElement(duckdb_libpgquery::PGPathElement *element);
 	//! Transform a subpath (SQL/PGQ)
 	unique_ptr<SubPath> TransformSubPathElement(duckdb_libpgquery::PGSubPath *element,
-	                                            unique_ptr<PathPattern> &path_pattern, case_insensitive_map_t<idx_t>& anonymous_variable_map);
+	                                            unique_ptr<PathPattern> &path_pattern);
 
 	//! Transform a Postgres duckdb_libpgquery::T_PGDropPropertyGraphStmt node into a Drop[Table,Schema]Statement
 	unique_ptr<SQLStatement> TransformDropPropertyGraph(duckdb_libpgquery::PGDropPropertyGraphStmt &node);

src/parser/transform/tableref/transform_match.cpp

@@ -4,7 +4,7 @@
 
 namespace duckdb {
 
-unique_ptr<PathElement> Transformer::TransformPathElement(duckdb_libpgquery::PGPathElement *element, case_insensitive_map_t<idx_t>& anonymous_variable_map) {
+unique_ptr<PathElement> Transformer::TransformPathElement(duckdb_libpgquery::PGPathElement *element) {
 	//! Vertex or edge pattern
 	auto result = make_uniq<PathElement>(PGQPathReferenceType::PATH_ELEMENT);
 	switch (element->match_type) {
@@ -33,32 +33,15 @@ unique_ptr<PathElement> Transformer::TransformPathElement(duckdb_libpgquery::PGP
 	std::string label_name = StringUtil::Lower(label_expression->name);
 	result->label = label_name;
 	if (!element->element_var) {
-		// Case: Anonymous node with label `:N`
-		if (anonymous_variable_map.find(label_name) != anonymous_variable_map.end()) {
-			throw ConstraintException("Ambiguous anonymous variable pattern detected for label '" + label_name + "'. "
-									  "Please provide an explicit variable name.");
-		}
-		anonymous_variable_map[label_name] = 1;
-		result->variable_binding = label_name;
+		result->variable_binding = "";
 	} else {
-		// Case: Explicitly named node (e.g., `n:N`)
-		std::string variable_name = element->element_var;
-		// Check if this label was already used as an anonymous variable
-		if (anonymous_variable_map.find(variable_name) != anonymous_variable_map.end() &&
-			anonymous_variable_map[variable_name] == 1) {
-			throw ConstraintException("Conflicting variable bindings: anonymous node with variable '" + variable_name +
-									  "' was already assigned. Provide explicit variable names for all occurrences.");
-			}
-		anonymous_variable_map[variable_name] = 1;
-
-		// Register this explicitly named variable
-		result->variable_binding = variable_name;
+		result->variable_binding = element->element_var;
 	}
 	return result;
 }
 
 unique_ptr<SubPath> Transformer::TransformSubPathElement(duckdb_libpgquery::PGSubPath *root,
-                                                         unique_ptr<PathPattern> &path_pattern, case_insensitive_map_t<idx_t>& anonymous_variable_map) {
+                                                         unique_ptr<PathPattern> &path_pattern) {
 	auto result = make_uniq<SubPath>(PGQPathReferenceType::SUBPATH);
 
 	result->where_clause = TransformExpression(root->where_clause);
@@ -103,18 +86,18 @@ unique_ptr<SubPath> Transformer::TransformSubPathElement(duckdb_libpgquery::PGSu
 		auto path_node = reinterpret_cast<duckdb_libpgquery::PGNode *>(node->data.ptr_value);
 		if (path_node->type == duckdb_libpgquery::T_PGPathElement) {
 			auto element = reinterpret_cast<duckdb_libpgquery::PGPathElement *>(path_node);
-			auto path_element = TransformPathElement(element, anonymous_variable_map);
+			auto path_element = TransformPathElement(element);
 			result->path_list.push_back(std::move(path_element));
 		} else if (path_node->type == duckdb_libpgquery::T_PGSubPath) {
 			auto subpath = reinterpret_cast<duckdb_libpgquery::PGSubPath *>(path_node);
-			auto subpath_element = TransformSubPathElement(subpath, path_pattern, anonymous_variable_map);
+			auto subpath_element = TransformSubPathElement(subpath, path_pattern);
 			result->path_list.push_back(std::move(subpath_element));
 		}
 	}
 	return result;
 }
 
-unique_ptr<PathPattern> Transformer::TransformPath(duckdb_libpgquery::PGPathPattern *root, case_insensitive_map_t<idx_t>& anonymous_variable_map) {
+unique_ptr<PathPattern> Transformer::TransformPath(duckdb_libpgquery::PGPathPattern *root) {
 	auto result = make_uniq<PathPattern>();
 	result->all = root->all;
 	result->shortest = root->shortest;
@@ -135,11 +118,11 @@ unique_ptr<PathPattern> Transformer::TransformPath(duckdb_libpgquery::PGPathPatt
 		auto path_node = reinterpret_cast<duckdb_libpgquery::PGNode *>(node->data.ptr_value);
 		if (path_node->type == duckdb_libpgquery::T_PGPathElement) {
 			auto element = reinterpret_cast<duckdb_libpgquery::PGPathElement *>(path_node);
-			auto path_element = TransformPathElement(element, anonymous_variable_map);
+			auto path_element = TransformPathElement(element);
 			result->path_elements.push_back(std::move(path_element));
 		} else if (path_node->type == duckdb_libpgquery::T_PGSubPath) {
 			auto subpath = reinterpret_cast<duckdb_libpgquery::PGSubPath *>(path_node);
-			auto subpath_element = TransformSubPathElement(subpath, result, anonymous_variable_map);
+			auto subpath_element = TransformSubPathElement(subpath, result);
 			result->path_elements.push_back(std::move(subpath_element));
 		} else {
 			throw NotImplementedException("Path node type " + NodetypeToString(path_node->type) + " not recognized");
@@ -153,7 +136,6 @@ unique_ptr<TableRef> Transformer::TransformMatch(duckdb_libpgquery::PGMatchClaus
 	auto match_info = make_uniq<MatchExpression>();
 	match_info->pg_name = root.pg_name; // Name of the property graph to bind to
 	string alias_name;
-	case_insensitive_map_t<idx_t> anonymous_variable_map; // Map of anonymous variables to their bound names
 	if (root.graph_table) {
 		alias_name = TransformQualifiedName(*root.graph_table).name;
 	}
@@ -165,7 +147,7 @@ unique_ptr<TableRef> Transformer::TransformMatch(duckdb_libpgquery::PGMatchClaus
 
 	for (auto node = root.paths->head; node != nullptr; node = lnext(node)) {
 		auto path = reinterpret_cast<duckdb_libpgquery::PGPathPattern *>(node->data.ptr_value);
-		auto transformed_path = TransformPath(path, anonymous_variable_map);
+		auto transformed_path = TransformPath(path);
 		match_info->path_patterns.push_back(std::move(transformed_path));
 	}