duckdb 0.10.2 → 0.10.3-dev10.0

package/src/duckdb/src/include/duckdb/optimizer/join_order/join_order_optimizer.hpp

@@ -31,19 +31,12 @@ public:
 	//! Perform join reordering inside a plan
 	unique_ptr<LogicalOperator> Optimize(unique_ptr<LogicalOperator> plan, optional_ptr<RelationStats> stats = nullptr);
 
-	unique_ptr<JoinNode> CreateJoinTree(JoinRelationSet &set,
-	                                    const vector<reference<NeighborInfo>> &possible_connections, JoinNode &left,
-	                                    JoinNode &right);
-
 private:
 	ClientContext &context;
 
 	//! manages the query graph, relations, and edges between relations
 	QueryGraphManager query_graph_manager;
 
-	//! The optimal join plan found for the specific JoinRelationSet*
-	unordered_map<JoinRelationSet *, unique_ptr<JoinNode>> plans;
-
 	//! The set of filters extracted from the query graph
 	vector<unique_ptr<Expression>> filters;
 	//! The set of filter infos created from the extracted filters
@@ -54,51 +47,7 @@ private:
 
 	CardinalityEstimator cardinality_estimator;
 
-	bool full_plan_found;
-	bool must_update_full_plan;
 	unordered_set<std::string> join_nodes_in_full_plan;
-
-	//! Extract the bindings referred to by an Expression
-	bool ExtractBindings(Expression &expression, unordered_set<idx_t> &bindings);
-
-	//! Get column bindings from a filter
-	void GetColumnBinding(Expression &expression, ColumnBinding &binding);
-
-	//! Traverse the query tree to find (1) base relations, (2) existing join conditions and (3) filters that can be
-	//! rewritten into joins. Returns true if there are joins in the tree that can be reordered, false otherwise.
-	bool ExtractJoinRelations(LogicalOperator &input_op, vector<reference<LogicalOperator>> &filter_operators,
-	                          optional_ptr<LogicalOperator> parent = nullptr);
-
-	//! Emit a pair as a potential join candidate. Returns the best plan found for the (left, right) connection (either
-	//! the newly created plan, or an existing plan)
-	JoinNode &EmitPair(JoinRelationSet &left, JoinRelationSet &right, const vector<reference<NeighborInfo>> &info);
-	//! Tries to emit a potential join candidate pair. Returns false if too many pairs have already been emitted,
-	//! cancelling the dynamic programming step.
-	bool TryEmitPair(JoinRelationSet &left, JoinRelationSet &right, const vector<reference<NeighborInfo>> &info);
-
-	bool EnumerateCmpRecursive(JoinRelationSet &left, JoinRelationSet &right, unordered_set<idx_t> &exclusion_set);
-	//! Emit a relation set node
-	bool EmitCSG(JoinRelationSet &node);
-	//! Enumerate the possible connected subgraphs that can be joined together in the join graph
-	bool EnumerateCSGRecursive(JoinRelationSet &node, unordered_set<idx_t> &exclusion_set);
-	//! Rewrite a logical query plan given the join plan
-	unique_ptr<LogicalOperator> RewritePlan(unique_ptr<LogicalOperator> plan, JoinNode &node);
-	//! Generate cross product edges inside the side
-	void GenerateCrossProducts();
-	//! Perform the join order solving
-	void SolveJoinOrder();
-	//! Solve the join order exactly using dynamic programming. Returns true if it was completed successfully (i.e. did
-	//! not time-out)
-	bool SolveJoinOrderExactly();
-	//! Solve the join order approximately using a greedy algorithm
-	void SolveJoinOrderApproximately();
-
-	void UpdateDPTree(JoinNode &new_plan);
-
-	void UpdateJoinNodesInFullPlan(JoinNode &node);
-	bool NodeInFullPlan(JoinNode &node);
-
-	GenerateJoinRelation GenerateJoins(vector<unique_ptr<LogicalOperator>> &extracted_relations, JoinNode &node);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/optimizer/join_order/plan_enumerator.hpp

