Renamed path_list to path_patterns to avoid confusion with subpath pa…

…th_list
cwida · Aug 11, 2023 · ccfa69c · ccfa69c
1 parent 5d3ee94
commit ccfa69c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/include/duckdb/parser/tableref/matchref.hpp b/src/include/duckdb/parser/tableref/matchref.hpp
@@ -17,7 +17,7 @@ class MatchExpression : public ParsedExpression {
 
 	string pg_name;
 	string alias;
-	vector<unique_ptr<PathPattern>> path_list;
+	vector<unique_ptr<PathPattern>> path_patterns;
 
 	vector<unique_ptr<ParsedExpression>> column_list;
 

diff --git a/src/parser/tableref/matchref.cpp b/src/parser/tableref/matchref.cpp
@@ -9,10 +9,10 @@ string MatchExpression::ToString() const {
 	string result = "GRAPH_TABLE (";
 	result += pg_name + " MATCH";
 
-	for (idx_t i = 0; i < path_list.size(); i++) {
+	for (idx_t i = 0; i < path_patterns.size(); i++) {
 		(i > 0) ? result += ", " : result;
-		for (idx_t j = 0; j < path_list[i]->path_elements.size(); j++) {
-			auto &path_reference = path_list[i]->path_elements[j];
+		for (idx_t j = 0; j < path_patterns[i]->path_elements.size(); j++) {
+			auto &path_reference = path_patterns[i]->path_elements[j];
 			switch (path_reference->path_reference_type) {
 			case PGQPathReferenceType::PATH_ELEMENT: {
 				auto path_element = reinterpret_cast<PathElement *>(path_reference.get());
@@ -64,13 +64,13 @@ bool MatchExpression::Equals(const BaseExpression &other_p) const {
 		return false;
 	}
 
-	if (path_list.size() != other.path_list.size()) {
+	if (path_patterns.size() != other.path_patterns.size()) {
 		return false;
 	}
 
 	// path_list
-	for (idx_t i = 0; i < path_list.size(); i++) {
-		if (!path_list[i]->Equals(other.path_list[i].get())) {
+	for (idx_t i = 0; i < path_patterns.size(); i++) {
+		if (!path_patterns[i]->Equals(other.path_patterns[i].get())) {
 			return false;
 		}
 	}
@@ -104,8 +104,8 @@ unique_ptr<ParsedExpression> MatchExpression::Copy() const {
 	copy->pg_name = pg_name;
 	copy->alias = alias;
 
-	for (auto &path : path_list) {
-		copy->path_list.push_back(path->Copy());
+	for (auto &path : path_patterns) {
+		copy->path_patterns.push_back(path->Copy());
 	}
 
 	for (auto &column : column_list) {
@@ -120,7 +120,7 @@ unique_ptr<ParsedExpression> MatchExpression::Copy() const {
 void MatchExpression::Serialize(FieldWriter &writer) const {
 	writer.WriteString(pg_name);
 	writer.WriteString(alias);
-	writer.WriteSerializableList<PathPattern>(path_list);
+	writer.WriteSerializableList<PathPattern>(path_patterns);
 	writer.WriteSerializableList<ParsedExpression>(column_list);
 	writer.WriteOptional(where_clause);
 }
@@ -129,7 +129,7 @@ unique_ptr<ParsedExpression> MatchExpression::Deserialize(FieldReader &reader) {
 	auto result = make_uniq<MatchExpression>();
 	result->pg_name = reader.ReadRequired<string>();
 	result->alias = reader.ReadRequired<string>();
-	result->path_list = reader.ReadRequiredSerializableList<PathPattern>();
+	result->path_patterns = reader.ReadRequiredSerializableList<PathPattern>();
 	result->column_list = reader.ReadRequiredSerializableList<ParsedExpression>();
 	result->where_clause = reader.ReadOptional<ParsedExpression>(nullptr);
 	return std::move(result);

diff --git a/src/parser/transform/tableref/transform_match.cpp b/src/parser/transform/tableref/transform_match.cpp
@@ -137,7 +137,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);
-		match_info->path_list.push_back(std::move(transformed_path));
+		match_info->path_patterns.push_back(std::move(transformed_path));
 	}
 
 	for (auto node = root.columns->head; node != nullptr; node = lnext(node)) {