duckdb 0.10.3-dev0.0 → 0.10.3-dev6.0

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

@@ -26,11 +26,14 @@ struct ExportedTableData {
 
 	//! Path to be exported
 	string file_path;
+	//! Not Null columns, if any
+	vector<string> not_null_columns;
 };
 
 struct ExportedTableInfo {
-	ExportedTableInfo(TableCatalogEntry &entry, ExportedTableData table_data)
-	    : entry(entry), table_data(std::move(table_data)) {
+	ExportedTableInfo(TableCatalogEntry &entry, ExportedTableData table_data_p, vector<string> &not_null_columns_p)
+	    : entry(entry), table_data(std::move(table_data_p)) {
+		table_data.not_null_columns = not_null_columns_p;
 	}
 
 	TableCatalogEntry &entry;

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

@@ -24,16 +24,13 @@ public:
 
 	string filename;
 	string repository;
+	bool repo_is_alias;
+	string version;
 	LoadType load_type;
 
 public:
-	unique_ptr<LoadInfo> Copy() const {
-		auto result = make_uniq<LoadInfo>();
-		result->filename = filename;
-		result->repository = repository;
-		result->load_type = load_type;
-		return result;
-	}
+	unique_ptr<LoadInfo> 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/parse_info.hpp

@@ -9,9 +9,12 @@
 #pragma once
 
 #include "duckdb/common/common.hpp"
+#include "duckdb/common/enums/catalog_type.hpp"
 
 namespace duckdb {
 
+enum class CatalogType : uint8_t;
+
 enum class ParseInfoType : uint8_t {
 	ALTER_INFO,
 	ATTACH_INFO,
@@ -28,7 +31,8 @@ enum class ParseInfoType : uint8_t {
 	VACUUM_INFO,
 	COMMENT_ON_INFO,
 	COMMENT_ON_COLUMN_INFO,
-	COPY_DATABASE_INFO
+	COPY_DATABASE_INFO,
+	UPDATE_EXTENSIONS_INFO
 };
 
 struct ParseInfo {
@@ -54,6 +58,8 @@ public:
 
 	virtual void Serialize(Serializer &serializer) const;
 	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer);
+	static string QualifierToString(const string &catalog, const string &schema, const string &name);
+	static string TypeToString(CatalogType type);
 };
 
 } // namespace duckdb

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

@@ -33,17 +33,8 @@ public:
 	case_insensitive_map_t<unique_ptr<ParsedExpression>> named_parameters;
 
 public:
-	unique_ptr<PragmaInfo> Copy() const {
-		auto result = make_uniq<PragmaInfo>();
-		result->name = name;
-		for (auto &param : parameters) {
-			result->parameters.push_back(param->Copy());
-		}
-		for (auto &entry : named_parameters) {
-			result->named_parameters.insert(make_pair(entry.first, entry.second->Copy()));
-		}
-		return result;
-	}
+	unique_ptr<PragmaInfo> 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/transaction_info.hpp

@@ -28,6 +28,8 @@ public:
 	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer);
 
+	string ToString() const;
+
 private:
 	TransactionInfo();
 };

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

@@ -0,0 +1,36 @@
+//===----------------------------------------------------------------------===//
+//                         DuckDB
+//
+// duckdb/parser/parsed_data/update_extensions_info.hpp
+//
+//
+//===----------------------------------------------------------------------===//
+
+#pragma once
+
+#include "duckdb/parser/parsed_data/parse_info.hpp"
+
+namespace duckdb {
+
+struct UpdateExtensionsInfo : public ParseInfo {
+public:
+	static constexpr const ParseInfoType TYPE = ParseInfoType::UPDATE_EXTENSIONS_INFO;
+
+public:
+	UpdateExtensionsInfo() : ParseInfo(TYPE) {
+	}
+
+	vector<string> extensions_to_update;
+
+public:
+	unique_ptr<UpdateExtensionsInfo> Copy() const {
+		auto result = make_uniq<UpdateExtensionsInfo>();
+		result->extensions_to_update = extensions_to_update;
+		return result;
+	}
+
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer);
+};
+
+} // namespace duckdb

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

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

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

