duckdb 0.7.1 → 0.7.2-dev1034.0

package/src/duckdb/src/optimizer/statistics/operator/propagate_set_operation.cpp

@@ -47,18 +47,18 @@ unique_ptr<NodeStatistics> StatisticsPropagator::PropagateStatistics(LogicalSetO
 		switch (setop.type) {
 		case LogicalOperatorType::LOGICAL_UNION:
 			// union: merge the stats of the LHS and RHS together
-			new_stats = left_entry->second->Copy();
+			new_stats = left_entry->second->ToUnique();
 			new_stats->Merge(*right_entry->second);
 			break;
 		case LogicalOperatorType::LOGICAL_EXCEPT:
 			// except: use the stats of the LHS
-			new_stats = left_entry->second->Copy();
+			new_stats = left_entry->second->ToUnique();
 			break;
 		case LogicalOperatorType::LOGICAL_INTERSECT:
 			// intersect: intersect the two stats
 			// FIXME: for now we just use the stats of the LHS, as this is correct
 			// however, the stats can be further refined to the minimal subset of the LHS and RHS
-			new_stats = left_entry->second->Copy();
+			new_stats = left_entry->second->ToUnique();
 			break;
 		default:
 			throw InternalException("Unsupported setop type");

package/src/duckdb/src/optimizer/statistics_propagator.cpp

@@ -36,6 +36,7 @@ unique_ptr<NodeStatistics> StatisticsPropagator::PropagateStatistics(LogicalOper
 	case LogicalOperatorType::LOGICAL_PROJECTION:
 		return PropagateStatistics((LogicalProjection &)node, node_ptr);
 	case LogicalOperatorType::LOGICAL_ANY_JOIN:
+	case LogicalOperatorType::LOGICAL_ASOF_JOIN:
 	case LogicalOperatorType::LOGICAL_COMPARISON_JOIN:
 	case LogicalOperatorType::LOGICAL_JOIN:
 	case LogicalOperatorType::LOGICAL_DELIM_JOIN:
@@ -92,7 +93,7 @@ unique_ptr<BaseStatistics> StatisticsPropagator::PropagateExpression(Expression
 unique_ptr<BaseStatistics> StatisticsPropagator::PropagateExpression(unique_ptr<Expression> &expr) {
 	auto stats = PropagateExpression(*expr, &expr);
 	if (ClientConfig::GetConfig(context).query_verification_enabled && stats) {
-		expr->verification_stats = stats->Copy();
+		expr->verification_stats = stats->ToUnique();
 	}
 	return stats;
 }

package/src/duckdb/src/optimizer/unnest_rewriter.cpp

@@ -261,7 +261,7 @@ void UnnestRewriter::UpdateBoundUnnestBindings(UnnestRewriterPlanUpdater &update
 		for (idx_t child_col_idx = 0; child_col_idx < unnest_child_cols.size(); child_col_idx++) {
 			if (delim_columns[delim_col_idx].table_index == unnest_child_cols[child_col_idx].table_index) {
 				ColumnBinding old_binding(overwritten_tbl_idx, DConstants::INVALID_INDEX);
-				updater.replace_bindings.emplace_back(ReplaceBinding(old_binding, delim_columns[delim_col_idx]));
+				updater.replace_bindings.emplace_back(old_binding, delim_columns[delim_col_idx]);
 				break;
 			}
 		}
@@ -301,7 +301,7 @@ void UnnestRewriter::GetLHSExpressions(LogicalOperator &op) {
 	}
 
 	for (idx_t i = 0; i < op.types.size(); i++) {
-		lhs_bindings.emplace_back(LHSBinding(col_bindings[i], op.types[i]));
+		lhs_bindings.emplace_back(col_bindings[i], op.types[i]);
 		if (set_alias) {
 			auto &proj = (LogicalProjection &)op;
 			lhs_bindings.back().alias = proj.expressions[i]->alias;

package/src/duckdb/src/parallel/meta_pipeline.cpp

@@ -133,10 +133,6 @@ bool MetaPipeline::HasFinishEvent(Pipeline *pipeline) {
 }
 
 Pipeline *MetaPipeline::CreateUnionPipeline(Pipeline &current, bool order_matters) {
-	if (HasRecursiveCTE()) {
-		throw NotImplementedException("UNIONS are not supported in recursive CTEs yet");
-	}
-
 	// create the union pipeline (batch index 0, should be set correctly afterwards)
 	auto union_pipeline = CreatePipeline();
 	state.SetPipelineOperators(*union_pipeline, state.GetPipelineOperators(current));

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

@@ -0,0 +1,19 @@
+#include "duckdb/parser/common_table_expression_info.hpp"
+#include "duckdb/common/serializer/format_serializer.hpp"
+#include "duckdb/common/serializer/format_deserializer.hpp"
+
+namespace duckdb {
+
+void CommonTableExpressionInfo::FormatSerialize(FormatSerializer &serializer) const {
+	serializer.WriteProperty("aliases", aliases);
+	serializer.WriteProperty("query", query);
+}
+
+unique_ptr<CommonTableExpressionInfo> CommonTableExpressionInfo::FormatDeserialize(FormatDeserializer &deserializer) {
+	auto result = make_unique<CommonTableExpressionInfo>();
+	result->aliases = deserializer.ReadProperty<vector<string>>("aliases");
+	result->query = deserializer.ReadProperty<unique_ptr<SelectStatement>>("query");
+	return result;
+}
+
+} // namespace duckdb

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

@@ -1,5 +1,7 @@
 #include "duckdb/parser/expression/between_expression.hpp"
 #include "duckdb/common/field_writer.hpp"
+#include "duckdb/common/serializer/format_serializer.hpp"
+#include "duckdb/common/serializer/format_deserializer.hpp"
 
 namespace duckdb {
 
@@ -45,4 +47,19 @@ unique_ptr<ParsedExpression> BetweenExpression::Deserialize(ExpressionType type,
 	return make_unique<BetweenExpression>(std::move(input), std::move(lower), std::move(upper));
 }
 
+void BetweenExpression::FormatSerialize(FormatSerializer &serializer) const {
+	ParsedExpression::FormatSerialize(serializer);
+	serializer.WriteProperty("input", *input);
+	serializer.WriteProperty("lower", *lower);
+	serializer.WriteProperty("upper", *upper);
+}
+
+unique_ptr<ParsedExpression> BetweenExpression::FormatDeserialize(ExpressionType type,
+                                                                  FormatDeserializer &deserializer) {
+	auto input = deserializer.ReadProperty<unique_ptr<ParsedExpression>>("input");
+	auto lower = deserializer.ReadProperty<unique_ptr<ParsedExpression>>("lower");
+	auto upper = deserializer.ReadProperty<unique_ptr<ParsedExpression>>("upper");
+	return make_unique<BetweenExpression>(std::move(input), std::move(lower), std::move(upper));
+}
+
 } // namespace duckdb

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

@@ -3,8 +3,23 @@
 #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 {
 
+void CaseCheck::FormatSerialize(FormatSerializer &serializer) const {
+	serializer.WriteProperty("when_expr", when_expr);
+	serializer.WriteProperty("then_expr", then_expr);
+}
+
+CaseCheck CaseCheck::FormatDeserialize(FormatDeserializer &deserializer) {
+	CaseCheck check;
+	deserializer.ReadProperty("when_expr", check.when_expr);
+	deserializer.ReadProperty("then_expr", check.then_expr);
+	return check;
+}
+
 CaseExpression::CaseExpression() : ParsedExpression(ExpressionType::CASE_EXPR, ExpressionClass::CASE) {
 }
 
@@ -69,4 +84,17 @@ unique_ptr<ParsedExpression> CaseExpression::Deserialize(ExpressionType type, Fi
 	return std::move(result);
 }
 
+void CaseExpression::FormatSerialize(FormatSerializer &serializer) const {
+	ParsedExpression::FormatSerialize(serializer);
+	serializer.WriteProperty("case_checks", case_checks);
+	serializer.WriteProperty("else_expr", *else_expr);
+}
+
+unique_ptr<ParsedExpression> CaseExpression::FormatDeserialize(ExpressionType type, FormatDeserializer &deserializer) {
+	auto result = make_unique<CaseExpression>();
+	deserializer.ReadProperty("case_checks", result->case_checks);
+	deserializer.ReadProperty("else_expr", result->else_expr);
+	return std::move(result);
+}
+
 } // namespace duckdb

package/src/duckdb/src/parser/expression/cast_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 {
 
 CastExpression::CastExpression(LogicalType target, unique_ptr<ParsedExpression> child, bool try_cast_p)
@@ -48,4 +51,18 @@ unique_ptr<ParsedExpression> CastExpression::Deserialize(ExpressionType type, Fi
 	return make_unique_base<ParsedExpression, CastExpression>(cast_type, std::move(child), try_cast);
 }
 
+void CastExpression::FormatSerialize(FormatSerializer &serializer) const {
+	ParsedExpression::FormatSerialize(serializer);
+	serializer.WriteProperty("child", *child);
+	serializer.WriteProperty("cast_type", cast_type);
+	serializer.WriteProperty("try_cast", try_cast);
+}
+
+unique_ptr<ParsedExpression> CastExpression::FormatDeserialize(ExpressionType type, FormatDeserializer &deserializer) {
+	auto child = deserializer.ReadProperty<unique_ptr<ParsedExpression>>("child");
+	auto cast_type = deserializer.ReadProperty<LogicalType>("cast_type");
+	auto try_cast = deserializer.ReadProperty<bool>("try_cast");
+	return make_unique_base<ParsedExpression, CastExpression>(cast_type, std::move(child), try_cast);
+}
+
 } // namespace duckdb

package/src/duckdb/src/parser/expression/collate_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 {
 
 CollateExpression::CollateExpression(string collation_p, unique_ptr<ParsedExpression> child)
@@ -42,4 +45,17 @@ unique_ptr<ParsedExpression> CollateExpression::Deserialize(ExpressionType type,
 	return make_unique_base<ParsedExpression, CollateExpression>(collation, std::move(child));
 }
 
+void CollateExpression::FormatSerialize(FormatSerializer &serializer) const {
+	ParsedExpression::FormatSerialize(serializer);
+	serializer.WriteProperty("child", *child);
+	serializer.WriteProperty("collation", collation);
+}
+
+unique_ptr<ParsedExpression> CollateExpression::FormatDeserialize(ExpressionType type,
+                                                                  FormatDeserializer &deserializer) {
+	auto child = deserializer.ReadProperty<unique_ptr<ParsedExpression>>("child");
+	auto collation = deserializer.ReadProperty<string>("collation");
+	return make_unique_base<ParsedExpression, CollateExpression>(collation, std::move(child));
+}
+
 } // namespace duckdb

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

@@ -5,6 +5,9 @@
 #include "duckdb/common/string_util.hpp"
 #include "duckdb/parser/qualified_name.hpp"
 
+#include "duckdb/common/serializer/format_serializer.hpp"
+#include "duckdb/common/serializer/format_deserializer.hpp"
+
 namespace duckdb {
 
 ColumnRefExpression::ColumnRefExpression(string column_name, string table_name)
@@ -100,4 +103,16 @@ unique_ptr<ParsedExpression> ColumnRefExpression::Deserialize(ExpressionType typ
 	return std::move(expression);
 }
 
+void ColumnRefExpression::FormatSerialize(FormatSerializer &serializer) const {
+	ParsedExpression::FormatSerialize(serializer);
+	serializer.WriteProperty("column_names", column_names);
+}
+
+unique_ptr<ParsedExpression> ColumnRefExpression::FormatDeserialize(ExpressionType type,
+                                                                    FormatDeserializer &deserializer) {
+	auto column_names = deserializer.ReadProperty<vector<string>>("column_names");
+	auto expression = make_unique<ColumnRefExpression>(std::move(column_names));
+	return std::move(expression);
+}
+
 } // namespace duckdb

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

@@ -4,6 +4,9 @@
 #include "duckdb/common/field_writer.hpp"
 #include "duckdb/parser/expression/cast_expression.hpp"
 
+#include "duckdb/common/serializer/format_serializer.hpp"
+#include "duckdb/common/serializer/format_deserializer.hpp"
+
 namespace duckdb {
 
 ComparisonExpression::ComparisonExpression(ExpressionType type, unique_ptr<ParsedExpression> left,
@@ -42,4 +45,17 @@ unique_ptr<ParsedExpression> ComparisonExpression::Deserialize(ExpressionType ty
 	return make_unique<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_unique<ComparisonExpression>(type, std::move(left), std::move(right));
+}
+
 } // namespace duckdb

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

@@ -3,6 +3,9 @@
 #include "duckdb/common/field_writer.hpp"
 #include "duckdb/parser/expression_util.hpp"
 
+#include "duckdb/common/serializer/format_serializer.hpp"
+#include "duckdb/common/serializer/format_deserializer.hpp"
+
 namespace duckdb {
 
 ConjunctionExpression::ConjunctionExpression(ExpressionType type)
@@ -45,9 +48,11 @@ bool ConjunctionExpression::Equal(const ConjunctionExpression *a, const Conjunct
 
 unique_ptr<ParsedExpression> ConjunctionExpression::Copy() const {
 	vector<unique_ptr<ParsedExpression>> copy_children;
+	copy_children.reserve(children.size());
 	for (auto &expr : children) {
 		copy_children.push_back(expr->Copy());
 	}
+
 	auto copy = make_unique<ConjunctionExpression>(type, std::move(copy_children));
 	copy->CopyProperties(*this);
 	return std::move(copy);
@@ -63,4 +68,16 @@ 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_unique<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

@@ -5,6 +5,9 @@
 #include "duckdb/common/types/hash.hpp"
 #include "duckdb/common/value_operations/value_operations.hpp"
 
+#include "duckdb/common/serializer/format_serializer.hpp"
+#include "duckdb/common/serializer/format_deserializer.hpp"
+
 namespace duckdb {
 
 ConstantExpression::ConstantExpression(Value val)
@@ -38,4 +41,15 @@ unique_ptr<ParsedExpression> ConstantExpression::Deserialize(ExpressionType type
 	return make_unique<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_unique<ConstantExpression>(std::move(value));
+}
+
 } // namespace duckdb

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

@@ -2,6 +2,9 @@
 
 #include "duckdb/common/exception.hpp"
 
+#include "duckdb/common/serializer/format_serializer.hpp"
+#include "duckdb/common/serializer/format_deserializer.hpp"
+
 namespace duckdb {
 
 DefaultExpression::DefaultExpression() : ParsedExpression(ExpressionType::VALUE_DEFAULT, ExpressionClass::DEFAULT) {
@@ -24,4 +27,8 @@ unique_ptr<ParsedExpression> DefaultExpression::Deserialize(ExpressionType type,
 	return make_unique<DefaultExpression>();
 }
 
+void DefaultExpression::FormatSerialize(FormatSerializer &serializer) const {
+	ParsedExpression::FormatSerialize(serializer);
+}
+
 } // namespace duckdb

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

@@ -6,6 +6,9 @@
 #include "duckdb/common/field_writer.hpp"
 #include "duckdb/common/types/hash.hpp"
 
+#include "duckdb/common/serializer/format_serializer.hpp"
+#include "duckdb/common/serializer/format_deserializer.hpp"
+
 namespace duckdb {
 
 FunctionExpression::FunctionExpression(string catalog, string schema, const string &function_name,
@@ -122,4 +125,36 @@ 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_unique<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

@@ -3,6 +3,9 @@
 #include "duckdb/common/types/hash.hpp"
 #include "duckdb/common/string_util.hpp"
 
+#include "duckdb/common/serializer/format_serializer.hpp"
+#include "duckdb/common/serializer/format_deserializer.hpp"
+
 namespace duckdb {
 
 LambdaExpression::LambdaExpression(unique_ptr<ParsedExpression> lhs, unique_ptr<ParsedExpression> expr)
@@ -41,4 +44,17 @@ unique_ptr<ParsedExpression> LambdaExpression::Deserialize(ExpressionType type,
 	return make_unique<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_unique<LambdaExpression>(std::move(lhs), std::move(expr));
+}
+
 } // namespace duckdb

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