duckdb 0.7.2-dev12.0 → 0.7.2-dev1238.0

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

@@ -3,6 +3,9 @@
 #include "duckdb/common/exception.hpp"
 #include "duckdb/common/field_writer.hpp"
 
+#include "duckdb/common/serializer/format_serializer.hpp"
+#include "duckdb/common/serializer/format_deserializer.hpp"
+
 namespace duckdb {
 
 OperatorExpression::OperatorExpression(ExpressionType type, unique_ptr<ParsedExpression> left,
@@ -55,4 +58,16 @@ 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_unique<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

@@ -5,6 +5,9 @@
 #include "duckdb/common/types/hash.hpp"
 #include "duckdb/common/to_string.hpp"
 
+#include "duckdb/common/serializer/format_serializer.hpp"
+#include "duckdb/common/serializer/format_deserializer.hpp"
+
 namespace duckdb {
 
 ParameterExpression::ParameterExpression()
@@ -41,4 +44,16 @@ 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_unique<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

@@ -5,6 +5,9 @@
 #include "duckdb/common/types/hash.hpp"
 #include "duckdb/common/to_string.hpp"
 
+#include "duckdb/common/serializer/format_serializer.hpp"
+#include "duckdb/common/serializer/format_deserializer.hpp"
+
 namespace duckdb {
 
 PositionalReferenceExpression::PositionalReferenceExpression(idx_t index)
@@ -40,4 +43,15 @@ 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_unique<PositionalReferenceExpression>(deserializer.ReadProperty<idx_t>("index"));
+	return std::move(expression);
+}
+
 } // namespace duckdb

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

@@ -3,6 +3,9 @@
 #include "duckdb/common/exception.hpp"
 #include "duckdb/common/field_writer.hpp"
 
+#include "duckdb/common/serializer/format_serializer.hpp"
+#include "duckdb/common/serializer/format_deserializer.hpp"
+
 namespace duckdb {
 
 StarExpression::StarExpression(string relation_name_p)
@@ -10,9 +13,9 @@ StarExpression::StarExpression(string relation_name_p)
 }
 
 string StarExpression::ToString() const {
-	if (!regex.empty()) {
+	if (expr) {
 		D_ASSERT(columns);
-		return "COLUMNS('" + regex + "')";
+		return "COLUMNS(" + expr->ToString() + ")";
 	}
 	string result;
 	if (columns) {
@@ -70,7 +73,7 @@ bool StarExpression::Equal(const StarExpression *a, const StarExpression *b) {
 			return false;
 		}
 	}
-	if (a->regex != b->regex) {
+	if (!BaseExpression::Equals(a->expr.get(), b->expr.get())) {
 		return false;
 	}
 	return true;
@@ -93,7 +96,7 @@ void StarExpression::Serialize(FieldWriter &writer) const {
 		entry.second->Serialize(serializer);
 	}
 	writer.WriteField<bool>(columns);
-	writer.WriteString(regex);
+	writer.WriteOptional(expr);
 }
 
 unique_ptr<ParsedExpression> StarExpression::Deserialize(ExpressionType type, FieldReader &reader) {
@@ -112,7 +115,7 @@ unique_ptr<ParsedExpression> StarExpression::Deserialize(ExpressionType type, Fi
 		result->replace_list.insert(make_pair(name, std::move(expr)));
 	}
 	result->columns = reader.ReadField<bool>(false);
-	result->regex = reader.ReadField<string>(string());
+	result->expr = reader.ReadOptional<ParsedExpression>(nullptr);
 	return std::move(result);
 }
 
@@ -123,9 +126,26 @@ unique_ptr<ParsedExpression> StarExpression::Copy() const {
 		copy->replace_list[entry.first] = entry.second->Copy();
 	}
 	copy->columns = columns;
-	copy->regex = regex;
+	copy->expr = expr ? expr->Copy() : nullptr;
 	copy->CopyProperties(*this);
 	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);
+}
+
+unique_ptr<ParsedExpression> StarExpression::FormatDeserialize(ExpressionType type, FormatDeserializer &deserializer) {
+	auto result = make_unique<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);
+	return std::move(result);
+}
+
 } // namespace duckdb

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

@@ -2,6 +2,8 @@
 
 #include "duckdb/common/exception.hpp"
 #include "duckdb/common/field_writer.hpp"