@@ -33,6 +33,7 @@ struct ParserExtensionParseData {
 	}
 
 	virtual unique_ptr<ParserExtensionParseData> Copy() const = 0;
+	virtual string ToString() const = 0;
 };
 
 struct ParserExtensionParseResult {

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

@@ -12,7 +12,7 @@
 #include "duckdb/parser/parsed_expression.hpp"
 #include "duckdb/parser/result_modifier.hpp"
 #include "duckdb/parser/common_table_expression_info.hpp"
-#include "duckdb/common/case_insensitive_map.hpp"
+#include "duckdb/common/insertion_order_preserving_map.hpp"
 #include "duckdb/common/exception.hpp"
 
 namespace duckdb {
@@ -34,7 +34,7 @@ class CommonTableExpressionMap {
 public:
 	CommonTableExpressionMap();
 
-	case_insensitive_map_t<unique_ptr<CommonTableExpressionInfo>> map;
+	InsertionOrderPreservingMap<unique_ptr<CommonTableExpressionInfo>> map;
 
 public:
 	string ToString() const;

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

@@ -44,10 +44,7 @@ protected:
 	SQLStatement(const SQLStatement &other) = default;
 
 public:
-	virtual string ToString() const {
-		throw InternalException("ToString not supported for this type of SQLStatement: '%s'",
-		                        StatementTypeToString(type));
-	}
+	virtual string ToString() const = 0;
 	//! Create a copy of this SelectStatement
 	DUCKDB_API virtual unique_ptr<SQLStatement> Copy() const = 0;
 

package/src/duckdb/src/include/duckdb/parser/statement/alter_statement.hpp

@@ -28,6 +28,7 @@ protected:
 
 public:
 	unique_ptr<SQLStatement> Copy() const override;
+	string ToString() const override;
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/statement/attach_statement.hpp

@@ -27,6 +27,7 @@ protected:
 
 public:
 	unique_ptr<SQLStatement> Copy() const override;
+	string ToString() const override;
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/statement/call_statement.hpp

@@ -28,5 +28,6 @@ protected:
 
 public:
 	unique_ptr<SQLStatement> Copy() const override;
+	string ToString() const override;
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/statement/copy_database_statement.hpp

@@ -27,13 +27,12 @@ public:
 	string to_database;
 	CopyDatabaseType copy_type;
 
-	string ToString() const override;
-
 protected:
 	CopyDatabaseStatement(const CopyDatabaseStatement &other);
 
 public:
 	DUCKDB_API unique_ptr<SQLStatement> Copy() const override;
+	string ToString() const override;
 
 private:
 };

package/src/duckdb/src/include/duckdb/parser/statement/copy_statement.hpp

@@ -22,10 +22,8 @@ public:
 	CopyStatement();
 
 	unique_ptr<CopyInfo> info;
-	// The SQL statement used instead of a table when copying data out to a file
-	unique_ptr<QueryNode> select_statement;
+
 	string ToString() const override;
-	string CopyOptionsToString(const string &format, const case_insensitive_map_t<vector<Value>> &options) const;
 
 protected:
 	CopyStatement(const CopyStatement &other);

package/src/duckdb/src/include/duckdb/parser/statement/detach_statement.hpp

@@ -27,6 +27,7 @@ protected:
 
 public:
 	unique_ptr<SQLStatement> Copy() const override;
+	string ToString() const override;
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/statement/drop_statement.hpp

@@ -27,6 +27,7 @@ protected:
 
 public:
 	unique_ptr<SQLStatement> Copy() const override;
+	string ToString() const override;
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/statement/execute_statement.hpp

@@ -29,5 +29,6 @@ protected:
 
 public:
 	unique_ptr<SQLStatement> Copy() const override;
+	string ToString() const override;
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/statement/explain_statement.hpp

@@ -30,6 +30,7 @@ protected:
 
 public:
 	unique_ptr<SQLStatement> Copy() const override;
+	string ToString() const override;
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/statement/export_statement.hpp

@@ -29,6 +29,7 @@ protected:
 
 public:
 	unique_ptr<SQLStatement> Copy() const override;
+	string ToString() const override;
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/statement/extension_statement.hpp

@@ -27,6 +27,7 @@ public:
 
 public:
 	unique_ptr<SQLStatement> Copy() const override;
+	string ToString() const override;
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/statement/insert_statement.hpp

@@ -85,6 +85,7 @@ protected:
 
 public:
 	static string OnConflictActionToString(OnConflictAction action);
+
 	string ToString() const override;
 	unique_ptr<SQLStatement> Copy() const override;
 

package/src/duckdb/src/include/duckdb/parser/statement/list.hpp

@@ -21,4 +21,5 @@
 #include "duckdb/parser/statement/set_statement.hpp"
 #include "duckdb/parser/statement/transaction_statement.hpp"
 #include "duckdb/parser/statement/update_statement.hpp"
+#include "duckdb/parser/statement/update_extensions_statement.hpp"
 #include "duckdb/parser/statement/vacuum_statement.hpp"

package/src/duckdb/src/include/duckdb/parser/statement/load_statement.hpp

@@ -25,6 +25,7 @@ protected:
 
 public:
 	unique_ptr<SQLStatement> Copy() const override;
+	string ToString() const override;
 
 	unique_ptr<LoadInfo> info;
 };

package/src/duckdb/src/include/duckdb/parser/statement/logical_plan_statement.hpp

@@ -27,6 +27,9 @@ public:
 	unique_ptr<SQLStatement> Copy() const override {
 		throw NotImplementedException("PLAN_STATEMENT");
 	}
+	string ToString() const override {
+		throw NotImplementedException("PLAN STATEMENT");
+	}
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/statement/multi_statement.hpp

@@ -26,6 +26,7 @@ protected:
 
 public:
 	unique_ptr<SQLStatement> Copy() const override;
+	string ToString() const override;
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/statement/pragma_statement.hpp

@@ -28,6 +28,7 @@ protected:
 
 public:
 	unique_ptr<SQLStatement> Copy() const override;
+	string ToString() const override;
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/statement/prepare_statement.hpp

@@ -28,5 +28,6 @@ protected:
 
 public:
 	unique_ptr<SQLStatement> Copy() const override;
+	string ToString() const override;
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/statement/relation_statement.hpp

@@ -27,6 +27,7 @@ protected:
 
 public:
 	unique_ptr<SQLStatement> Copy() const override;
+	string ToString() const override;
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/statement/select_statement.hpp

@@ -37,6 +37,7 @@ protected:
 
 public:
 	//! Convert the SELECT statement to a string
+
 	DUCKDB_API string ToString() const override;
 	//! Create a copy of this SelectStatement
 	DUCKDB_API unique_ptr<SQLStatement> Copy() const override;

package/src/duckdb/src/include/duckdb/parser/statement/set_statement.hpp

@@ -25,10 +25,7 @@ protected:
 	SetStatement(const SetStatement &other) = default;
 
 public:
-	unique_ptr<SQLStatement> Copy() const override;
-
-public:
-	std::string name;
+	string name;
 	SetScope scope;
 	SetType set_type;
 };
