duckdb 0.8.2-dev157.0 → 0.8.2-dev1573.0

package/src/duckdb/src/parser/expression/comparison_expression.cpp

@@ -9,6 +9,9 @@
 
 namespace duckdb {
 
+ComparisonExpression::ComparisonExpression(ExpressionType type) : ParsedExpression(type, ExpressionClass::COMPARISON) {
+}
+
 ComparisonExpression::ComparisonExpression(ExpressionType type, unique_ptr<ParsedExpression> left,
                                            unique_ptr<ParsedExpression> right)
     : ParsedExpression(type, ExpressionClass::COMPARISON), left(std::move(left)), right(std::move(right)) {
@@ -45,17 +48,4 @@ unique_ptr<ParsedExpression> ComparisonExpression::Deserialize(ExpressionType ty
 	return make_uniq<ComparisonExpression>(type, std::move(left_child), std::move(right_child));
 }
 
-void ComparisonExpression::FormatSerialize(FormatSerializer &serializer) const {
-	ParsedExpression::FormatSerialize(serializer);
-	serializer.WriteProperty("left", *left);
-	serializer.WriteProperty("right", *right);
-}
-
-unique_ptr<ParsedExpression> ComparisonExpression::FormatDeserialize(ExpressionType type,
-                                                                     FormatDeserializer &deserializer) {
-	auto left = deserializer.ReadProperty<unique_ptr<ParsedExpression>>("left");
-	auto right = deserializer.ReadProperty<unique_ptr<ParsedExpression>>("right");
-	return make_uniq<ComparisonExpression>(type, std::move(left), std::move(right));
-}
-
 } // namespace duckdb

package/src/duckdb/src/parser/expression/conjunction_expression.cpp

@@ -68,16 +68,4 @@ unique_ptr<ParsedExpression> ConjunctionExpression::Deserialize(ExpressionType t
 	return std::move(result);
 }
 
-void ConjunctionExpression::FormatSerialize(FormatSerializer &serializer) const {
-	ParsedExpression::FormatSerialize(serializer);
-	serializer.WriteProperty("children", children);
-}
-
-unique_ptr<ParsedExpression> ConjunctionExpression::FormatDeserialize(ExpressionType type,
-                                                                      FormatDeserializer &deserializer) {
-	auto result = make_uniq<ConjunctionExpression>(type);
-	result->children = deserializer.ReadProperty<vector<unique_ptr<ParsedExpression>>>("children");
-	return std::move(result);
-}
-
 } // namespace duckdb

package/src/duckdb/src/parser/expression/constant_expression.cpp

@@ -10,6 +10,9 @@
 
 namespace duckdb {
 
+ConstantExpression::ConstantExpression() : ParsedExpression(ExpressionType::VALUE_CONSTANT, ExpressionClass::CONSTANT) {
+}
+
 ConstantExpression::ConstantExpression(Value val)
     : ParsedExpression(ExpressionType::VALUE_CONSTANT, ExpressionClass::CONSTANT), value(std::move(val)) {
 }
@@ -41,15 +44,4 @@ unique_ptr<ParsedExpression> ConstantExpression::Deserialize(ExpressionType type
 	return make_uniq<ConstantExpression>(std::move(value));
 }
 
-void ConstantExpression::FormatSerialize(FormatSerializer &serializer) const {
-	ParsedExpression::FormatSerialize(serializer);
-	serializer.WriteProperty("value", value);
-}
-
-unique_ptr<ParsedExpression> ConstantExpression::FormatDeserialize(ExpressionType type,
-                                                                   FormatDeserializer &deserializer) {
-	auto value = deserializer.ReadProperty<Value>("value");
-	return make_uniq<ConstantExpression>(std::move(value));
-}
-
 } // namespace duckdb

package/src/duckdb/src/parser/expression/default_expression.cpp

@@ -27,8 +27,4 @@ unique_ptr<ParsedExpression> DefaultExpression::Deserialize(ExpressionType type,
 	return make_uniq<DefaultExpression>();
 }
 
-void DefaultExpression::FormatSerialize(FormatSerializer &serializer) const {
-	ParsedExpression::FormatSerialize(serializer);
-}
-
 } // namespace duckdb

package/src/duckdb/src/parser/expression/function_expression.cpp

