duckdb 0.10.1-dev9.0 → 0.10.1

package/src/duckdb/src/parallel/pipeline.cpp

@@ -16,7 +16,7 @@
 namespace duckdb {
 
 PipelineTask::PipelineTask(Pipeline &pipeline_p, shared_ptr<Event> event_p)
-    : ExecutorTask(pipeline_p.executor), pipeline(pipeline_p), event(std::move(event_p)) {
+    : ExecutorTask(pipeline_p.executor, std::move(event_p)), pipeline(pipeline_p) {
 }
 
 bool PipelineTask::TaskBlockedOnResult() const {
@@ -111,6 +111,17 @@ bool Pipeline::ScheduleParallel(shared_ptr<Event> &event) {
 		}
 	}
 	idx_t max_threads = source_state->MaxThreads();
+	auto &scheduler = TaskScheduler::GetScheduler(executor.context);
+	idx_t active_threads = scheduler.NumberOfThreads();
+	if (max_threads > active_threads) {
+		max_threads = active_threads;
+	}
+	if (sink && sink->sink_state) {
+		max_threads = sink->sink_state->MaxThreads(max_threads);
+	}
+	if (max_threads > active_threads) {
+		max_threads = active_threads;
+	}
 	return LaunchScanTasks(event, max_threads);
 }
 
@@ -155,11 +166,6 @@ void Pipeline::Schedule(shared_ptr<Event> &event) {
 
 bool Pipeline::LaunchScanTasks(shared_ptr<Event> &event, idx_t max_threads) {
 	// split the scan up into parts and schedule the parts
-	auto &scheduler = TaskScheduler::GetScheduler(executor.context);
-	idx_t active_threads = scheduler.NumberOfThreads();
-	if (max_threads > active_threads) {
-		max_threads = active_threads;
-	}
 	if (max_threads <= 1) {
 		// too small to parallelize
 		return false;

package/src/duckdb/src/parallel/pipeline_executor.cpp

@@ -412,7 +412,7 @@ OperatorResultType PipelineExecutor::Execute(DataChunk &input, DataChunk &result
 				in_process_operators.push(current_idx);
 			} else if (result == OperatorResultType::FINISHED) {
 				D_ASSERT(current_chunk.size() == 0);
-				FinishProcessing(current_idx);
+				FinishProcessing(NumericCast<int32_t>(current_idx));
 				return OperatorResultType::FINISHED;
 			}
 			current_chunk.Verify();

package/src/duckdb/src/parallel/pipeline_finish_event.cpp

@@ -1,6 +1,7 @@
 #include "duckdb/parallel/pipeline_finish_event.hpp"
 #include "duckdb/execution/executor.hpp"
 #include "duckdb/parallel/interrupt.hpp"
+#include "duckdb/parallel/executor_task.hpp"
 
 namespace duckdb {
 
@@ -9,11 +10,10 @@ namespace duckdb {
 class PipelineFinishTask : public ExecutorTask {
 public:
 	explicit PipelineFinishTask(Pipeline &pipeline_p, shared_ptr<Event> event_p)
-	    : ExecutorTask(pipeline_p.executor), pipeline(pipeline_p), event(std::move(event_p)) {
+	    : ExecutorTask(pipeline_p.executor, std::move(event_p)), pipeline(pipeline_p) {
 	}
 
 	Pipeline &pipeline;
-	shared_ptr<Event> event;
 
 public:
 	TaskExecutionResult ExecuteTask(TaskExecutionMode mode) override {

package/src/duckdb/src/parallel/pipeline_initialize_event.cpp

@@ -11,11 +11,10 @@ PipelineInitializeEvent::PipelineInitializeEvent(shared_ptr<Pipeline> pipeline_p
 class PipelineInitializeTask : public ExecutorTask {
 public:
 	explicit PipelineInitializeTask(Pipeline &pipeline_p, shared_ptr<Event> event_p)
-	    : ExecutorTask(pipeline_p.executor), pipeline(pipeline_p), event(std::move(event_p)) {
+	    : ExecutorTask(pipeline_p.executor, std::move(event_p)), pipeline(pipeline_p) {
 	}
 
 	Pipeline &pipeline;
-	shared_ptr<Event> event;
 
 public:
 	TaskExecutionResult ExecuteTask(TaskExecutionMode mode) override {

package/src/duckdb/src/parallel/task_scheduler.cpp

@@ -9,6 +9,7 @@
 #include "concurrentqueue.h"
 #include "duckdb/common/thread.hpp"
 #include "lightweightsemaphore.h"
+
 #include <thread>
 #else
 #include <queue>
@@ -21,6 +22,10 @@ struct SchedulerThread {
 	explicit SchedulerThread(unique_ptr<thread> thread_p) : internal_thread(std::move(thread_p)) {
 	}
 
+	~SchedulerThread() {
+		Allocator::ThreadFlush(0);
+	}
+
 	unique_ptr<thread> internal_thread;
 #endif
 };
@@ -97,7 +102,8 @@ ProducerToken::~ProducerToken() {
 
 TaskScheduler::TaskScheduler(DatabaseInstance &db)
     : db(db), queue(make_uniq<ConcurrentQueue>()),
-      allocator_flush_threshold(db.config.options.allocator_flush_threshold), thread_count(0) {
+      allocator_flush_threshold(db.config.options.allocator_flush_threshold), requested_thread_count(0),
+      current_thread_count(1) {
 }
 
 TaskScheduler::~TaskScheduler() {
@@ -229,9 +235,7 @@ static void ThreadExecuteTasks(TaskScheduler *scheduler, atomic<bool> *marker) {
 #endif
 
 int32_t TaskScheduler::NumberOfThreads() {
-	lock_guard<mutex> t(thread_lock);
-	auto &config = DBConfig::GetConfig(db);
-	return threads.size() + config.options.external_threads;
+	return current_thread_count.load();
 }
 
 void TaskScheduler::SetThreads(idx_t total_threads, idx_t external_threads) {
@@ -242,13 +246,13 @@ void TaskScheduler::SetThreads(idx_t total_threads, idx_t external_threads) {
 	if (total_threads < external_threads) {
 		throw SyntaxException("Number of threads can't be smaller than number of external threads!");
 	}
-	thread_count = total_threads - external_threads;
 #else
-	if (threads.size() != external_threads) {
+	if (total_threads != external_threads) {
 		throw NotImplementedException(
-		    "DuckDB was compiled without threads! Setting threads != external_threads is not allowed.");
+		    "DuckDB was compiled without threads! Setting total_threads != external_threads is not allowed.");
 	}
 #endif
+	requested_thread_count = NumericCast<int32_t>(total_threads - external_threads);
 }
 
 void TaskScheduler::SetAllocatorFlushTreshold(idx_t threshold) {
@@ -268,14 +272,16 @@ void TaskScheduler::YieldThread() {
 
 void TaskScheduler::RelaunchThreads() {
 	lock_guard<mutex> t(thread_lock);
-	auto n = thread_count.load();
+	auto n = requested_thread_count.load();
 	RelaunchThreadsInternal(n);
 }
 
 void TaskScheduler::RelaunchThreadsInternal(int32_t n) {
 #ifndef DUCKDB_NO_THREADS
+	auto &config = DBConfig::GetConfig(db);
 	idx_t new_thread_count = n;
 	if (threads.size() == new_thread_count) {
+		current_thread_count = NumericCast<int32_t>(threads.size() + config.options.external_threads);
 		return;
 	}
 	if (threads.size() > new_thread_count) {
@@ -305,6 +311,7 @@ void TaskScheduler::RelaunchThreadsInternal(int32_t n) {
 			markers.push_back(std::move(marker));
 		}
 	}
+	current_thread_count = NumericCast<int32_t>(threads.size() + config.options.external_threads);
 #endif
 }
 

package/src/duckdb/src/parallel/ub_duckdb_parallel.cpp

@@ -0,0 +1,15 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/parallel/base_pipeline_event.cpp>
+#include </Users/carlo/duckdb/src/parallel/meta_pipeline.cpp>
+#include </Users/carlo/duckdb/src/parallel/executor_task.cpp>
+#include </Users/carlo/duckdb/src/parallel/executor.cpp>
+#include </Users/carlo/duckdb/src/parallel/event.cpp>
+#include </Users/carlo/duckdb/src/parallel/interrupt.cpp>
+#include </Users/carlo/duckdb/src/parallel/pipeline.cpp>
+#include </Users/carlo/duckdb/src/parallel/pipeline_complete_event.cpp>
+#include </Users/carlo/duckdb/src/parallel/pipeline_event.cpp>
+#include </Users/carlo/duckdb/src/parallel/pipeline_executor.cpp>
+#include </Users/carlo/duckdb/src/parallel/pipeline_finish_event.cpp>
+#include </Users/carlo/duckdb/src/parallel/pipeline_initialize_event.cpp>
+#include </Users/carlo/duckdb/src/parallel/task_scheduler.cpp>
+#include </Users/carlo/duckdb/src/parallel/thread_context.cpp>

package/src/duckdb/src/parser/constraints/ub_duckdb_constraints.cpp

@@ -0,0 +1,5 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/parser/constraints/check_constraint.cpp>
+#include </Users/carlo/duckdb/src/parser/constraints/not_null_constraint.cpp>
+#include </Users/carlo/duckdb/src/parser/constraints/unique_constraint.cpp>
+#include </Users/carlo/duckdb/src/parser/constraints/foreign_key_constraint.cpp>

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

@@ -0,0 +1,18 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/parser/expression/between_expression.cpp>
+#include </Users/carlo/duckdb/src/parser/expression/case_expression.cpp>
+#include </Users/carlo/duckdb/src/parser/expression/cast_expression.cpp>
+#include </Users/carlo/duckdb/src/parser/expression/collate_expression.cpp>
+#include </Users/carlo/duckdb/src/parser/expression/conjunction_expression.cpp>
+#include </Users/carlo/duckdb/src/parser/expression/columnref_expression.cpp>
+#include </Users/carlo/duckdb/src/parser/expression/comparison_expression.cpp>
+#include </Users/carlo/duckdb/src/parser/expression/constant_expression.cpp>
+#include </Users/carlo/duckdb/src/parser/expression/default_expression.cpp>
+#include </Users/carlo/duckdb/src/parser/expression/function_expression.cpp>
+#include </Users/carlo/duckdb/src/parser/expression/lambda_expression.cpp>
+#include </Users/carlo/duckdb/src/parser/expression/operator_expression.cpp>
+#include </Users/carlo/duckdb/src/parser/expression/parameter_expression.cpp>
+#include </Users/carlo/duckdb/src/parser/expression/positional_reference_expression.cpp>
+#include </Users/carlo/duckdb/src/parser/expression/star_expression.cpp>
+#include </Users/carlo/duckdb/src/parser/expression/subquery_expression.cpp>
+#include </Users/carlo/duckdb/src/parser/expression/window_expression.cpp>

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

@@ -154,24 +154,6 @@ unique_ptr<AlterInfo> ChangeColumnTypeInfo::Copy() const {
 	                                                       expression->Copy());
 }
 
-//===--------------------------------------------------------------------===//
-// SetColumnCommentInfo
-//===--------------------------------------------------------------------===//
-SetColumnCommentInfo::SetColumnCommentInfo() : AlterTableInfo(AlterTableType::SET_COLUMN_COMMENT) {
-}
-
-SetColumnCommentInfo::SetColumnCommentInfo(AlterEntryData data, string column_name, Value comment_value)
-    : AlterTableInfo(AlterTableType::SET_COLUMN_COMMENT, std::move(data)), column_name(std::move(column_name)),
-      comment(std::move(comment_value)) {
-}
-
-SetColumnCommentInfo::~SetColumnCommentInfo() {
-}
-
-unique_ptr<AlterInfo> SetColumnCommentInfo::Copy() const {
-	return make_uniq_base<AlterInfo, SetColumnCommentInfo>(GetAlterEntryData(), column_name, comment);
-}
-
 //===--------------------------------------------------------------------===//
 // SetDefaultInfo
 //===--------------------------------------------------------------------===//

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

@@ -0,0 +1,44 @@
+#include "duckdb/parser/parsed_data/comment_on_column_info.hpp"
+#include "duckdb/catalog/catalog.hpp"
+
+namespace duckdb {
+
+SetColumnCommentInfo::SetColumnCommentInfo()
+    : AlterInfo(AlterType::SET_COLUMN_COMMENT, INVALID_CATALOG, INVALID_SCHEMA, "", OnEntryNotFound::THROW_EXCEPTION),
+      catalog_entry_type(CatalogType::INVALID), column_name(""), comment_value(Value()) {
+}
+
+SetColumnCommentInfo::SetColumnCommentInfo(string catalog, string schema, string name, string column_name,
+                                           Value comment_value, OnEntryNotFound if_not_found)
+    : AlterInfo(AlterType::SET_COLUMN_COMMENT, std::move(catalog), std::move(schema), std::move(name), if_not_found),
+      catalog_entry_type(CatalogType::INVALID), column_name(std::move(column_name)),
+      comment_value(std::move(comment_value)) {
+}
+
+unique_ptr<AlterInfo> SetColumnCommentInfo::Copy() const {
+	auto result = make_uniq<SetColumnCommentInfo>(catalog, schema, name, column_name, comment_value, if_not_found);
+	result->type = type;
+	return std::move(result);
+}
+
+optional_ptr<CatalogEntry> SetColumnCommentInfo::TryResolveCatalogEntry(ClientContext &context) {
+	auto entry = Catalog::GetEntry(context, CatalogType::TABLE_ENTRY, catalog, schema, name, if_not_found);
+
+	if (entry) {
+		catalog_entry_type = entry->type;
+		return entry;
+	}
+
+	return nullptr;
+}
+
+// Note: this is a bit of a weird one: the exact type is not yet known: it can be either a view or a column this needs
+//       to be resolved at bind time. If type is invalid here, the CommentOnColumnInfo was not properly resolved first
+CatalogType SetColumnCommentInfo::GetCatalogType() const {
+	if (catalog_entry_type == CatalogType::INVALID) {
+		throw InternalException("Attempted to access unresolved ");
+	}
+	return catalog_entry_type;
+}
+
+} // namespace duckdb

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

@@ -51,6 +51,7 @@ unique_ptr<CreateInfo> CreateViewInfo::Copy() const {
 	CopyProperties(*result);
 	result->aliases = aliases;
 	result->types = types;
+	result->column_comments = column_comments;
 	result->query = unique_ptr_cast<SQLStatement, SelectStatement>(query->Copy());
 	return std::move(result);
 }

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

@@ -7,6 +7,8 @@ ExtraDropSecretInfo::ExtraDropSecretInfo() : ExtraDropInfo(ExtraDropInfoType::SE
 
 ExtraDropSecretInfo::ExtraDropSecretInfo(const ExtraDropSecretInfo &info)
     : ExtraDropInfo(ExtraDropInfoType::SECRET_INFO) {
+	persist_mode = info.persist_mode;
+	secret_storage = info.secret_storage;
 }
 
 unique_ptr<ExtraDropInfo> ExtraDropSecretInfo::Copy() const {

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

@@ -0,0 +1,24 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/parser/parsed_data/alter_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/alter_scalar_function_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/alter_table_function_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/alter_table_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/attach_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/create_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/create_index_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/create_aggregate_function_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/create_collation_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/create_copy_function_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/create_macro_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/create_pragma_function_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/create_sequence_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/create_scalar_function_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/create_table_function_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/create_table_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/create_type_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/create_view_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/detach_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/drop_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/sample_options.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/transaction_info.cpp>
+#include </Users/carlo/duckdb/src/parser/parsed_data/vacuum_info.cpp>

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

@@ -128,7 +128,7 @@ vector<string> SplitQueryStringIntoStatements(const string &query) {
 	// Break sql string down into sql statements using the tokenizer
 	vector<string> query_statements;
 	auto tokens = Parser::Tokenize(query);
-	auto next_statement_start = 0;
+	idx_t next_statement_start = 0;
 	for (idx_t i = 1; i < tokens.size(); ++i) {
 		auto &t_prev = tokens[i - 1];
 		auto &t = tokens[i];

package/src/duckdb/src/parser/query_error_context.cpp

@@ -23,7 +23,21 @@ string QueryErrorContext::Format(const string &query, const string &error_messag
 	idx_t start_pos = 0;
 	idx_t line_number = 1;
 	for (idx_t i = 0; i < error_location; i++) {
-		if (StringUtil::CharacterIsNewline(query[i])) {
+		bool is_newline = false;
+		switch (query[i]) {
+		case '\r':
+			if (i + 1 >= error_location || query[i + 1] != '\n') {
+				// not \r\n
+				is_newline = true;
+			}
+			break;
+		case '\n':
+			is_newline = true;
+			break;
+		default:
+			break;
+		}
+		if (is_newline) {
 			line_number++;
 			start_pos = i + 1;
 		}

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

@@ -0,0 +1,5 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/parser/query_node/recursive_cte_node.cpp>
+#include </Users/carlo/duckdb/src/parser/query_node/cte_node.cpp>
+#include </Users/carlo/duckdb/src/parser/query_node/select_node.cpp>
+#include </Users/carlo/duckdb/src/parser/query_node/set_operation_node.cpp>

package/src/duckdb/src/parser/statement/export_statement.cpp

@@ -6,7 +6,8 @@ ExportStatement::ExportStatement(unique_ptr<CopyInfo> info)
     : SQLStatement(StatementType::EXPORT_STATEMENT), info(std::move(info)) {
 }
 
-ExportStatement::ExportStatement(const ExportStatement &other) : SQLStatement(other), info(other.info->Copy()) {
+ExportStatement::ExportStatement(const ExportStatement &other)
+    : SQLStatement(other), info(other.info->Copy()), database(other.database) {
 }
 
 unique_ptr<SQLStatement> ExportStatement::Copy() const {

package/src/duckdb/src/parser/statement/relation_statement.cpp

@@ -2,8 +2,8 @@
 
 namespace duckdb {
 
-RelationStatement::RelationStatement(shared_ptr<Relation> relation)
-    : SQLStatement(StatementType::RELATION_STATEMENT), relation(std::move(relation)) {
+RelationStatement::RelationStatement(shared_ptr<Relation> relation_p)
+    : SQLStatement(StatementType::RELATION_STATEMENT), relation(std::move(relation_p)) {
 }
 
 unique_ptr<SQLStatement> RelationStatement::Copy() const {

package/src/duckdb/src/parser/statement/ub_duckdb_statement.cpp

@@ -0,0 +1,25 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/parser/statement/alter_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/attach_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/call_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/copy_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/create_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/detach_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/delete_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/drop_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/execute_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/explain_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/export_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/extension_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/insert_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/load_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/multi_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/pragma_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/prepare_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/relation_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/select_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/set_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/show_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/transaction_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/update_statement.cpp>
+#include </Users/carlo/duckdb/src/parser/statement/vacuum_statement.cpp>

package/src/duckdb/src/parser/tableref/pivotref.cpp

@@ -43,9 +43,9 @@ string PivotColumn::ToString() const {
 			if (e > 0) {
 				result += ", ";
 			}
-			if (entry.star_expr) {
+			if (entry.expr) {
 				D_ASSERT(entry.values.empty());
-				result += entry.star_expr->ToString();
+				result += entry.expr->ToString();
 			} else if (entry.values.size() == 1) {
 				result += entry.values[0].ToSQLString();
 			} else {
@@ -124,7 +124,7 @@ PivotColumn PivotColumn::Copy() const {
 PivotColumnEntry PivotColumnEntry::Copy() const {
 	PivotColumnEntry result;
 	result.values = values;
-	result.star_expr = star_expr ? star_expr->Copy() : nullptr;
+	result.expr = expr ? expr->Copy() : nullptr;
 	result.alias = alias;
 	return result;
 }

package/src/duckdb/src/parser/tableref/showref.cpp

@@ -13,7 +13,9 @@ string ShowRef::ToString() const {
 		result += "DESCRIBE ";
 	}
 	if (query) {
+		result += "(";
 		result += query->ToString();
+		result += ")";
 	} else if (table_name != "__show_tables_expanded") {
 		result += table_name;
 	}

package/src/duckdb/src/parser/tableref/ub_duckdb_parser_tableref.cpp

@@ -0,0 +1,8 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/parser/tableref/basetableref.cpp>
+#include </Users/carlo/duckdb/src/parser/tableref/emptytableref.cpp>
+#include </Users/carlo/duckdb/src/parser/tableref/expressionlistref.cpp>
+#include </Users/carlo/duckdb/src/parser/tableref/joinref.cpp>
+#include </Users/carlo/duckdb/src/parser/tableref/pivotref.cpp>
+#include </Users/carlo/duckdb/src/parser/tableref/subqueryref.cpp>
+#include </Users/carlo/duckdb/src/parser/tableref/table_function.cpp>

package/src/duckdb/src/parser/transform/constraint/ub_duckdb_transformer_constraint.cpp

@@ -0,0 +1,2 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/parser/transform/constraint/transform_constraint.cpp>

package/src/duckdb/src/parser/transform/expression/transform_boolean_test.cpp

@@ -22,7 +22,7 @@ static unique_ptr<ParsedExpression> TransformBooleanTestInternal(unique_ptr<Pars
 static unique_ptr<ParsedExpression> TransformBooleanTestIsNull(unique_ptr<ParsedExpression> argument,
                                                                ExpressionType operator_type, idx_t query_location) {
 	auto result = make_uniq<OperatorExpression>(operator_type, std::move(argument));
-	Transformer::SetQueryLocation(*result, query_location);
+	Transformer::SetQueryLocation(*result, UnsafeNumericCast<int32_t>(query_location));
 	return std::move(result);
 }
 

package/src/duckdb/src/parser/transform/expression/transform_cast.cpp

@@ -3,6 +3,7 @@
 #include "duckdb/parser/expression/constant_expression.hpp"
 #include "duckdb/parser/transformer.hpp"
 #include "duckdb/common/operator/cast_operators.hpp"
+#include "duckdb/common/types/blob.hpp"
 
 namespace duckdb {
 
@@ -15,7 +16,12 @@ unique_ptr<ParsedExpression> Transformer::TransformTypeCast(duckdb_libpgquery::P
 	if (!root.tryCast && target_type == LogicalType::BLOB && root.arg->type == duckdb_libpgquery::T_PGAConst) {
 		auto c = PGPointerCast<duckdb_libpgquery::PGAConst>(root.arg);
 		if (c->val.type == duckdb_libpgquery::T_PGString) {
-			return make_uniq<ConstantExpression>(Value::BLOB(string(c->val.val.str)));
+			CastParameters parameters;
+			if (root.location >= 0) {
+				parameters.query_location = root.location;
+			}
+			auto blob_data = Blob::ToBlob(string(c->val.val.str), parameters);
+			return make_uniq<ConstantExpression>(Value::BLOB_RAW(blob_data));
 		}
 	}
 	// transform the expression node
@@ -23,7 +29,9 @@ unique_ptr<ParsedExpression> Transformer::TransformTypeCast(duckdb_libpgquery::P
 	bool try_cast = root.tryCast;
 
 	// now create a cast operation
-	return make_uniq<CastExpression>(target_type, std::move(expression), try_cast);
+	auto result = make_uniq<CastExpression>(target_type, std::move(expression), try_cast);
+	SetQueryLocation(*result, root.location);
+	return std::move(result);
 }
 
 } // namespace duckdb

package/src/duckdb/src/parser/transform/expression/transform_constant.cpp

@@ -21,9 +21,9 @@ unique_ptr<ConstantExpression> Transformer::TransformValue(duckdb_libpgquery::PG
 		string_t str_val(val.val.str);
 		bool try_cast_as_integer = true;
 		bool try_cast_as_decimal = true;
-		int decimal_position = -1;
-		int num_underscores = 0;
-		int num_integer_underscores = 0;
+		optional_idx decimal_position = optional_idx::Invalid();
+		idx_t num_underscores = 0;
+		idx_t num_integer_underscores = 0;
 		for (idx_t i = 0; i < str_val.GetSize(); i++) {
 			if (val.val.str[i] == '.') {
 				// decimal point: cast as either decimal or double
@@ -37,7 +37,7 @@ unique_ptr<ConstantExpression> Transformer::TransformValue(duckdb_libpgquery::PG
 			}
 			if (val.val.str[i] == '_') {
 				num_underscores++;
-				if (decimal_position < 0) {
+				if (!decimal_position.IsValid()) {
 					num_integer_underscores++;
 				}
 			}
@@ -57,11 +57,11 @@ unique_ptr<ConstantExpression> Transformer::TransformValue(duckdb_libpgquery::PG
 			}
 		}
 		idx_t decimal_offset = val.val.str[0] == '-' ? 3 : 2;
-		if (try_cast_as_decimal && decimal_position >= 0 &&
+		if (try_cast_as_decimal && decimal_position.IsValid() &&
 		    str_val.GetSize() - num_underscores < Decimal::MAX_WIDTH_DECIMAL + decimal_offset) {
 			// figure out the width/scale based on the decimal position
-			auto width = uint8_t(str_val.GetSize() - 1 - num_underscores);
-			auto scale = uint8_t(width - decimal_position + num_integer_underscores);
+			auto width = NumericCast<uint8_t>(str_val.GetSize() - 1 - num_underscores);
+			auto scale = NumericCast<uint8_t>(width - decimal_position.GetIndex() + num_integer_underscores);
 			if (val.val.str[0] == '-') {
 				width--;
 			}

package/src/duckdb/src/parser/transform/expression/transform_interval.cpp

@@ -32,7 +32,8 @@ unique_ptr<ParsedExpression> Transformer::TransformInterval(duckdb_libpgquery::P
 		return make_uniq<CastExpression>(LogicalType::INTERVAL, std::move(expr));
 	}
 
-	int32_t mask = PGPointerCast<duckdb_libpgquery::PGAConst>(node.typmods->head->data.ptr_value)->val.val.ival;
+	int32_t mask = NumericCast<int32_t>(
+	    PGPointerCast<duckdb_libpgquery::PGAConst>(node.typmods->head->data.ptr_value)->val.val.ival);
 	// these seemingly random constants are from datetime.hpp
 	// they are copied here to avoid having to include this header
 	// the bitshift is from the function INTERVAL_MASK in the parser

package/src/duckdb/src/parser/transform/expression/ub_duckdb_transformer_expression.cpp

@@ -0,0 +1,20 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/parser/transform/expression/transform_array_access.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/expression/transform_bool_expr.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/expression/transform_boolean_test.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/expression/transform_case.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/expression/transform_cast.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/expression/transform_coalesce.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/expression/transform_columnref.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/expression/transform_constant.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/expression/transform_expression.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/expression/transform_function.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/expression/transform_grouping_function.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/expression/transform_lambda.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/expression/transform_interval.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/expression/transform_is_null.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/expression/transform_operator.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/expression/transform_param_ref.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/expression/transform_positional_reference.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/expression/transform_subquery.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/expression/transform_multi_assign_reference.cpp>

package/src/duckdb/src/parser/transform/helpers/transform_typename.cpp

@@ -132,7 +132,7 @@ LogicalType Transformer::TransformTypeName(duckdb_libpgquery::PGTypeName &type_n
 		D_ASSERT(!children.empty());
 		result_type = LogicalType::UNION(std::move(children));
 	} else {
-		int64_t width, scale;
+		idx_t width, scale;
 		if (base_type == LogicalTypeId::DECIMAL) {
 			// default decimal width/scale
 			width = 18;
@@ -186,7 +186,7 @@ LogicalType Transformer::TransformTypeName(duckdb_libpgquery::PGTypeName &type_n
 			if (scale > width) {
 				throw ParserException("Scale cannot be bigger than width");
 			}
-			result_type = LogicalType::DECIMAL(width, scale);
+			result_type = LogicalType::DECIMAL(NumericCast<uint8_t>(width), NumericCast<uint8_t>(scale));
 			break;
 		case LogicalTypeId::INTERVAL:
 			if (modifier_idx > 1) {

package/src/duckdb/src/parser/transform/helpers/ub_duckdb_transformer_helpers.cpp

@@ -0,0 +1,8 @@
+// Unity Build generated by CMake
+#include </Users/carlo/duckdb/src/parser/transform/helpers/transform_alias.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/helpers/transform_cte.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/helpers/transform_groupby.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/helpers/transform_orderby.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/helpers/transform_sample.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/helpers/transform_typename.cpp>
+#include </Users/carlo/duckdb/src/parser/transform/helpers/nodetype_to_string.cpp>

package/src/duckdb/src/parser/transform/statement/transform_comment_on.cpp

@@ -2,6 +2,7 @@
 #include "duckdb/parser/parsed_data/alter_info.hpp"
 #include "duckdb/parser/parsed_data/alter_table_info.hpp"
 #include "duckdb/parser/statement/alter_statement.hpp"
+#include "duckdb/parser/parsed_data/comment_on_column_info.hpp"
 #include "duckdb/parser/transformer.hpp"
 
 namespace duckdb {
@@ -83,14 +84,8 @@ unique_ptr<AlterStatement> Transformer::TransformCommentOn(duckdb_libpgquery::PG
 		info = make_uniq<SetCommentInfo>(type, qualified_name.catalog, qualified_name.schema, qualified_name.name,
 		                                 comment_value, OnEntryNotFound::THROW_EXCEPTION);
 	} else if (stmt.object_type == duckdb_libpgquery::PG_OBJECT_COLUMN) {
-		// Special case: Table Column
-		AlterEntryData alter_entry_data;
-		alter_entry_data.catalog = qualified_name.catalog;
-		alter_entry_data.schema = qualified_name.schema;
-		alter_entry_data.name = qualified_name.name;
-		alter_entry_data.if_not_found = OnEntryNotFound::THROW_EXCEPTION;
-
-		info = make_uniq<SetColumnCommentInfo>(alter_entry_data, column_name, comment_value);
+		info = make_uniq<SetColumnCommentInfo>(qualified_name.catalog, qualified_name.schema, qualified_name.name,
+		                                       column_name, comment_value, OnEntryNotFound::THROW_EXCEPTION);
 	} else if (stmt.object_type == duckdb_libpgquery::PG_OBJECT_DATABASE) {
 		throw NotImplementedException("Adding comments to databases is not implemented");
 	} else if (stmt.object_type == duckdb_libpgquery::PG_OBJECT_SCHEMA) {