@@ -42,6 +39,7 @@ protected:
 
 public:
 	unique_ptr<SQLStatement> Copy() const override;
+	string ToString() const override;
 
 public:
 	unique_ptr<ParsedExpression> value;
@@ -53,6 +51,10 @@ public:
 
 protected:
 	ResetVariableStatement(const ResetVariableStatement &other) = default;
+
+public:
+	unique_ptr<SQLStatement> Copy() const override;
+	string ToString() const override;
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/statement/transaction_statement.hpp

@@ -27,5 +27,6 @@ protected:
 
 public:
 	unique_ptr<SQLStatement> Copy() const override;
+	string ToString() const override;
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/statement/update_extensions_statement.hpp

@@ -0,0 +1,36 @@
+//===----------------------------------------------------------------------===//
+//                         DuckDB
+//
+// duckdb/parser/statement/update_extensions_statement.hpp
+//
+//
+//===----------------------------------------------------------------------===//
+
+#pragma once
+
+#include "duckdb/parser/parsed_expression.hpp"
+#include "duckdb/parser/sql_statement.hpp"
+#include "duckdb/parser/tableref.hpp"
+#include "duckdb/common/vector.hpp"
+#include "duckdb/parser/query_node.hpp"
+#include "duckdb/parser/parsed_data/update_extensions_info.hpp"
+
+namespace duckdb {
+
+class UpdateExtensionsStatement : public SQLStatement {
+public:
+	static constexpr const StatementType TYPE = StatementType::UPDATE_EXTENSIONS_STATEMENT;
+
+public:
+	UpdateExtensionsStatement();
+	unique_ptr<UpdateExtensionsInfo> info;
+
+protected:
+	UpdateExtensionsStatement(const UpdateExtensionsStatement &other);
+
+public:
+	string ToString() const override;
+	unique_ptr<SQLStatement> Copy() const override;
+};
+
+} // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/statement/vacuum_statement.hpp