@@ -11,6 +11,9 @@
 
 namespace duckdb {
 
+FunctionExpression::FunctionExpression() : ParsedExpression(ExpressionType::FUNCTION, ExpressionClass::FUNCTION) {
+}
+
 FunctionExpression::FunctionExpression(string catalog, string schema, const string &function_name,
                                        vector<unique_ptr<ParsedExpression>> children_p,
                                        unique_ptr<ParsedExpression> filter, unique_ptr<OrderModifier> order_bys_p,
@@ -122,36 +125,4 @@ void FunctionExpression::Verify() const {
 	D_ASSERT(!function_name.empty());
 }
 
-void FunctionExpression::FormatSerialize(FormatSerializer &serializer) const {
-	ParsedExpression::FormatSerialize(serializer);
-	serializer.WriteProperty("function_name", function_name);
-	serializer.WriteProperty("schema", schema);
-	serializer.WriteProperty("children", children);
-	serializer.WriteOptionalProperty("filter", filter);
-	serializer.WriteProperty("order_bys", (ResultModifier &)*order_bys);
-	serializer.WriteProperty("distinct", distinct);
-	serializer.WriteProperty("is_operator", is_operator);
-	serializer.WriteProperty("export_state", export_state);
-	serializer.WriteProperty("catalog", catalog);
-}
-
-unique_ptr<ParsedExpression> FunctionExpression::FormatDeserialize(ExpressionType type,
-                                                                   FormatDeserializer &deserializer) {
-	auto function_name = deserializer.ReadProperty<string>("function_name");
-	auto schema = deserializer.ReadProperty<string>("schema");
-	auto children = deserializer.ReadProperty<vector<unique_ptr<ParsedExpression>>>("children");
-	auto filter = deserializer.ReadOptionalProperty<unique_ptr<ParsedExpression>>("filter");
-	auto order_bys = unique_ptr_cast<ResultModifier, OrderModifier>(
-	    deserializer.ReadProperty<unique_ptr<ResultModifier>>("order_bys"));
-	auto distinct = deserializer.ReadProperty<bool>("distinct");
-	auto is_operator = deserializer.ReadProperty<bool>("is_operator");
-	auto export_state = deserializer.ReadProperty<bool>("export_state");
-	auto catalog = deserializer.ReadProperty<string>("catalog");
-
-	unique_ptr<FunctionExpression> function;
-	function = make_uniq<FunctionExpression>(catalog, schema, function_name, std::move(children), std::move(filter),
-	                                         std::move(order_bys), distinct, is_operator, export_state);
-	return std::move(function);
-}
-
 } // namespace duckdb

package/src/duckdb/src/parser/expression/lambda_expression.cpp

@@ -8,12 +8,15 @@
 
 namespace duckdb {
 
+LambdaExpression::LambdaExpression() : ParsedExpression(ExpressionType::LAMBDA, ExpressionClass::LAMBDA) {
+}
+
 LambdaExpression::LambdaExpression(unique_ptr<ParsedExpression> lhs, unique_ptr<ParsedExpression> expr)
     : ParsedExpression(ExpressionType::LAMBDA, ExpressionClass::LAMBDA), lhs(std::move(lhs)), expr(std::move(expr)) {
 }
 
 string LambdaExpression::ToString() const {
-	return lhs->ToString() + " -> " + expr->ToString();
+	return "(" + lhs->ToString() + " -> " + expr->ToString() + ")";
 }
 
 bool LambdaExpression::Equal(const LambdaExpression &a, const LambdaExpression &b) {
@@ -44,17 +47,4 @@ unique_ptr<ParsedExpression> LambdaExpression::Deserialize(ExpressionType type,
 	return make_uniq<LambdaExpression>(std::move(lhs), std::move(expr));
 }
 
-void LambdaExpression::FormatSerialize(FormatSerializer &serializer) const {
-	ParsedExpression::FormatSerialize(serializer);
-	serializer.WriteProperty("lhs", *lhs);
-	serializer.WriteProperty("expr", *expr);
-}
-
-unique_ptr<ParsedExpression> LambdaExpression::FormatDeserialize(ExpressionType type,
-                                                                 FormatDeserializer &deserializer) {
-	auto lhs = deserializer.ReadProperty<unique_ptr<ParsedExpression>>("lhs");
-	auto expr = deserializer.ReadProperty<unique_ptr<ParsedExpression>>("expr");
-	return make_uniq<LambdaExpression>(std::move(lhs), std::move(expr));
-}
-
 } // namespace duckdb

package/src/duckdb/src/parser/expression/operator_expression.cpp

@@ -58,16 +58,4 @@ unique_ptr<ParsedExpression> OperatorExpression::Deserialize(ExpressionType type
 	return std::move(expression);
 }
 
-void OperatorExpression::FormatSerialize(FormatSerializer &serializer) const {
-	ParsedExpression::FormatSerialize(serializer);
-	serializer.WriteProperty("children", children);
-}
-
-unique_ptr<ParsedExpression> OperatorExpression::FormatDeserialize(ExpressionType type,
-                                                                   FormatDeserializer &deserializer) {
-	auto expression = make_uniq<OperatorExpression>(type);
-	expression->children = deserializer.ReadProperty<vector<unique_ptr<ParsedExpression>>>("children");
-	return std::move(expression);
-}
-
 } // namespace duckdb

package/src/duckdb/src/parser/expression/parameter_expression.cpp

@@ -44,16 +44,4 @@ unique_ptr<ParsedExpression> ParameterExpression::Deserialize(ExpressionType typ
 	return std::move(expression);
 }
 
-void ParameterExpression::FormatSerialize(FormatSerializer &serializer) const {
-	ParsedExpression::FormatSerialize(serializer);
-	serializer.WriteProperty("parameter_nr", parameter_nr);
-}
-
-unique_ptr<ParsedExpression> ParameterExpression::FormatDeserialize(ExpressionType type,
-                                                                    FormatDeserializer &deserializer) {
-	auto expression = make_uniq<ParameterExpression>();
-	expression->parameter_nr = deserializer.ReadProperty<idx_t>("parameter_nr");
-	return std::move(expression);
-}
-
 } // namespace duckdb