+#include "duckdb/common/serializer/format_deserializer.hpp"
+#include "duckdb/common/serializer/format_serializer.hpp"
 
 namespace duckdb {
 
@@ -72,4 +74,22 @@ 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.get());
+	serializer.WriteOptionalProperty("child", child);
+	serializer.WriteProperty("comparison_type", comparison_type);
+}
+
+unique_ptr<ParsedExpression> SubqueryExpression::FormatDeserialize(ExpressionType type,
+                                                                   FormatDeserializer &deserializer) {
+	auto expression = make_unique<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

@@ -4,6 +4,10 @@
 #include "duckdb/common/field_writer.hpp"
 #include "duckdb/common/string_util.hpp"
 
+#include "duckdb/common/serializer/enum_serializer.hpp"
+#include "duckdb/common/serializer/format_serializer.hpp"
+#include "duckdb/common/serializer/format_deserializer.hpp"
+
 namespace duckdb {
 
 WindowExpression::WindowExpression(ExpressionType type, string catalog_name, string schema, const string &function_name)
@@ -139,6 +143,45 @@ 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_unique<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_data/alter_info.cpp

@@ -1,6 +1,7 @@
 #include "duckdb/parser/parsed_data/alter_info.hpp"
 #include "duckdb/parser/parsed_data/alter_table_info.hpp"
-#include "duckdb/parser/parsed_data/alter_function_info.hpp"
+#include "duckdb/parser/parsed_data/alter_scalar_function_info.hpp"
+#include "duckdb/parser/parsed_data/alter_table_function_info.hpp"
 
 #include "duckdb/common/field_writer.hpp"
 
@@ -33,8 +34,11 @@ unique_ptr<AlterInfo> AlterInfo::Deserialize(Deserializer &source) {
 	case AlterType::ALTER_VIEW:
 		result = AlterViewInfo::Deserialize(reader);
 		break;
-	case AlterType::ALTER_FUNCTION:
-		result = AlterFunctionInfo::Deserialize(reader);
+	case AlterType::ALTER_SCALAR_FUNCTION:
+		result = AlterScalarFunctionInfo::Deserialize(reader);
+		break;
+	case AlterType::ALTER_TABLE_FUNCTION:
+		result = AlterTableFunctionInfo::Deserialize(reader);
 		break;
 	default:
 		throw SerializationException("Unknown alter type for deserialization!");

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

@@ -0,0 +1,56 @@
+#include "duckdb/parser/parsed_data/alter_scalar_function_info.hpp"
+
+#include "duckdb/common/field_writer.hpp"
+#include "duckdb/parser/constraint.hpp"
+
+namespace duckdb {
+
+//===--------------------------------------------------------------------===//
+// AlterScalarFunctionInfo
+//===--------------------------------------------------------------------===//
+AlterScalarFunctionInfo::AlterScalarFunctionInfo(AlterScalarFunctionType type, AlterEntryData data)
+    : AlterInfo(AlterType::ALTER_SCALAR_FUNCTION, std::move(data.catalog), std::move(data.schema), std::move(data.name),
+                data.if_exists),
+      alter_scalar_function_type(type) {
+}
+AlterScalarFunctionInfo::~AlterScalarFunctionInfo() {
+}
+
+CatalogType AlterScalarFunctionInfo::GetCatalogType() const {
+	return CatalogType::SCALAR_FUNCTION_ENTRY;
+}
+
+void AlterScalarFunctionInfo::Serialize(FieldWriter &writer) const {
+	writer.WriteField<AlterScalarFunctionType>(alter_scalar_function_type);
+	writer.WriteString(catalog);
+	writer.WriteString(schema);
+	writer.WriteString(name);
+	writer.WriteField(if_exists);
+}
+
+unique_ptr<AlterInfo> AlterScalarFunctionInfo::Deserialize(FieldReader &reader) {
+	//	auto type = reader.ReadRequired<AlterScalarFunctionType>();
+	//	auto schema = reader.ReadRequired<string>();
+	//	auto table = reader.ReadRequired<string>();
+	//	auto if_exists = reader.ReadRequired<bool>();
+
+	throw NotImplementedException("AlterScalarFunctionInfo cannot be deserialized");
+}
+
+//===--------------------------------------------------------------------===//
+// AddScalarFunctionOverloadInfo
+//===--------------------------------------------------------------------===//
+AddScalarFunctionOverloadInfo::AddScalarFunctionOverloadInfo(AlterEntryData data, ScalarFunctionSet new_overloads_p)
+    : AlterScalarFunctionInfo(AlterScalarFunctionType::ADD_FUNCTION_OVERLOADS, std::move(data)),
+      new_overloads(std::move(new_overloads_p)) {
+	this->allow_internal = true;
+}
+
+AddScalarFunctionOverloadInfo::~AddScalarFunctionOverloadInfo() {
+}
+
+unique_ptr<AlterInfo> AddScalarFunctionOverloadInfo::Copy() const {
+	return make_unique_base<AlterInfo, AddScalarFunctionOverloadInfo>(GetAlterEntryData(), new_overloads);
+}
+
+} // namespace duckdb

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

@@ -0,0 +1,51 @@
+#include "duckdb/parser/parsed_data/alter_table_function_info.hpp"
+
+#include "duckdb/common/field_writer.hpp"
+#include "duckdb/parser/constraint.hpp"
+
+namespace duckdb {
+
+//===--------------------------------------------------------------------===//
+// AlterTableFunctionInfo
+//===--------------------------------------------------------------------===//
+AlterTableFunctionInfo::AlterTableFunctionInfo(AlterTableFunctionType type, AlterEntryData data)
+    : AlterInfo(AlterType::ALTER_TABLE_FUNCTION, std::move(data.catalog), std::move(data.schema), std::move(data.name),
+                data.if_exists),
+      alter_table_function_type(type) {
+}
+AlterTableFunctionInfo::~AlterTableFunctionInfo() {
+}
+
+CatalogType AlterTableFunctionInfo::GetCatalogType() const {
+	return CatalogType::TABLE_FUNCTION_ENTRY;
+}
+
+void AlterTableFunctionInfo::Serialize(FieldWriter &writer) const {
+	writer.WriteField<AlterTableFunctionType>(alter_table_function_type);
+	writer.WriteString(catalog);
+	writer.WriteString(schema);
+	writer.WriteString(name);
+	writer.WriteField(if_exists);
+}
+
+unique_ptr<AlterInfo> AlterTableFunctionInfo::Deserialize(FieldReader &reader) {
+	throw NotImplementedException("AlterTableFunctionInfo cannot be deserialized");
+}
+
+//===--------------------------------------------------------------------===//
+// AddTableFunctionOverloadInfo
+//===--------------------------------------------------------------------===//
+AddTableFunctionOverloadInfo::AddTableFunctionOverloadInfo(AlterEntryData data, TableFunctionSet new_overloads_p)
+    : AlterTableFunctionInfo(AlterTableFunctionType::ADD_FUNCTION_OVERLOADS, std::move(data)),
+      new_overloads(std::move(new_overloads_p)) {
+	this->allow_internal = true;
+}
+
+AddTableFunctionOverloadInfo::~AddTableFunctionOverloadInfo() {
+}
+
+unique_ptr<AlterInfo> AddTableFunctionOverloadInfo::Copy() const {
+	return make_unique_base<AlterInfo, AddTableFunctionOverloadInfo>(GetAlterEntryData(), new_overloads);
+}
+
+} // namespace duckdb

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

@@ -1,5 +1,5 @@
 #include "duckdb/parser/parsed_data/create_scalar_function_info.hpp"
-#include "duckdb/parser/parsed_data/alter_function_info.hpp"
+#include "duckdb/parser/parsed_data/alter_scalar_function_info.hpp"
 
 namespace duckdb {
 
@@ -27,7 +27,8 @@ unique_ptr<CreateInfo> CreateScalarFunctionInfo::Copy() const {
 }
 
 unique_ptr<AlterInfo> CreateScalarFunctionInfo::GetAlterInfo() const {
-	return make_unique_base<AlterInfo, AddFunctionOverloadInfo>(AlterEntryData(catalog, schema, name, true), functions);
+	return make_unique_base<AlterInfo, AddScalarFunctionOverloadInfo>(AlterEntryData(catalog, schema, name, true),
+	                                                                  functions);
 }
 
 } // namespace duckdb

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

@@ -1,4 +1,5 @@
 #include "duckdb/parser/parsed_data/create_table_function_info.hpp"
+#include "duckdb/parser/parsed_data/alter_table_function_info.hpp"
 
 namespace duckdb {
 
@@ -25,4 +26,9 @@ unique_ptr<CreateInfo> CreateTableFunctionInfo::Copy() const {
 	return std::move(result);
 }
 
+unique_ptr<AlterInfo> CreateTableFunctionInfo::GetAlterInfo() const {
+	return make_unique_base<AlterInfo, AddTableFunctionOverloadInfo>(AlterEntryData(catalog, schema, name, true),
+	                                                                 functions);
+}
+
 } // namespace duckdb

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

@@ -1,19 +1,13 @@
 #include "duckdb/parser/parsed_data/sample_options.hpp"
 #include "duckdb/common/field_writer.hpp"
+#include "duckdb/common/serializer/enum_serializer.hpp"
+#include "duckdb/common/serializer/format_serializer.hpp"
+#include "duckdb/common/serializer/format_deserializer.hpp"
 
 namespace duckdb {
 
 string SampleMethodToString(SampleMethod method) {
-	switch (method) {
-	case SampleMethod::SYSTEM_SAMPLE:
-		return "System";
-	case SampleMethod::BERNOULLI_SAMPLE:
-		return "Bernoulli";
-	case SampleMethod::RESERVOIR_SAMPLE:
-		return "Reservoir";
-	default:
-		return "Unknown";
-	}
+	return EnumSerializer::EnumToString(method);
 }
 
 void SampleOptions::Serialize(Serializer &serializer) {
@@ -25,6 +19,24 @@ void SampleOptions::Serialize(Serializer &serializer) {
 	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);
+}
+
+std::unique_ptr<SampleOptions> SampleOptions::FormatDeserialize(FormatDeserializer &deserializer) {
+	auto result = make_unique<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_unique<SampleOptions>();
 

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

@@ -5,6 +5,8 @@
 #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"
 
 namespace duckdb {
 
@@ -107,6 +109,76 @@ 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_unique<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

@@ -96,6 +96,13 @@ void ParsedExpressionIterator::EnumerateChildren(
 		}
 		break;
 	}
+	case ExpressionClass::STAR: {
+		auto &star_expr = (StarExpression &)expr;
+		if (star_expr.expr) {
+			callback(star_expr.expr);
+		}
+		break;
+	}
 	case ExpressionClass::SUBQUERY: {
 		auto &subquery_expr = (SubqueryExpression &)expr;
 		if (subquery_expr.child) {
@@ -135,7 +142,6 @@ void ParsedExpressionIterator::EnumerateChildren(
 	case ExpressionClass::COLUMN_REF:
 	case ExpressionClass::CONSTANT:
 	case ExpressionClass::DEFAULT:
-	case ExpressionClass::STAR:
 	case ExpressionClass::PARAMETER:
 	case ExpressionClass::POSITIONAL_REFERENCE:
 		// these node types have no children
@@ -213,6 +219,14 @@ void ParsedExpressionIterator::EnumerateTableRefChildren(
 		}
 		break;
 	}
+	case TableReferenceType::PIVOT: {
+		auto &p_ref = (PivotRef &)ref;
+		EnumerateTableRefChildren(*p_ref.source, callback);
+		for (auto &aggr : p_ref.aggregates) {
+			callback(aggr);
+		}
+		break;
+	}
 	case TableReferenceType::SUBQUERY: {
 		auto &sq_ref = (SubqueryRef &)ref;
 		EnumerateQueryNodeChildren(*sq_ref.subquery->node, callback);

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

@@ -1,5 +1,7 @@
 #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"
 
 namespace duckdb {
 
@@ -64,4 +66,23 @@ 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_unique<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

@@ -2,6 +2,8 @@
 #include "duckdb/parser/expression_util.hpp"
 #include "duckdb/common/field_writer.hpp"
 #include "duckdb/parser/keyword_helper.hpp"
+#include "duckdb/common/serializer/format_serializer.hpp"
+#include "duckdb/common/serializer/format_deserializer.hpp"
 
 namespace duckdb {
 
@@ -192,6 +194,35 @@ 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_unique<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_unique<SelectNode>();
 	result->select_list = reader.ReadRequiredSerializableList<ParsedExpression>();