@@ -30,38 +30,36 @@ class PlanEnumerator {
 public:
 	explicit PlanEnumerator(QueryGraphManager &query_graph_manager, CostModel &cost_model,
 	                        const QueryGraphEdges &query_graph)
-	    : query_graph(query_graph), query_graph_manager(query_graph_manager), cost_model(cost_model),
-	      full_plan_found(false), must_update_full_plan(false) {
+	    : query_graph(query_graph), query_graph_manager(query_graph_manager), cost_model(cost_model) {
 	}
 
 	//! Perform the join order solving
-	unique_ptr<JoinNode> SolveJoinOrder();
+	void SolveJoinOrder();
 	void InitLeafPlans();
 
-	static unique_ptr<LogicalOperator> BuildSideProbeSideSwaps(unique_ptr<LogicalOperator> plan);
+	const reference_map_t<JoinRelationSet, unique_ptr<DPJoinNode>> &GetPlans() const;
 
 private:
+	//! The set of edges used in the join optimizer
 	QueryGraphEdges const &query_graph;
 	//! The total amount of join pairs that have been considered
 	idx_t pairs = 0;
-	//! The set of edges used in the join optimizer
+	//! Grant access to the set manager and the relation manager
 	QueryGraphManager &query_graph_manager;
 	//! Cost model to evaluate cost of joins
 	CostModel &cost_model;
 	//! A map to store the optimal join plan found for a specific JoinRelationSet*
-	reference_map_t<JoinRelationSet, unique_ptr<JoinNode>> plans;
+	reference_map_t<JoinRelationSet, unique_ptr<DPJoinNode>> plans;
 
-	bool full_plan_found;
-	bool must_update_full_plan;
 	unordered_set<string> join_nodes_in_full_plan;
 
-	unique_ptr<JoinNode> CreateJoinTree(JoinRelationSet &set,
-	                                    const vector<reference<NeighborInfo>> &possible_connections, JoinNode &left,
-	                                    JoinNode &right);
+	unique_ptr<DPJoinNode> CreateJoinTree(JoinRelationSet &set,
+	                                      const vector<reference<NeighborInfo>> &possible_connections, DPJoinNode &left,
+	                                      DPJoinNode &right);
 
 	//! Emit a pair as a potential join candidate. Returns the best plan found for the (left, right) connection (either
 	//! the newly created plan, or an existing plan)
-	JoinNode &EmitPair(JoinRelationSet &left, JoinRelationSet &right, const vector<reference<NeighborInfo>> &info);
+	DPJoinNode &EmitPair(JoinRelationSet &left, JoinRelationSet &right, const vector<reference<NeighborInfo>> &info);
 	//! Tries to emit a potential join candidate pair. Returns false if too many pairs have already been emitted,
 	//! cancelling the dynamic programming step.
 	bool TryEmitPair(JoinRelationSet &left, JoinRelationSet &right, const vector<reference<NeighborInfo>> &info);
@@ -79,11 +77,6 @@ private:
 	bool SolveJoinOrderExactly();
 	//! Solve the join order approximately using a greedy algorithm
 	void SolveJoinOrderApproximately();
-
-	void UpdateDPTree(JoinNode &new_plan);
-
-	void UpdateJoinNodesInFullPlan(JoinNode &node);
-	bool NodeInFullPlan(JoinNode &node);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/optimizer/join_order/query_graph_manager.hpp

@@ -72,7 +72,7 @@ public:
 	bool Build(LogicalOperator &op);
 
 	//! Reconstruct the logical plan using the plan found by the plan enumerator
-	unique_ptr<LogicalOperator> Reconstruct(unique_ptr<LogicalOperator> plan, JoinNode &node);
+	unique_ptr<LogicalOperator> Reconstruct(unique_ptr<LogicalOperator> plan);
 
 	//! Get a reference to the QueryGraphEdges structure that stores edges between
 	//! nodes and hypernodes.
@@ -92,6 +92,9 @@ public:
 	unique_ptr<LogicalOperator> LeftRightOptimizations(unique_ptr<LogicalOperator> op);
 	void TryFlipChildren(LogicalOperator &op, idx_t cardinality_ratio = 1);
 
+	//! A map to store the optimal join plan found for a specific JoinRelationSet*
+	optional_ptr<const reference_map_t<JoinRelationSet, unique_ptr<DPJoinNode>>> plans;
+
 private:
 	vector<reference<LogicalOperator>> filter_operators;
 
@@ -103,14 +106,9 @@ private:
 
 	void GetColumnBinding(Expression &expression, ColumnBinding &binding);
 
-	bool ExtractBindings(Expression &expression, unordered_set<idx_t> &bindings);
-	bool LeftCardLessThanRight(LogicalOperator &op);
-
 	void CreateHyperGraphEdges();
 
-	GenerateJoinRelation GenerateJoins(vector<unique_ptr<LogicalOperator>> &extracted_relations, JoinNode &node);
-
-	unique_ptr<LogicalOperator> RewritePlan(unique_ptr<LogicalOperator> plan, JoinNode &node);
+	GenerateJoinRelation GenerateJoins(vector<unique_ptr<LogicalOperator>> &extracted_relations, JoinRelationSet &set);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/optimizer/matcher/set_matcher.hpp

@@ -9,6 +9,7 @@
 #pragma once
 
 #include "duckdb/common/common.hpp"
+#include "duckdb/common/numeric_utils.hpp"
 #include "duckdb/common/unordered_set.hpp"
 
 namespace duckdb {
@@ -59,7 +60,7 @@ public:
 					return true;
 				} else {
 					// we did not find a match! remove any bindings we added in the call to Match()
-					bindings.erase(bindings.begin() + previous_binding_count, bindings.end());
+					bindings.erase(bindings.begin() + NumericCast<int64_t>(previous_binding_count), bindings.end());
 				}
 			}
 		}