@@ -28,6 +28,7 @@ protected:
 
 public:
 	unique_ptr<SQLStatement> Copy() const override;
+	string ToString() const override;
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/tableref/column_data_ref.hpp

@@ -0,0 +1,46 @@
+//===----------------------------------------------------------------------===//
+//                         DuckDB
+//
+// duckdb/parser/tableref/column_data_ref.hpp
+//
+//
+//===----------------------------------------------------------------------===//
+
+#pragma once
+
+#include "duckdb/parser/tableref.hpp"
+#include "duckdb/common/optionally_owned_ptr.hpp"
+#include "duckdb/common/types/column/column_data_collection.hpp"
+
+namespace duckdb {
+//! Represents a TableReference to a materialized result
+class ColumnDataRef : public TableRef {
+public:
+	static constexpr const TableReferenceType TYPE = TableReferenceType::COLUMN_DATA;
+
+public:
+	explicit ColumnDataRef(ColumnDataCollection &collection)
+	    : TableRef(TableReferenceType::COLUMN_DATA), collection(collection) {
+	}
+	ColumnDataRef(vector<string> expected_names, optionally_owned_ptr<ColumnDataCollection> collection_p)
+	    : TableRef(TableReferenceType::COLUMN_DATA), collection(std::move(collection_p)),
+	      expected_names(std::move(expected_names)) {
+	}
+
+public:
+	//! (optionally owned) materialized column data
+	optionally_owned_ptr<ColumnDataCollection> collection;
+	//! The set of expected names
+	vector<string> expected_names;
+
+public:
+	string ToString() const override;
+	bool Equals(const TableRef &other_p) const override;
+
+	unique_ptr<TableRef> Copy() override;
+
+	//! Deserializes a blob back into a ColumnDataRef
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<TableRef> Deserialize(Deserializer &source);
+};
+} // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/tableref/list.hpp

@@ -1,6 +1,7 @@
 #include "duckdb/parser/tableref/basetableref.hpp"
 #include "duckdb/parser/tableref/emptytableref.hpp"
 #include "duckdb/parser/tableref/expressionlistref.hpp"
+#include "duckdb/parser/tableref/column_data_ref.hpp"
 #include "duckdb/parser/tableref/joinref.hpp"
 #include "duckdb/parser/tableref/pivotref.hpp"
 #include "duckdb/parser/tableref/showref.hpp"

package/src/duckdb/src/include/duckdb/parser/tableref/table_function_ref.hpp

@@ -12,7 +12,6 @@
 #include "duckdb/parser/tableref.hpp"
 #include "duckdb/common/vector.hpp"
 #include "duckdb/parser/statement/select_statement.hpp"
