duckdb 0.8.2-dev87.0 → 0.9.1-dev0.0

package/src/duckdb/src/parser/parsed_data/create_view_info.cpp

@@ -28,29 +28,6 @@ unique_ptr<CreateInfo> CreateViewInfo::Copy() const {
 	return std::move(result);
 }
 
-unique_ptr<CreateViewInfo> CreateViewInfo::Deserialize(Deserializer &deserializer) {
-	auto result = make_uniq<CreateViewInfo>();
-	result->DeserializeBase(deserializer);
-
-	FieldReader reader(deserializer);
-	result->view_name = reader.ReadRequired<string>();
-	result->aliases = reader.ReadRequiredList<string>();
-	result->types = reader.ReadRequiredSerializableList<LogicalType, LogicalType>();
-	result->query = reader.ReadOptional<SelectStatement>(nullptr);
-	reader.Finalize();
-
-	return result;
-}
-
-void CreateViewInfo::SerializeInternal(Serializer &serializer) const {
-	FieldWriter writer(serializer);
-	writer.WriteString(view_name);
-	writer.WriteList<string>(aliases);
-	writer.WriteRegularSerializableList(types);
-	writer.WriteOptional(query);
-	writer.Finalize();
-}
-
 unique_ptr<CreateViewInfo> CreateViewInfo::FromSelect(ClientContext &context, unique_ptr<CreateViewInfo> info) {
 	D_ASSERT(info);
 	D_ASSERT(!info->view_name.empty());

package/src/duckdb/src/parser/parsed_data/detach_info.cpp

@@ -1,9 +1,8 @@
 #include "duckdb/parser/parsed_data/detach_info.hpp"
-#include "duckdb/common/field_writer.hpp"
 
 namespace duckdb {
 
-DetachInfo::DetachInfo() {
+DetachInfo::DetachInfo() : ParseInfo(TYPE) {
 }
 
 unique_ptr<DetachInfo> DetachInfo::Copy() const {
@@ -13,22 +12,4 @@ unique_ptr<DetachInfo> DetachInfo::Copy() const {
 	return result;
 }
 
-void DetachInfo::Serialize(Serializer &serializer) const {
-	FieldWriter writer(serializer);
-	writer.WriteString(name);
-	writer.WriteField(if_not_found);
-	writer.Finalize();
-}
-
-unique_ptr<ParseInfo> DetachInfo::Deserialize(Deserializer &deserializer) {
-	auto result = make_uniq<DetachInfo>();
-
-	FieldReader reader(deserializer);
-	result->name = reader.ReadRequired<string>();
-	result->if_not_found = reader.ReadRequired<OnEntryNotFound>();
-	reader.Finalize();
-
-	return std::move(result);
-}
-
 } // namespace duckdb

package/src/duckdb/src/parser/parsed_data/drop_info.cpp

@@ -2,7 +2,7 @@
 
 namespace duckdb {
 
-DropInfo::DropInfo() : catalog(INVALID_CATALOG), schema(INVALID_SCHEMA), cascade(false) {
+DropInfo::DropInfo() : ParseInfo(TYPE), catalog(INVALID_CATALOG), schema(INVALID_SCHEMA), cascade(false) {
 }
 
 unique_ptr<DropInfo> DropInfo::Copy() const {
@@ -17,30 +17,4 @@ unique_ptr<DropInfo> DropInfo::Copy() const {
 	return result;
 }
 
-void DropInfo::Serialize(Serializer &serializer) const {
-	FieldWriter writer(serializer);
-	writer.WriteField<CatalogType>(type);
-	writer.WriteString(catalog);
-	writer.WriteString(schema);
-	writer.WriteString(name);
-	writer.WriteField(if_not_found);
-	writer.WriteField(cascade);
-	writer.WriteField(allow_drop_internal);
-	writer.Finalize();
-}
-
-unique_ptr<ParseInfo> DropInfo::Deserialize(Deserializer &deserializer) {
-	FieldReader reader(deserializer);
-	auto drop_info = make_uniq<DropInfo>();
-	drop_info->type = reader.ReadRequired<CatalogType>();
-	drop_info->catalog = reader.ReadRequired<string>();
-	drop_info->schema = reader.ReadRequired<string>();
-	drop_info->name = reader.ReadRequired<string>();
-	drop_info->if_not_found = reader.ReadRequired<OnEntryNotFound>();
-	drop_info->cascade = reader.ReadRequired<bool>();
-	drop_info->allow_drop_internal = reader.ReadRequired<bool>();
-	reader.Finalize();
-	return std::move(drop_info);
-}
-
 } // namespace duckdb

package/src/duckdb/src/parser/parsed_data/sample_options.cpp

@@ -1,7 +1,6 @@
 #include "duckdb/parser/parsed_data/sample_options.hpp"
-#include "duckdb/common/field_writer.hpp"
-#include "duckdb/common/serializer/format_serializer.hpp"
-#include "duckdb/common/serializer/format_deserializer.hpp"
+#include "duckdb/common/serializer/serializer.hpp"
+#include "duckdb/common/serializer/deserializer.hpp"
 
 namespace duckdb {
 
@@ -10,46 +9,6 @@ string SampleMethodToString(SampleMethod method) {
 	return EnumUtil::ToString(method);
 }
 
-void SampleOptions::Serialize(Serializer &serializer) {
-	FieldWriter writer(serializer);
-	writer.WriteSerializable(sample_size);
-	writer.WriteField<bool>(is_percentage);
-	writer.WriteField<SampleMethod>(method);
-	writer.WriteField<int64_t>(seed);
-	writer.Finalize();
-}
-
-void SampleOptions::FormatSerialize(FormatSerializer &serializer) const {
-	serializer.WriteProperty("sample_size", sample_size);
-	serializer.WriteProperty("is_percentage", is_percentage);
-	serializer.WriteProperty("method", method);
-	serializer.WriteProperty("seed", seed);
-}
-
-unique_ptr<SampleOptions> SampleOptions::FormatDeserialize(FormatDeserializer &deserializer) {
-	auto result = make_uniq<SampleOptions>();
-
-	deserializer.ReadProperty("sample_size", result->sample_size);
-	deserializer.ReadProperty("is_percentage", result->is_percentage);
-	deserializer.ReadProperty("method", result->method);
-	deserializer.ReadProperty("seed", result->seed);
-
-	return result;
-}
-
-unique_ptr<SampleOptions> SampleOptions::Deserialize(Deserializer &source) {
-	auto result = make_uniq<SampleOptions>();
-
-	FieldReader reader(source);
-	result->sample_size = reader.ReadRequiredSerializable<Value, Value>();
-	result->is_percentage = reader.ReadRequired<bool>();
-	result->method = reader.ReadRequired<SampleMethod>();
-	result->seed = reader.ReadRequired<int64_t>();
-	reader.Finalize();
-
-	return result;
-}
-
 unique_ptr<SampleOptions> SampleOptions::Copy() {
 	auto result = make_uniq<SampleOptions>();
 	result->sample_size = sample_size;

package/src/duckdb/src/parser/parsed_data/transaction_info.cpp

@@ -1,24 +1,11 @@
 #include "duckdb/parser/parsed_data/transaction_info.hpp"
-#include "duckdb/common/field_writer.hpp"
 
 namespace duckdb {
 
-TransactionInfo::TransactionInfo(TransactionType type) : type(type) {
+TransactionInfo::TransactionInfo() : ParseInfo(TYPE) {
 }
 
-void TransactionInfo::Serialize(Serializer &serializer) const {
-	FieldWriter writer(serializer);
-	writer.WriteField(type);
-	writer.Finalize();
-}
-
-unique_ptr<ParseInfo> TransactionInfo::Deserialize(Deserializer &deserializer) {
-	FieldReader reader(deserializer);
-	auto transaction_type = reader.ReadRequired<TransactionType>();
-	reader.Finalize();
-
-	auto transaction_info = make_uniq<TransactionInfo>(transaction_type);
-	return std::move(transaction_info);
+TransactionInfo::TransactionInfo(TransactionType type) : ParseInfo(TYPE), type(type) {
 }
 
 } // namespace duckdb

package/src/duckdb/src/parser/parsed_data/vacuum_info.cpp

@@ -1,9 +1,8 @@
 #include "duckdb/parser/parsed_data/vacuum_info.hpp"
-#include "duckdb/common/field_writer.hpp"
 
 namespace duckdb {
 
-VacuumInfo::VacuumInfo(VacuumOptions options) : options(options), has_table(false) {
+VacuumInfo::VacuumInfo(VacuumOptions options) : ParseInfo(TYPE), options(options), has_table(false) {
 }
 
 unique_ptr<VacuumInfo> VacuumInfo::Copy() {
@@ -15,23 +14,4 @@ unique_ptr<VacuumInfo> VacuumInfo::Copy() {
 	return result;
 }
 
-void VacuumInfo::Serialize(Serializer &serializer) const {
-	FieldWriter writer(serializer);
-	writer.WriteField(options.analyze);
-	writer.WriteField(options.vacuum);
-	writer.Finalize();
-}
-
-unique_ptr<ParseInfo> VacuumInfo::Deserialize(Deserializer &deserializer) {
-
-	VacuumOptions options;
-	FieldReader reader(deserializer);
-	options.analyze = reader.ReadRequired<bool>();
-	options.vacuum = reader.ReadRequired<bool>();
-	reader.Finalize();
-
-	auto vacuum_info = make_uniq<VacuumInfo>(options);
-	return std::move(vacuum_info);
-}
-
 } // namespace duckdb

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

@@ -1,12 +1,11 @@
 #include "duckdb/main/client_context.hpp"
 
 #include "duckdb/parser/parsed_expression.hpp"
-#include "duckdb/common/field_writer.hpp"
 #include "duckdb/common/types/hash.hpp"
 #include "duckdb/parser/expression/list.hpp"
 #include "duckdb/parser/parsed_expression_iterator.hpp"
-#include "duckdb/common/serializer/format_serializer.hpp"
-#include "duckdb/common/serializer/format_deserializer.hpp"
+#include "duckdb/common/serializer/serializer.hpp"
+#include "duckdb/common/serializer/deserializer.hpp"
 #include "duckdb/parser/expression_util.hpp"
 
 namespace duckdb {
@@ -101,152 +100,6 @@ hash_t ParsedExpression::Hash() const {
 	return hash;
 }
 
-void ParsedExpression::Serialize(Serializer &serializer) const {
-	FieldWriter writer(serializer);
-	writer.WriteField<ExpressionClass>(GetExpressionClass());
-	writer.WriteField<ExpressionType>(type);
-	writer.WriteString(alias);
-	Serialize(writer);
-	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>();
-	auto type = reader.ReadRequired<ExpressionType>();
-	auto alias = reader.ReadRequired<string>();
-	unique_ptr<ParsedExpression> result;
-	switch (expression_class) {
-	case ExpressionClass::BETWEEN:
-		result = BetweenExpression::Deserialize(type, reader);
-		break;
-	case ExpressionClass::CASE:
-		result = CaseExpression::Deserialize(type, reader);
-		break;
-	case ExpressionClass::CAST:
-		result = CastExpression::Deserialize(type, reader);
-		break;
-	case ExpressionClass::COLLATE:
-		result = CollateExpression::Deserialize(type, reader);
-		break;
-	case ExpressionClass::COLUMN_REF:
-		result = ColumnRefExpression::Deserialize(type, reader);
-		break;
-	case ExpressionClass::COMPARISON:
-		result = ComparisonExpression::Deserialize(type, reader);
-		break;
-	case ExpressionClass::CONJUNCTION:
-		result = ConjunctionExpression::Deserialize(type, reader);
-		break;
-	case ExpressionClass::CONSTANT:
-		result = ConstantExpression::Deserialize(type, reader);
-		break;
-	case ExpressionClass::DEFAULT:
-		result = DefaultExpression::Deserialize(type, reader);
-		break;
-	case ExpressionClass::FUNCTION:
-		result = FunctionExpression::Deserialize(type, reader);
-		break;
-	case ExpressionClass::LAMBDA:
-		result = LambdaExpression::Deserialize(type, reader);
-		break;
-	case ExpressionClass::OPERATOR:
-		result = OperatorExpression::Deserialize(type, reader);
-		break;
-	case ExpressionClass::PARAMETER:
-		result = ParameterExpression::Deserialize(type, reader);
-		break;
-	case ExpressionClass::POSITIONAL_REFERENCE:
-		result = PositionalReferenceExpression::Deserialize(type, reader);
-		break;
-	case ExpressionClass::STAR:
-		result = StarExpression::Deserialize(type, reader);
-		break;
-	case ExpressionClass::SUBQUERY:
-		result = SubqueryExpression::Deserialize(type, reader);
-		break;
-	case ExpressionClass::WINDOW:
-		result = WindowExpression::Deserialize(type, reader);
-		break;
-	default:
-		throw SerializationException("Unsupported type for expression deserialization: '%s'!",
-		                             ExpressionClassToString(expression_class));
-	}
-	result->alias = alias;
-	reader.Finalize();
-	return result;
-}
-
 bool ParsedExpression::Equals(const unique_ptr<ParsedExpression> &left, const unique_ptr<ParsedExpression> &right) {
 	if (left.get() == right.get()) {
 		return true;

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

@@ -8,6 +8,7 @@
 #include "duckdb/parser/statement/extension_statement.hpp"
 #include "duckdb/parser/statement/select_statement.hpp"
 #include "duckdb/parser/statement/update_statement.hpp"
+#include "duckdb/parser/group_by_node.hpp"
 #include "duckdb/parser/tableref/expressionlistref.hpp"
 #include "duckdb/parser/transformer.hpp"
 #include "parser/parser.hpp"
@@ -191,44 +192,55 @@ 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);
-				// LCOV_EXCL_START
-				// first see if DuckDB can parse this individual query statement
-				if (another_parser.success) {
-					if (!another_parser.parse_tree) {
-						// empty statement
-						continue;
-					}
-					transformer.TransformParseTree(another_parser.parse_tree, statements);
-				} else {
-					// let extensions parse the statement which DuckDB failed to parse
-					bool parsed_single_statement = false;
-					for (auto &ext : *options.extensions) {
-						D_ASSERT(!parsed_single_statement);
-						D_ASSERT(ext.parse_function);
-						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;
-							statements.push_back(std::move(statement));
-							parsed_single_statement = true;
-							break;
-						} else if (result.type == ParserExtensionResultType::DISPLAY_EXTENSION_ERROR) {
-							throw ParserException(result.error);
-						} else {
-							// We move to the next one!
+				string another_parser_error;
+				// Creating a new scope to allow extensions to use PostgresParser, which is not reentrant
+				{
+					PostgresParser another_parser;
+					another_parser.Parse(query_statement);
+					// LCOV_EXCL_START
+					// first see if DuckDB can parse this individual query statement
+					if (another_parser.success) {
+						if (!another_parser.parse_tree) {
+							// empty statement
+							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();
+						continue;
+					} else {
+						another_parser_error = QueryErrorContext::Format(query, another_parser.error_message,
+						                                                 another_parser.error_location - 1);
 					}
-					if (!parsed_single_statement) {
-						parser_error = QueryErrorContext::Format(query, another_parser.error_message,
-						                                         another_parser.error_location - 1);
-						throw ParserException(parser_error);
+				} // LCOV_EXCL_STOP
+				// LCOV_EXCL_START
+				// let extensions parse the statement which DuckDB failed to parse
+				bool parsed_single_statement = false;
+				for (auto &ext : *options.extensions) {
+					D_ASSERT(!parsed_single_statement);
+					D_ASSERT(ext.parse_function);
+					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() - 1;
+						statement->stmt_location = stmt_loc;
+						stmt_loc += query_statement.size();
+						statements.push_back(std::move(statement));
+						parsed_single_statement = true;
+						break;
+					} else if (result.type == ParserExtensionResultType::DISPLAY_EXTENSION_ERROR) {
+						throw ParserException(result.error);
+					} else {
+						// We move to the next one!
 					}
 				}
-				// LCOV_EXCL_STOP
+				if (!parsed_single_statement) {
+					throw ParserException(parser_error);
+				} // LCOV_EXCL_STOP
 			}
 		}
 	}
@@ -329,6 +341,22 @@ vector<unique_ptr<ParsedExpression>> Parser::ParseExpressionList(const string &s
 	return std::move(select_node.select_list);
 }
 
+GroupByNode Parser::ParseGroupByList(const string &group_by, ParserOptions options) {
+	// construct a mock SELECT query with our group_by expressions
+	string mock_query = StringUtil::Format("SELECT 42 GROUP BY %s", group_by);
+	// parse the query
+	Parser parser(options);
+	parser.ParseQuery(mock_query);
+	// check the result
+	if (parser.statements.size() != 1 || parser.statements[0]->type != StatementType::SELECT_STATEMENT) {
+		throw ParserException("Expected a single SELECT statement");
+	}
+	auto &select = parser.statements[0]->Cast<SelectStatement>();
+	D_ASSERT(select.node->type == QueryNodeType::SELECT_NODE);
+	auto &select_node = select.node->Cast<SelectNode>();
+	return std::move(select_node.groups);
+}
+
 vector<OrderByNode> Parser::ParseOrderList(const string &select_list, ParserOptions options) {
 	// construct a mock query
 	string mock_query = "SELECT * FROM tbl ORDER BY " + select_list;
@@ -340,9 +368,7 @@ vector<OrderByNode> Parser::ParseOrderList(const string &select_list, ParserOpti
 		throw ParserException("Expected a single SELECT statement");
 	}
 	auto &select = parser.statements[0]->Cast<SelectStatement>();
-	if (select.node->type != QueryNodeType::SELECT_NODE) {
-		throw ParserException("Expected a single SELECT node");
-	}
+	D_ASSERT(select.node->type == QueryNodeType::SELECT_NODE);
 	auto &select_node = select.node->Cast<SelectNode>();
 	if (select_node.modifiers.empty() || select_node.modifiers[0]->type != ResultModifierType::ORDER_MODIFIER ||
 	    select_node.modifiers.size() != 1) {

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

@@ -0,0 +1,41 @@
+#include "duckdb/parser/query_node/cte_node.hpp"
+#include "duckdb/common/serializer/serializer.hpp"
+#include "duckdb/common/serializer/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);
+}
+
+} // namespace duckdb

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

@@ -1,7 +1,6 @@
 #include "duckdb/parser/query_node/recursive_cte_node.hpp"
-#include "duckdb/common/field_writer.hpp"
-#include "duckdb/common/serializer/format_serializer.hpp"
-#include "duckdb/common/serializer/format_deserializer.hpp"
+#include "duckdb/common/serializer/serializer.hpp"
+#include "duckdb/common/serializer/deserializer.hpp"
 
 namespace duckdb {
 
@@ -48,41 +47,4 @@ unique_ptr<QueryNode> RecursiveCTENode::Copy() const {
 	return std::move(result);
 }
 
-void RecursiveCTENode::Serialize(FieldWriter &writer) const {
-	writer.WriteString(ctename);
-	writer.WriteField<bool>(union_all);
-	writer.WriteSerializable(*left);
-	writer.WriteSerializable(*right);
-	writer.WriteList<string>(aliases);
-}
-
-unique_ptr<QueryNode> RecursiveCTENode::Deserialize(FieldReader &reader) {
-	auto result = make_uniq<RecursiveCTENode>();
-	result->ctename = reader.ReadRequired<string>();
-	result->union_all = reader.ReadRequired<bool>();
-	result->left = reader.ReadRequiredSerializable<QueryNode>();
-	result->right = reader.ReadRequiredSerializable<QueryNode>();
-	result->aliases = reader.ReadRequiredList<string>();
-	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