package/src/duckdb/src/parser/expression/positional_reference_expression.cpp

@@ -10,6 +10,10 @@
 
 namespace duckdb {
 
+PositionalReferenceExpression::PositionalReferenceExpression()
+    : ParsedExpression(ExpressionType::POSITIONAL_REFERENCE, ExpressionClass::POSITIONAL_REFERENCE) {
+}
+
 PositionalReferenceExpression::PositionalReferenceExpression(idx_t index)
     : ParsedExpression(ExpressionType::POSITIONAL_REFERENCE, ExpressionClass::POSITIONAL_REFERENCE), index(index) {
 }
@@ -43,15 +47,4 @@ unique_ptr<ParsedExpression> PositionalReferenceExpression::Deserialize(Expressi
 	return std::move(expression);
 }
 
-void PositionalReferenceExpression::FormatSerialize(FormatSerializer &serializer) const {
-	ParsedExpression::FormatSerialize(serializer);
-	serializer.WriteProperty("index", index);
-}
-
-unique_ptr<ParsedExpression> PositionalReferenceExpression::FormatDeserialize(ExpressionType type,
-                                                                              FormatDeserializer &deserializer) {
-	auto expression = make_uniq<PositionalReferenceExpression>(deserializer.ReadProperty<idx_t>("index"));
-	return std::move(expression);
-}
-
 } // namespace duckdb

package/src/duckdb/src/parser/expression/star_expression.cpp

@@ -131,23 +131,4 @@ unique_ptr<ParsedExpression> StarExpression::Copy() const {
 	return std::move(copy);
 }
 
-void StarExpression::FormatSerialize(FormatSerializer &serializer) const {
-	ParsedExpression::FormatSerialize(serializer);
-	serializer.WriteProperty("relation_name", relation_name);
-	serializer.WriteProperty("exclude_list", exclude_list);
-	serializer.WriteProperty("replace_list", replace_list);
-	serializer.WriteProperty("columns", columns);
-	serializer.WriteOptionalProperty("expr", expr);
-}
-
-unique_ptr<ParsedExpression> StarExpression::FormatDeserialize(ExpressionType type, FormatDeserializer &deserializer) {
-	auto result = make_uniq<StarExpression>();
-	deserializer.ReadProperty("relation_name", result->relation_name);
-	deserializer.ReadProperty("exclude_list", result->exclude_list);
-	deserializer.ReadProperty("replace_list", result->replace_list);
-	deserializer.ReadProperty("columns", result->columns);
-	deserializer.ReadOptionalProperty("expr", result->expr);
-	return std::move(result);
-}
-
 } // namespace duckdb

package/src/duckdb/src/parser/expression/subquery_expression.cpp

@@ -74,22 +74,4 @@ unique_ptr<ParsedExpression> SubqueryExpression::Deserialize(ExpressionType type
 	return std::move(expression);
 }
 
-void SubqueryExpression::FormatSerialize(FormatSerializer &serializer) const {
-	ParsedExpression::FormatSerialize(serializer);
-	serializer.WriteProperty("subquery_type", subquery_type);
-	serializer.WriteProperty("subquery", *subquery);
-	serializer.WriteOptionalProperty("child", child);
-	serializer.WriteProperty("comparison_type", comparison_type);
-}
-
-unique_ptr<ParsedExpression> SubqueryExpression::FormatDeserialize(ExpressionType type,
-                                                                   FormatDeserializer &deserializer) {
-	auto expression = make_uniq<SubqueryExpression>();
-	deserializer.ReadProperty("subquery_type", expression->subquery_type);
-	deserializer.ReadProperty("subquery", expression->subquery);
-	deserializer.ReadOptionalProperty("child", expression->child);
-	deserializer.ReadProperty("comparison_type", expression->comparison_type);
-	return std::move(expression);
-}
-
 } // namespace duckdb

package/src/duckdb/src/parser/expression/window_expression.cpp

@@ -10,6 +10,9 @@
 
 namespace duckdb {
 
+WindowExpression::WindowExpression(ExpressionType type) : ParsedExpression(type, ExpressionClass::WINDOW) {
+}
+
 WindowExpression::WindowExpression(ExpressionType type, string catalog_name, string schema, const string &function_name)
     : ParsedExpression(type, ExpressionClass::WINDOW), catalog(std::move(catalog_name)), schema(std::move(schema)),
       function_name(StringUtil::Lower(function_name)), ignore_nulls(false) {
@@ -159,45 +162,6 @@ void WindowExpression::Serialize(FieldWriter &writer) const {
 	writer.WriteString(catalog);
 }
 
-void WindowExpression::FormatSerialize(FormatSerializer &serializer) const {
-	ParsedExpression::FormatSerialize(serializer);
-	serializer.WriteProperty("function_name", function_name);
-	serializer.WriteProperty("schema", schema);
-	serializer.WriteProperty("children", children);
-	serializer.WriteProperty("partitions", partitions);
-	serializer.WriteProperty("orders", orders);
-	serializer.WriteProperty("start", start);
-	serializer.WriteProperty("end", end);
-	serializer.WriteOptionalProperty("start_expr", start_expr);
-	serializer.WriteOptionalProperty("end_expr", end_expr);
-	serializer.WriteOptionalProperty("offset_expr", offset_expr);
-	serializer.WriteOptionalProperty("default_expr", default_expr);
-	serializer.WriteProperty("ignore_nulls", ignore_nulls);
-	serializer.WriteOptionalProperty("filter_expr", filter_expr);
-	serializer.WriteProperty("catalog", catalog);
-}
-
-unique_ptr<ParsedExpression> WindowExpression::FormatDeserialize(ExpressionType type,
-                                                                 FormatDeserializer &deserializer) {
-	auto function_name = deserializer.ReadProperty<string>("function_name");
-	auto schema = deserializer.ReadProperty<string>("schema");
-	auto expr = make_uniq<WindowExpression>(type, INVALID_CATALOG, std::move(schema), function_name);
-
-	deserializer.ReadProperty("children", expr->children);
-	deserializer.ReadProperty("partitions", expr->partitions);
-	deserializer.ReadProperty("orders", expr->orders);
-	deserializer.ReadProperty("start", expr->start);
-	deserializer.ReadProperty("end", expr->end);
-	deserializer.ReadOptionalProperty("start_expr", expr->start_expr);
-	deserializer.ReadOptionalProperty("end_expr", expr->end_expr);
-	deserializer.ReadOptionalProperty("offset_expr", expr->offset_expr);
-	deserializer.ReadOptionalProperty("default_expr", expr->default_expr);
-	deserializer.ReadProperty("ignore_nulls", expr->ignore_nulls);
-	deserializer.ReadOptionalProperty("filter_expr", expr->filter_expr);
-	deserializer.ReadProperty("catalog", expr->catalog);
-	return std::move(expr);
-}
-
 unique_ptr<ParsedExpression> WindowExpression::Deserialize(ExpressionType type, FieldReader &reader) {
 	auto function_name = reader.ReadRequired<string>();
 	auto schema = reader.ReadRequired<string>();

package/src/duckdb/src/parser/parsed_expression.cpp

@@ -110,76 +110,6 @@ void ParsedExpression::Serialize(Serializer &serializer) const {
 	writer.Finalize();
 }
 
-void ParsedExpression::FormatSerialize(FormatSerializer &serializer) const {
-	serializer.WriteProperty("class", GetExpressionClass());
-	serializer.WriteProperty("type", type);
-	serializer.WriteProperty("alias", alias);
-}
-
-unique_ptr<ParsedExpression> ParsedExpression::FormatDeserialize(FormatDeserializer &deserializer) {
-	auto expression_class = deserializer.ReadProperty<ExpressionClass>("class");
-	auto type = deserializer.ReadProperty<ExpressionType>("type");
-	auto alias = deserializer.ReadProperty<string>("alias");
-	unique_ptr<ParsedExpression> result;
-	switch (expression_class) {
-	case ExpressionClass::BETWEEN:
-		result = BetweenExpression::FormatDeserialize(type, deserializer);
-		break;
-	case ExpressionClass::CASE:
-		result = CaseExpression::FormatDeserialize(type, deserializer);
-		break;
-	case ExpressionClass::CAST:
-		result = CastExpression::FormatDeserialize(type, deserializer);
-		break;
-	case ExpressionClass::COLLATE:
-		result = CollateExpression::FormatDeserialize(type, deserializer);
-		break;
-	case ExpressionClass::COLUMN_REF:
-		result = ColumnRefExpression::FormatDeserialize(type, deserializer);
-		break;
-	case ExpressionClass::COMPARISON:
-		result = ComparisonExpression::FormatDeserialize(type, deserializer);
-		break;
-	case ExpressionClass::CONJUNCTION:
-		result = ConjunctionExpression::FormatDeserialize(type, deserializer);
-		break;
-	case ExpressionClass::CONSTANT:
-		result = ConstantExpression::FormatDeserialize(type, deserializer);
-		break;
-	case ExpressionClass::DEFAULT:
-		result = make_uniq<DefaultExpression>();
-		break;
-	case ExpressionClass::FUNCTION:
-		result = FunctionExpression::FormatDeserialize(type, deserializer);
-		break;
-	case ExpressionClass::LAMBDA:
-		result = LambdaExpression::FormatDeserialize(type, deserializer);
-		break;
-	case ExpressionClass::OPERATOR:
-		result = OperatorExpression::FormatDeserialize(type, deserializer);
-		break;
-	case ExpressionClass::PARAMETER:
-		result = ParameterExpression::FormatDeserialize(type, deserializer);
-		break;
-	case ExpressionClass::POSITIONAL_REFERENCE:
-		result = PositionalReferenceExpression::FormatDeserialize(type, deserializer);
-		break;
-	case ExpressionClass::STAR:
-		result = StarExpression::FormatDeserialize(type, deserializer);
-		break;
-	case ExpressionClass::SUBQUERY:
-		result = SubqueryExpression::FormatDeserialize(type, deserializer);
-		break;
-	case ExpressionClass::WINDOW:
-		result = WindowExpression::FormatDeserialize(type, deserializer);
-		break;
-	default:
-		throw SerializationException("Unsupported type for expression deserialization!");
-	}
-	result->alias = alias;
-	return result;
-}
-
 unique_ptr<ParsedExpression> ParsedExpression::Deserialize(Deserializer &source) {
 	FieldReader reader(source);
 	auto expression_class = reader.ReadRequired<ExpressionClass>();

package/src/duckdb/src/parser/parsed_expression_iterator.cpp

@@ -3,6 +3,7 @@
 #include "duckdb/parser/expression/list.hpp"
 #include "duckdb/parser/query_node.hpp"
 #include "duckdb/parser/query_node/recursive_cte_node.hpp"
+#include "duckdb/parser/query_node/cte_node.hpp"
 #include "duckdb/parser/query_node/select_node.hpp"
 #include "duckdb/parser/query_node/set_operation_node.hpp"
 #include "duckdb/parser/tableref/list.hpp"
@@ -256,6 +257,12 @@ void ParsedExpressionIterator::EnumerateQueryNodeChildren(
 		EnumerateQueryNodeChildren(*rcte_node.right, callback);
 		break;
 	}
+	case QueryNodeType::CTE_NODE: {
+		auto &cte_node = node.Cast<CTENode>();
+		EnumerateQueryNodeChildren(*cte_node.query, callback);
+		EnumerateQueryNodeChildren(*cte_node.child, callback);
+		break;
+	}
 	case QueryNodeType::SELECT_NODE: {
 		auto &sel_node = node.Cast<SelectNode>();
 		for (idx_t i = 0; i < sel_node.select_list.size(); i++) {

package/src/duckdb/src/parser/parser.cpp

@@ -191,6 +191,7 @@ void Parser::ParseQuery(const string &query) {
 		} else {
 			// split sql string into statements and re-parse using extension
 			auto query_statements = SplitQueryStringIntoStatements(query);
+			auto stmt_loc = 0;
 			for (auto const &query_statement : query_statements) {
 				PostgresParser another_parser;
 				another_parser.Parse(query_statement);
@@ -202,6 +203,10 @@ void Parser::ParseQuery(const string &query) {
 						continue;
 					}
 					transformer.TransformParseTree(another_parser.parse_tree, statements);
+					// important to set in the case of a mixture of DDB and parser ext statements
+					statements.back()->stmt_length = query_statement.size() - 1;
+					statements.back()->stmt_location = stmt_loc;
+					stmt_loc += query_statement.size();
 				} else {
 					// let extensions parse the statement which DuckDB failed to parse
 					bool parsed_single_statement = false;
@@ -211,8 +216,9 @@ void Parser::ParseQuery(const string &query) {
 						auto result = ext.parse_function(ext.parser_info.get(), query_statement);
 						if (result.type == ParserExtensionResultType::PARSE_SUCCESSFUL) {
 							auto statement = make_uniq<ExtensionStatement>(ext, std::move(result.parse_data));
-							statement->stmt_length = query_statement.size();
-							statement->stmt_location = 0;
+							statement->stmt_length = query_statement.size() - 1;
+							statement->stmt_location = stmt_loc;
+							stmt_loc += query_statement.size();
 							statements.push_back(std::move(statement));
 							parsed_single_statement = true;
 							break;

package/src/duckdb/src/parser/query_node/cte_node.cpp

@@ -0,0 +1,58 @@
+#include "duckdb/parser/query_node/cte_node.hpp"
+#include "duckdb/common/field_writer.hpp"
+#include "duckdb/common/serializer/format_serializer.hpp"
+#include "duckdb/common/serializer/format_deserializer.hpp"
+
+namespace duckdb {
+
+string CTENode::ToString() const {
+	string result;
+	result += child->ToString();
+	return result;
+}
+
+bool CTENode::Equals(const QueryNode *other_p) const {
+	if (!QueryNode::Equals(other_p)) {
+		return false;
+	}
+	if (this == other_p) {
+		return true;
+	}
+	auto &other = other_p->Cast<CTENode>();
+
+	if (!query->Equals(other.query.get())) {
+		return false;
+	}
+	if (!child->Equals(other.child.get())) {
+		return false;
+	}
+	return true;
+}
+
+unique_ptr<QueryNode> CTENode::Copy() const {
+	auto result = make_uniq<CTENode>();
+	result->ctename = ctename;
+	result->query = query->Copy();
+	result->child = child->Copy();
+	result->aliases = aliases;
+	this->CopyProperties(*result);
+	return std::move(result);
+}
+
+void CTENode::Serialize(FieldWriter &writer) const {
+	writer.WriteString(ctename);
+	writer.WriteSerializable(*query);
+	writer.WriteSerializable(*child);
+	writer.WriteList<string>(aliases);
+}
+
+unique_ptr<QueryNode> CTENode::Deserialize(FieldReader &reader) {
+	auto result = make_uniq<CTENode>();
+	result->ctename = reader.ReadRequired<string>();
+	result->query = reader.ReadRequiredSerializable<QueryNode>();
+	result->child = reader.ReadRequiredSerializable<QueryNode>();
+	result->aliases = reader.ReadRequiredList<string>();
+	return std::move(result);
+}
+
+} // namespace duckdb

package/src/duckdb/src/parser/query_node/recursive_cte_node.cpp

@@ -66,23 +66,4 @@ unique_ptr<QueryNode> RecursiveCTENode::Deserialize(FieldReader &reader) {
 	return std::move(result);
 }
 
-void RecursiveCTENode::FormatSerialize(FormatSerializer &serializer) const {
-	QueryNode::FormatSerialize(serializer);
-	serializer.WriteProperty("cte_name", ctename);
-	serializer.WriteProperty("union_all", union_all);
-	serializer.WriteProperty("left", *left);
-	serializer.WriteProperty("right", *right);
-	serializer.WriteProperty("aliases", aliases);
-}
-
-unique_ptr<QueryNode> RecursiveCTENode::FormatDeserialize(FormatDeserializer &deserializer) {
-	auto result = make_uniq<RecursiveCTENode>();
-	deserializer.ReadProperty("cte_name", result->ctename);
-	deserializer.ReadProperty("union_all", result->union_all);
-	deserializer.ReadProperty("left", result->left);
-	deserializer.ReadProperty("right", result->right);
-	deserializer.ReadProperty("aliases", result->aliases);
-	return std::move(result);
-}
-
 } // namespace duckdb

package/src/duckdb/src/parser/query_node/select_node.cpp

@@ -187,35 +187,6 @@ void SelectNode::Serialize(FieldWriter &writer) const {
 	writer.WriteOptional(qualify);
 }
 
-void SelectNode::FormatSerialize(FormatSerializer &serializer) const {
-	QueryNode::FormatSerialize(serializer);
-	serializer.WriteProperty("select_list", select_list);
-	serializer.WriteOptionalProperty("from_table", from_table);
-	serializer.WriteOptionalProperty("where_clause", where_clause);
-	serializer.WriteProperty("group_expressions", groups.group_expressions);
-	serializer.WriteProperty("group_sets", groups.grouping_sets);
-	serializer.WriteProperty("aggregate_handling", aggregate_handling);
-	serializer.WriteOptionalProperty("having", having);
-	serializer.WriteOptionalProperty("sample", sample);
-	serializer.WriteOptionalProperty("qualify", qualify);
-}
-
-unique_ptr<QueryNode> SelectNode::FormatDeserialize(FormatDeserializer &deserializer) {
-	auto result = make_uniq<SelectNode>();
-
-	deserializer.ReadProperty("select_list", result->select_list);
-	deserializer.ReadOptionalProperty("from_table", result->from_table);
-	deserializer.ReadOptionalProperty("where_clause", result->where_clause);
-	deserializer.ReadProperty("group_expressions", result->groups.group_expressions);
-	deserializer.ReadProperty("group_sets", result->groups.grouping_sets);
-	deserializer.ReadProperty("aggregate_handling", result->aggregate_handling);
-	deserializer.ReadOptionalProperty("having", result->having);
-	deserializer.ReadOptionalProperty("sample", result->sample);
-	deserializer.ReadOptionalProperty("qualify", result->qualify);
-
-	return std::move(result);
-}
-
 unique_ptr<QueryNode> SelectNode::Deserialize(FieldReader &reader) {
 	auto result = make_uniq<SelectNode>();
 	result->select_list = reader.ReadRequiredSerializableList<ParsedExpression>();

package/src/duckdb/src/parser/query_node/set_operation_node.cpp

@@ -83,19 +83,4 @@ unique_ptr<QueryNode> SetOperationNode::Deserialize(FieldReader &reader) {
 	return std::move(result);
 }
 
-void SetOperationNode::FormatSerialize(duckdb::FormatSerializer &serializer) const {
-	QueryNode::FormatSerialize(serializer);
-	serializer.WriteProperty("set_op_type", setop_type);
-	serializer.WriteProperty("left", *left);
-	serializer.WriteProperty("right", *right);
-}
-
-unique_ptr<QueryNode> SetOperationNode::FormatDeserialize(duckdb::FormatDeserializer &deserializer) {
-	auto result = make_uniq<SetOperationNode>();
-	deserializer.ReadProperty("set_op_type", result->setop_type);
-	deserializer.ReadProperty("left", result->left);
-	deserializer.ReadProperty("right", result->right);
-	return std::move(result);
-}
-
 } // namespace duckdb