-#include "duckdb/main/external_dependencies.hpp"
 
 namespace duckdb {
 //! Represents a Table producing function
@@ -29,9 +28,6 @@ public:
 	// if the function takes a subquery as argument its in here
 	unique_ptr<SelectStatement> subquery;
 
-	// External dependencies of this table function
-	unique_ptr<ExternalDependency> external_dependency;
-
 public:
 	string ToString() const override;
 

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

@@ -12,6 +12,7 @@
 #include "duckdb/common/optional_idx.hpp"
 #include "duckdb/common/enums/tableref_type.hpp"
 #include "duckdb/parser/parsed_data/sample_options.hpp"
+#include "duckdb/main/external_dependencies.hpp"
 
 namespace duckdb {
 
@@ -32,6 +33,8 @@ public:
 	unique_ptr<SampleOptions> sample;
 	//! The location in the query (if any)
 	optional_idx query_location;
+	// External dependencies of this table function
+	shared_ptr<ExternalDependency> external_dependency;
 
 public:
 	//! Convert the object to a string

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

@@ -28,6 +28,7 @@ class InsertStatement;
 class SelectStatement;
 class TransactionStatement;
 class UpdateStatement;
+class UpdateExtensionsStatement;
 class PrepareStatement;
 class ExecuteStatement;
 class PragmaStatement;
@@ -96,6 +97,7 @@ class SubqueryRef;
 class TableFunctionRef;
 class EmptyTableRef;
 class ExpressionListRef;
+class ColumnDataRef;
 class PivotRef;
 class ShowRef;
 

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

@@ -158,6 +158,8 @@ private:
 	unique_ptr<DeleteStatement> TransformDelete(duckdb_libpgquery::PGDeleteStmt &stmt);
 	//! Transform a Postgres duckdb_libpgquery::T_PGUpdateStmt node into a UpdateStatement
 	unique_ptr<UpdateStatement> TransformUpdate(duckdb_libpgquery::PGUpdateStmt &stmt);
+	//! Transform a Postgres duckdb_libpgquery::T_PGUpdateExtensionsStmt node into a UpdateExtensionsStatement
+	unique_ptr<UpdateExtensionsStatement> TransformUpdateExtensions(duckdb_libpgquery::PGUpdateExtensionsStmt &stmt);
 	//! Transform a Postgres duckdb_libpgquery::T_PGPragmaStmt node into a PragmaStatement
 	unique_ptr<SQLStatement> TransformPragma(duckdb_libpgquery::PGPragmaStmt &stmt);
 	//! Transform a Postgres duckdb_libpgquery::T_PGExportStmt node into a ExportStatement
@@ -321,6 +323,9 @@ private:
 	//! Transform a Postgres TypeName string into a LogicalType
 	LogicalType TransformTypeName(duckdb_libpgquery::PGTypeName &name);
 
+	//! Transform a list of type modifiers into a list of values
+	vector<Value> TransformTypeModifiers(duckdb_libpgquery::PGTypeName &name);
+
 	//! Transform a Postgres GROUP BY expression into a list of Expression
 	bool TransformGroupBy(optional_ptr<duckdb_libpgquery::PGList> group, SelectNode &result);
 	void TransformGroupByNode(duckdb_libpgquery::PGNode &n, GroupingExpressionMap &map, SelectNode &result,

package/src/duckdb/src/include/duckdb/planner/bind_context.hpp

@@ -41,7 +41,7 @@ public:
 	explicit BindContext(Binder &binder);
 
 	//! Keep track of recursive CTE references
-	case_insensitive_map_t<std::shared_ptr<idx_t>> cte_references;
+	case_insensitive_map_t<shared_ptr<idx_t>> cte_references;
 
 public:
 	//! Given a column name, find the matching table it belongs to. Throws an
@@ -129,10 +129,10 @@ public:
 	//! (e.g. "column_name" might return "COLUMN_NAME")
 	string GetActualColumnName(const string &binding, const string &column_name);
 
-	case_insensitive_map_t<std::shared_ptr<Binding>> GetCTEBindings() {
+	case_insensitive_map_t<shared_ptr<Binding>> GetCTEBindings() {
 		return cte_bindings;
 	}
-	void SetCTEBindings(case_insensitive_map_t<std::shared_ptr<Binding>> bindings) {
+	void SetCTEBindings(case_insensitive_map_t<shared_ptr<Binding>> bindings) {
 		cte_bindings = std::move(bindings);
 	}
 
@@ -165,6 +165,6 @@ private:
 	vector<unique_ptr<UsingColumnSet>> using_column_sets;
 
 	//! The set of CTE bindings
-	case_insensitive_map_t<std::shared_ptr<Binding>> cte_bindings;
+	case_insensitive_map_t<shared_ptr<Binding>> cte_bindings;
 };
 } // namespace duckdb