package/src/duckdb/src/include/duckdb/optimizer/optimizer_extension.hpp

@@ -13,14 +13,22 @@
 
 namespace duckdb {
 
+class Optimizer;
+class ClientContext;
+
 //! The OptimizerExtensionInfo holds static information relevant to the optimizer extension
 struct OptimizerExtensionInfo {
 	virtual ~OptimizerExtensionInfo() {
 	}
 };
 
-typedef void (*optimize_function_t)(ClientContext &context, OptimizerExtensionInfo *info,
-                                    unique_ptr<LogicalOperator> &plan);
+struct OptimizerExtensionInput {
+	ClientContext &context;
+	Optimizer &optimizer;
+	optional_ptr<OptimizerExtensionInfo> info;
+};
+
+typedef void (*optimize_function_t)(OptimizerExtensionInput &input, unique_ptr<LogicalOperator> &plan);
 
 class OptimizerExtension {
 public:

package/src/duckdb/src/include/duckdb/optimizer/rule/list.hpp

@@ -11,3 +11,4 @@
 #include "duckdb/optimizer/rule/enum_comparison.hpp"
 #include "duckdb/optimizer/rule/regex_optimizations.hpp"
 #include "duckdb/optimizer/rule/ordered_aggregate_optimizer.hpp"
+#include "duckdb/optimizer/rule/timestamp_comparison.hpp"

package/src/duckdb/src/include/duckdb/optimizer/rule/timestamp_comparison.hpp

@@ -0,0 +1,30 @@
+//===----------------------------------------------------------------------===//
+//                         DuckDB
+//
+// duckdb/optimizer/rule/timestamp_comparison.hpp
+//
+//
+//===----------------------------------------------------------------------===//
+
+#pragma once
+
+#include "duckdb/optimizer/rule.hpp"
+#include "duckdb/function/scalar/string_functions.hpp"
+
+namespace duckdb {
+
+class TimeStampComparison : public Rule {
+public:
+	explicit TimeStampComparison(ClientContext &context, ExpressionRewriter &rewriter);
+
+	unique_ptr<Expression> Apply(LogicalOperator &op, vector<reference<Expression>> &bindings, bool &changes_made,
+	                             bool is_root) override;
+
+	unique_ptr<Expression> ApplyRule(BoundFunctionExpression *expr, ScalarFunction function, string pattern,
+	                                 bool is_not_like);
+
+private:
+	ClientContext &context;
+};
+
+} // namespace duckdb

package/src/duckdb/src/include/duckdb/parallel/event.hpp

@@ -16,7 +16,7 @@ namespace duckdb {
 class Executor;
 class Task;
 
-class Event : public std::enable_shared_from_this<Event> {
+class Event : public enable_shared_from_this<Event> {
 public:
 	explicit Event(Executor &executor);
 	virtual ~Event() = default;

package/src/duckdb/src/include/duckdb/parallel/interrupt.hpp

@@ -11,6 +11,7 @@
 #include "duckdb/common/atomic.hpp"
 #include "duckdb/common/mutex.hpp"
 #include "duckdb/parallel/task.hpp"
+#include "duckdb/common/shared_ptr.hpp"
 #include <condition_variable>
 #include <memory>
 

package/src/duckdb/src/include/duckdb/parallel/meta_pipeline.hpp

@@ -14,7 +14,7 @@
 namespace duckdb {
 
 //! MetaPipeline represents a set of pipelines that all have the same sink
-class MetaPipeline : public std::enable_shared_from_this<MetaPipeline> {
+class MetaPipeline : public enable_shared_from_this<MetaPipeline> {
 	//! We follow these rules when building:
 	//! 1. For joins, build out the blocking side before going down the probe side
 	//!     - The current streaming pipeline will have a dependency on it (dependency across MetaPipelines)

package/src/duckdb/src/include/duckdb/parallel/pipeline.hpp

@@ -66,7 +66,7 @@ public:
 };
 
 //! The Pipeline class represents an execution pipeline starting at a
-class Pipeline : public std::enable_shared_from_this<Pipeline> {
+class Pipeline : public enable_shared_from_this<Pipeline> {
 	friend class Executor;
 	friend class PipelineExecutor;
 	friend class PipelineEvent;

package/src/duckdb/src/include/duckdb/parallel/task.hpp

@@ -22,7 +22,7 @@ enum class TaskExecutionMode : uint8_t { PROCESS_ALL, PROCESS_PARTIAL };
 enum class TaskExecutionResult : uint8_t { TASK_FINISHED, TASK_NOT_FINISHED, TASK_ERROR, TASK_BLOCKED };
 
 //! Generic parallel task
-class Task : public std::enable_shared_from_this<Task> {
+class Task : public enable_shared_from_this<Task> {
 public:
 	virtual ~Task() {
 	}

package/src/duckdb/src/include/duckdb/parser/base_expression.hpp

@@ -79,7 +79,7 @@ public:
 	static bool Equals(const BaseExpression &left, const BaseExpression &right) {
 		return left.Equals(right);
 	}
-	bool operator==(const BaseExpression &rhs) {
+	bool operator==(const BaseExpression &rhs) const {
 		return Equals(rhs);
 	}
 

package/src/duckdb/src/include/duckdb/parser/column_definition.hpp

@@ -104,6 +104,8 @@ private:
 	unique_ptr<ParsedExpression> expression;
 	//! Comment on this column
 	Value comment;
+	//! Tags on this column
+	unordered_map<string, string> tags;
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/alter_info.hpp

@@ -64,6 +64,7 @@ public:
 public:
 	virtual CatalogType GetCatalogType() const = 0;
 	virtual unique_ptr<AlterInfo> Copy() const = 0;
+	virtual string ToString() const = 0;
 
 	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer);

package/src/duckdb/src/include/duckdb/parser/parsed_data/alter_scalar_function_info.hpp

@@ -40,6 +40,7 @@ struct AddScalarFunctionOverloadInfo : public AlterScalarFunctionInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
+	string ToString() const override;
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/alter_table_function_info.hpp

@@ -40,6 +40,7 @@ struct AddTableFunctionOverloadInfo : public AlterTableFunctionInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
+	string ToString() const override;
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/alter_table_info.hpp

@@ -35,6 +35,7 @@ struct ChangeOwnershipInfo : public AlterInfo {
 public:
 	CatalogType GetCatalogType() const override;
 	unique_ptr<AlterInfo> Copy() const override;
+	string ToString() const override;
 };
 
 //===--------------------------------------------------------------------===//
@@ -50,6 +51,7 @@ struct SetCommentInfo : public AlterInfo {
 public:
 	CatalogType GetCatalogType() const override;
 	unique_ptr<AlterInfo> Copy() const override;
+	string ToString() const override;
 
 	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<AlterInfo> Deserialize(Deserializer &deserializer);
@@ -104,6 +106,7 @@ struct RenameColumnInfo : public AlterTableInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
+	string ToString() const override;
 
 	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<AlterTableInfo> Deserialize(Deserializer &deserializer);
@@ -124,6 +127,7 @@ struct RenameTableInfo : public AlterTableInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
+	string ToString() const override;
 
 	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<AlterTableInfo> Deserialize(Deserializer &deserializer);
@@ -146,6 +150,7 @@ struct AddColumnInfo : public AlterTableInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
+	string ToString() const override;
 
 	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<AlterTableInfo> Deserialize(Deserializer &deserializer);
@@ -170,6 +175,7 @@ struct RemoveColumnInfo : public AlterTableInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
+	string ToString() const override;
 	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<AlterTableInfo> Deserialize(Deserializer &deserializer);
 	string GetColumnName() const override {
@@ -197,6 +203,7 @@ struct ChangeColumnTypeInfo : public AlterTableInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
+	string ToString() const override;
 	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<AlterTableInfo> Deserialize(Deserializer &deserializer);
 	string GetColumnName() const override {
@@ -221,6 +228,7 @@ struct SetDefaultInfo : public AlterTableInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
+	string ToString() const override;
 	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<AlterTableInfo> Deserialize(Deserializer &deserializer);
 
@@ -245,6 +253,7 @@ struct AlterForeignKeyInfo : public AlterTableInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
+	string ToString() const override;
 	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<AlterTableInfo> Deserialize(Deserializer &deserializer);
 
@@ -264,6 +273,7 @@ struct SetNotNullInfo : public AlterTableInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
+	string ToString() const override;
 	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<AlterTableInfo> Deserialize(Deserializer &deserializer);
 
@@ -283,6 +293,7 @@ struct DropNotNullInfo : public AlterTableInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
+	string ToString() const override;
 	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<AlterTableInfo> Deserialize(Deserializer &deserializer);
 
@@ -322,6 +333,7 @@ struct RenameViewInfo : public AlterViewInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
+	string ToString() const override;
 	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<AlterViewInfo> Deserialize(Deserializer &deserializer);
 

package/src/duckdb/src/include/duckdb/parser/parsed_data/attach_info.hpp

@@ -35,6 +35,7 @@ public:
 
 public:
 	unique_ptr<AttachInfo> Copy() const;
+	string ToString() const;
 
 	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer);

package/src/duckdb/src/include/duckdb/parser/parsed_data/comment_on_column_info.hpp

@@ -12,6 +12,7 @@
 #include "duckdb/common/types/value.hpp"
 #include "duckdb/parser/parsed_data/alter_info.hpp"
 #include "duckdb/parser/qualified_name.hpp"
+#include "duckdb/catalog/catalog_entry_retriever.hpp"
 
 namespace duckdb {
 class ClientContext;
@@ -35,9 +36,10 @@ public:
 	Value comment_value;
 
 public:
-	optional_ptr<CatalogEntry> TryResolveCatalogEntry(ClientContext &context);
+	optional_ptr<CatalogEntry> TryResolveCatalogEntry(CatalogEntryRetriever &retriever);
 	unique_ptr<AlterInfo> Copy() const override;
 	CatalogType GetCatalogType() const override;
+	string ToString() const override;
 
 	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<AlterInfo> Deserialize(Deserializer &deserializer);

package/src/duckdb/src/include/duckdb/parser/parsed_data/copy_info.hpp

@@ -16,6 +16,8 @@
 
 namespace duckdb {
 
+class QueryNode;
+
 struct CopyInfo : public ParseInfo {
 public:
 	static constexpr const ParseInfoType TYPE = ParseInfoType::COPY_INFO;
@@ -40,20 +42,16 @@ public:
 	string file_path;
 	//! Set of (key, value) options
 	case_insensitive_map_t<vector<Value>> options;
+	// The SQL statement used instead of a table when copying data out to a file
+	unique_ptr<QueryNode> select_statement;
 
 public:
-	unique_ptr<CopyInfo> Copy() const {
-		auto result = make_uniq<CopyInfo>();
-		result->catalog = catalog;
-		result->schema = schema;
-		result->table = table;
-		result->select_list = select_list;
-		result->file_path = file_path;
-		result->is_from = is_from;
-		result->format = format;
-		result->options = options;
-		return result;
-	}
+	static string CopyOptionsToString(const string &format, const case_insensitive_map_t<vector<Value>> &options);
+
+public:
+	unique_ptr<CopyInfo> Copy() const;
+	string ToString() const;
+	string TablePartToString() const;
 
 	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer);

package/src/duckdb/src/include/duckdb/parser/parsed_data/create_info.hpp

@@ -44,8 +44,12 @@ public:
 	bool internal;
 	//! The SQL string of the CREATE statement
 	string sql;
+	//! The inherent dependencies of the created entry
+	LogicalDependencyList dependencies;
 	//! User provided comment
 	Value comment;
+	//! Key-value tags with additional metadata
+	unordered_map<string, string> tags;
 
 public:
 	void Serialize(Serializer &serializer) const override;
@@ -58,8 +62,8 @@ public:
 	DUCKDB_API virtual unique_ptr<AlterInfo> GetAlterInfo() const;
 
 	virtual string ToString() const {
-		throw InternalException("ToString not supported for this type of CreateInfo: '%s'",
-		                        EnumUtil::ToString(info_type));
+		throw NotImplementedException("ToString not supported for this type of CreateInfo: '%s'",
+		                              EnumUtil::ToString(info_type));
 	}
 };
 

package/src/duckdb/src/include/duckdb/parser/parsed_data/create_schema_info.hpp

@@ -13,41 +13,14 @@
 namespace duckdb {
 
 struct CreateSchemaInfo : public CreateInfo {
-	CreateSchemaInfo() : CreateInfo(CatalogType::SCHEMA_ENTRY) {
-	}
+	CreateSchemaInfo();
 
 public:
-	unique_ptr<CreateInfo> Copy() const override {
-		auto result = make_uniq<CreateSchemaInfo>();
-		CopyProperties(*result);
-		return std::move(result);
-	}
-
 	DUCKDB_API void Serialize(Serializer &serializer) const override;
 	DUCKDB_API static unique_ptr<CreateInfo> Deserialize(Deserializer &deserializer);
 
-	string ToString() const override {
-		string ret = "";
-		switch (on_conflict) {
-		case OnCreateConflict::ALTER_ON_CONFLICT: {
-			ret += "CREATE SCHEMA " + schema + " ON CONFLICT INSERT OR REPLACE;";
-			break;
-		}
-		case OnCreateConflict::IGNORE_ON_CONFLICT: {
-			ret += "CREATE SCHEMA " + schema + " IF NOT EXISTS;";
-			break;
-		}
-		case OnCreateConflict::REPLACE_ON_CONFLICT: {
-			ret += "CREATE OR REPLACE SCHEMA " + schema + ";";
-			break;
-		}
-		case OnCreateConflict::ERROR_ON_CONFLICT: {
-			ret += "CREATE SCHEMA " + schema + ";";
-			break;
-		}
-		}
-		return ret;
-	}
+	unique_ptr<CreateInfo> Copy() const override;
+	string ToString() const override;
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/create_sequence_info.hpp

@@ -52,6 +52,8 @@ public:
 public:
 	DUCKDB_API void Serialize(Serializer &serializer) const override;
 	DUCKDB_API static unique_ptr<CreateInfo> Deserialize(Deserializer &deserializer);
+
+	string ToString() const override;
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/create_type_info.hpp

@@ -15,9 +15,18 @@
 
 namespace duckdb {
 
+struct BindTypeModifiersInput {
+	ClientContext &context;
+	const LogicalType &type;
+	const vector<Value> &modifiers;
+};
+
+//! The type to bind type modifiers to a type
+typedef LogicalType (*bind_type_modifiers_function_t)(BindTypeModifiersInput &input);
+
 struct CreateTypeInfo : public CreateInfo {
 	CreateTypeInfo();
-	CreateTypeInfo(string name_p, LogicalType type_p);
+	CreateTypeInfo(string name_p, LogicalType type_p, bind_type_modifiers_function_t bind_modifiers_p = nullptr);
 
 	//! Name of the Type
 	string name;
@@ -25,6 +34,8 @@ struct CreateTypeInfo : public CreateInfo {
 	LogicalType type;
 	//! Used by create enum from query
 	unique_ptr<SQLStatement> query;
+	//! Bind type modifiers to the type
+	bind_type_modifiers_function_t bind_modifiers;
 
 public:
 	unique_ptr<CreateInfo> Copy() const override;

package/src/duckdb/src/include/duckdb/parser/parsed_data/create_view_info.hpp

@@ -46,6 +46,7 @@ public:
 
 	DUCKDB_API void Serialize(Serializer &serializer) const override;
 	DUCKDB_API static unique_ptr<CreateInfo> Deserialize(Deserializer &deserializer);
+
 	string ToString() const override;
 };
 

package/src/duckdb/src/include/duckdb/parser/parsed_data/detach_info.hpp

@@ -27,6 +27,7 @@ public:
 
 public:
 	unique_ptr<DetachInfo> Copy() const;
+	string ToString() const;
 
 	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer);

package/src/duckdb/src/include/duckdb/parser/parsed_data/drop_info.hpp

@@ -44,6 +44,7 @@ public:
 
 public:
 	virtual unique_ptr<DropInfo> Copy() const;
+	string ToString() const;
 
 	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer);