duckdb 0.7.2-dev2430.0 → 0.7.2-dev2552.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "duckdb",
   "main": "./lib/duckdb.js",
   "types": "./lib/duckdb.d.ts",
-  "version": "0.7.2-dev2430.0",
+  "version": "0.7.2-dev2552.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/connection.cpp

@@ -332,7 +332,7 @@ struct UnregisterUdfTask : public Task {
 		info.type = duckdb::CatalogType::SCALAR_FUNCTION_ENTRY;
 		info.name = name;
 		info.allow_drop_internal = true;
-		catalog.DropEntry(context, &info);
+		catalog.DropEntry(context, info);
 		con.Commit();
 	}
 	std::string name;

package/src/duckdb/extension/icu/icu-dateadd.cpp

@@ -247,7 +247,7 @@ struct ICUDateAdd : public ICUDateFunc {
 
 		CreateScalarFunctionInfo func_info(set);
 		auto &catalog = Catalog::GetSystemCatalog(context);
-		catalog.AddFunction(context, &func_info);
+		catalog.AddFunction(context, func_info);
 	}
 
 	template <typename TA, typename OP>
@@ -272,7 +272,7 @@ struct ICUDateAdd : public ICUDateFunc {
 
 		CreateScalarFunctionInfo func_info(set);
 		auto &catalog = Catalog::GetSystemCatalog(context);
-		catalog.AddFunction(context, &func_info);
+		catalog.AddFunction(context, func_info);
 	}
 
 	static void AddDateAgeFunctions(const string &name, ClientContext &context) {
@@ -284,7 +284,7 @@ struct ICUDateAdd : public ICUDateFunc {
 
 		CreateScalarFunctionInfo func_info(set);
 		auto &catalog = Catalog::GetSystemCatalog(context);
-		catalog.AddFunction(context, &func_info);
+		catalog.AddFunction(context, func_info);
 	}
 };
 

package/src/duckdb/extension/icu/icu-datepart.cpp

@@ -436,7 +436,7 @@ struct ICUDatePart : public ICUDateFunc {
 		ScalarFunctionSet set(name);
 		set.AddFunction(GetUnaryPartCodeFunction<timestamp_t, int64_t>(LogicalType::TIMESTAMP_TZ));
 		CreateScalarFunctionInfo func_info(set);
-		catalog.AddFunction(context, &func_info);
+		catalog.AddFunction(context, func_info);
 	}
 
 	template <typename INPUT_TYPE, typename RESULT_TYPE>
@@ -461,7 +461,7 @@ struct ICUDatePart : public ICUDateFunc {
 		set.AddFunction(GetBinaryPartCodeFunction<timestamp_t, int64_t>(LogicalType::TIMESTAMP_TZ));
 		set.AddFunction(GetStructFunction<timestamp_t>(LogicalType::TIMESTAMP_TZ));
 		CreateScalarFunctionInfo func_info(set);
-		catalog.AddFunction(context, &func_info);
+		catalog.AddFunction(context, func_info);
 	}
 
 	static duckdb::unique_ptr<FunctionData> BindLastDate(ClientContext &context, ScalarFunction &bound_function,
@@ -480,7 +480,7 @@ struct ICUDatePart : public ICUDateFunc {
 		ScalarFunctionSet set(name);
 		set.AddFunction(GetLastDayFunction<timestamp_t>(LogicalType::TIMESTAMP_TZ));
 		CreateScalarFunctionInfo func_info(set);
-		catalog.AddFunction(context, &func_info);
+		catalog.AddFunction(context, func_info);
 	}
 };
 

package/src/duckdb/extension/icu/icu-datesub.cpp

@@ -144,7 +144,7 @@ struct ICUCalendarSub : public ICUDateFunc {
 
 		CreateScalarFunctionInfo func_info(set);
 		auto &catalog = Catalog::GetSystemCatalog(context);
-		catalog.AddFunction(context, &func_info);
+		catalog.AddFunction(context, func_info);
 	}
 };
 
@@ -271,7 +271,7 @@ struct ICUCalendarDiff : public ICUDateFunc {
 
 		CreateScalarFunctionInfo func_info(set);
 		auto &catalog = Catalog::GetSystemCatalog(context);
-		catalog.AddFunction(context, &func_info);
+		catalog.AddFunction(context, func_info);
 	}
 };
 

package/src/duckdb/extension/icu/icu-datetrunc.cpp

@@ -146,7 +146,7 @@ struct ICUDateTrunc : public ICUDateFunc {
 
 		CreateScalarFunctionInfo func_info(set);
 		auto &catalog = Catalog::GetSystemCatalog(context);
-		catalog.AddFunction(context, &func_info);
+		catalog.AddFunction(context, func_info);
 	}
 };
 

package/src/duckdb/extension/icu/icu-extension.cpp

@@ -247,13 +247,13 @@ void ICUExtension::Load(DuckDB &db) {
 
 		CreateCollationInfo info(collation, GetICUFunction(collation), false, true);
 		info.on_conflict = OnCreateConflict::IGNORE_ON_CONFLICT;
-		catalog.CreateCollation(*con.context, &info);
+		catalog.CreateCollation(*con.context, info);
 	}
 	ScalarFunction sort_key("icu_sort_key", {LogicalType::VARCHAR, LogicalType::VARCHAR}, LogicalType::VARCHAR,
 	                        ICUCollateFunction, ICUSortKeyBind);
 
 	CreateScalarFunctionInfo sort_key_info(std::move(sort_key));
-	catalog.CreateFunction(*con.context, &sort_key_info);
+	catalog.CreateFunction(*con.context, sort_key_info);
 
 	// Time Zones
 	auto &config = DBConfig::GetConfig(*db.instance);
@@ -283,7 +283,7 @@ void ICUExtension::Load(DuckDB &db) {
 
 	TableFunction cal_names("icu_calendar_names", {}, ICUCalendarFunction, ICUCalendarBind, ICUCalendarInit);
 	CreateTableFunctionInfo cal_names_info(std::move(cal_names));
-	catalog.CreateTableFunction(*con.context, &cal_names_info);
+	catalog.CreateTableFunction(*con.context, cal_names_info);
 
 	con.Commit();
 }

package/src/duckdb/extension/icu/icu-list-range.cpp

@@ -188,7 +188,7 @@ struct ICUListRange : public ICUDateFunc {
 		                                 LogicalType::LIST(LogicalType::TIMESTAMP_TZ), ICUListRangeFunction<false>,
 		                                 Bind));
 		CreateScalarFunctionInfo range_func_info(range);
-		catalog.AddFunction(context, &range_func_info);
+		catalog.AddFunction(context, range_func_info);
 
 		// generate_series: similar to range, but inclusive instead of exclusive bounds on the RHS
 		ScalarFunctionSet generate_series("generate_series");
@@ -196,7 +196,7 @@ struct ICUListRange : public ICUDateFunc {
 		    ScalarFunction({LogicalType::TIMESTAMP_TZ, LogicalType::TIMESTAMP_TZ, LogicalType::INTERVAL},
 		                   LogicalType::LIST(LogicalType::TIMESTAMP_TZ), ICUListRangeFunction<true>, Bind));
 		CreateScalarFunctionInfo generate_series_func_info(generate_series);
-		catalog.AddFunction(context, &generate_series_func_info);
+		catalog.AddFunction(context, generate_series_func_info);
 	}
 };
 

package/src/duckdb/extension/icu/icu-makedate.cpp

@@ -140,7 +140,7 @@ struct ICUMakeTimestampTZFunc : public ICUDateFunc {
 
 		CreateScalarFunctionInfo func_info(set);
 		auto &catalog = Catalog::GetSystemCatalog(context);
-		catalog.AddFunction(context, &func_info);
+		catalog.AddFunction(context, func_info);
 	}
 };
 

package/src/duckdb/extension/icu/icu-strptime.cpp

@@ -222,9 +222,9 @@ struct ICUStrptime : public ICUDateFunc {
 	static void TailPatch(const string &name, ClientContext &context, const vector<LogicalType> &types) {
 		// Find the old function
 		auto &catalog = Catalog::GetSystemCatalog(context);
-		auto entry = catalog.GetEntry(context, CatalogType::SCALAR_FUNCTION_ENTRY, DEFAULT_SCHEMA, name);
-		D_ASSERT(entry && entry->type == CatalogType::SCALAR_FUNCTION_ENTRY);
-		auto &func = entry->Cast<ScalarFunctionCatalogEntry>();
+		auto &entry = catalog.GetEntry(context, CatalogType::SCALAR_FUNCTION_ENTRY, DEFAULT_SCHEMA, name);
+		D_ASSERT(entry.type == CatalogType::SCALAR_FUNCTION_ENTRY);
+		auto &func = entry.Cast<ScalarFunctionCatalogEntry>();
 		string error;
 
 		FunctionBinder function_binder(context);
@@ -417,7 +417,7 @@ struct ICUStrftime : public ICUDateFunc {
 
 		CreateScalarFunctionInfo func_info(set);
 		auto &catalog = Catalog::GetSystemCatalog(context);
-		catalog.AddFunction(context, &func_info);
+		catalog.AddFunction(context, func_info);
 	}
 
 	static string_t CastOperation(icu::Calendar *calendar, timestamp_t input, Vector &result) {

package/src/duckdb/extension/icu/icu-table-range.cpp

@@ -175,7 +175,7 @@ struct ICUTableRange {
 		range.AddFunction(TableFunction({LogicalType::TIMESTAMP_TZ, LogicalType::TIMESTAMP_TZ, LogicalType::INTERVAL},
 		                                ICUTableRangeFunction, Bind<false>, Init));
 		CreateTableFunctionInfo range_func_info(range);
-		catalog.AddFunction(context, &range_func_info);
+		catalog.AddFunction(context, range_func_info);
 
 		// generate_series: similar to range, but inclusive instead of exclusive bounds on the RHS
 		TableFunctionSet generate_series("generate_series");
@@ -183,7 +183,7 @@ struct ICUTableRange {
 		    TableFunction({LogicalType::TIMESTAMP_TZ, LogicalType::TIMESTAMP_TZ, LogicalType::INTERVAL},
 		                  ICUTableRangeFunction, Bind<true>, Init));
 		CreateTableFunctionInfo generate_series_func_info(generate_series);
-		catalog.AddFunction(context, &generate_series_func_info);
+		catalog.AddFunction(context, generate_series_func_info);
 	}
 };
 

package/src/duckdb/extension/icu/icu-timebucket.cpp

@@ -626,7 +626,7 @@ struct ICUTimeBucket : public ICUDateFunc {
 
 		CreateScalarFunctionInfo func_info(set);
 		auto &catalog = Catalog::GetSystemCatalog(context);
-		catalog.AddFunction(context, &func_info);
+		catalog.AddFunction(context, func_info);
 	}
 };
 

package/src/duckdb/extension/icu/icu-timezone.cpp

@@ -268,7 +268,7 @@ struct ICULocalTimestampFunc : public ICUDateFunc {
 
 		CreateScalarFunctionInfo func_info(set);
 		auto &catalog = Catalog::GetSystemCatalog(context);
-		catalog.AddFunction(context, &func_info);
+		catalog.AddFunction(context, func_info);
 	}
 };
 
@@ -288,7 +288,7 @@ struct ICULocalTimeFunc : public ICUDateFunc {
 
 		CreateScalarFunctionInfo func_info(set);
 		auto &catalog = Catalog::GetSystemCatalog(context);
-		catalog.AddFunction(context, &func_info);
+		catalog.AddFunction(context, func_info);
 	}
 };
 
@@ -335,7 +335,7 @@ struct ICUTimeZoneFunc : public ICUDateFunc {
 
 		CreateScalarFunctionInfo func_info(set);
 		auto &catalog = Catalog::GetSystemCatalog(context);
-		catalog.AddFunction(context, &func_info);
+		catalog.AddFunction(context, func_info);
 	}
 };
 
@@ -348,7 +348,7 @@ void RegisterICUTimeZoneFunctions(ClientContext &context) {
 	auto &catalog = Catalog::GetSystemCatalog(context);
 	TableFunction tz_names("pg_timezone_names", {}, ICUTimeZoneFunction, ICUTimeZoneBind, ICUTimeZoneInit);
 	CreateTableFunctionInfo tz_names_info(std::move(tz_names));
-	catalog.CreateTableFunction(context, &tz_names_info);
+	catalog.CreateTableFunction(context, tz_names_info);
 
 	//	Scalar functions
 	ICUTimeZoneFunc::AddFunction("timezone", context);

package/src/duckdb/extension/json/json-extension.cpp

@@ -33,24 +33,24 @@ void JSONExtension::Load(DuckDB &db) {
 	CreateTypeInfo type_info(JSONCommon::JSON_TYPE_NAME, json_type);
 	type_info.temporary = true;
 	type_info.internal = true;
-	catalog.CreateType(context, &type_info);
+	catalog.CreateType(context, type_info);
 
 	// JSON casts
 	JSONFunctions::RegisterCastFunctions(DBConfig::GetConfig(context).GetCastFunctions());
 
 	// JSON scalar functions
 	for (auto &fun : JSONFunctions::GetScalarFunctions()) {
-		catalog.CreateFunction(context, &fun);
+		catalog.CreateFunction(context, fun);
 	}
 
 	// JSON table functions
 	for (auto &fun : JSONFunctions::GetTableFunctions()) {
-		catalog.CreateTableFunction(context, &fun);
+		catalog.CreateTableFunction(context, fun);
 	}
 
 	// JSON pragma functions
 	for (auto &fun : JSONFunctions::GetPragmaFunctions()) {
-		catalog.CreatePragmaFunction(context, &fun);
+		catalog.CreatePragmaFunction(context, fun);
 	}
 
 	// JSON replacement scan
@@ -59,12 +59,12 @@ void JSONExtension::Load(DuckDB &db) {
 
 	// JSON copy function
 	auto copy_fun = JSONFunctions::GetJSONCopyFunction();
-	catalog.CreateCopyFunction(context, &copy_fun);
+	catalog.CreateCopyFunction(context, copy_fun);
 
 	// JSON macro's
 	for (idx_t index = 0; json_macros[index].name != nullptr; index++) {
 		auto info = DefaultFunctionGenerator::CreateInternalMacroInfo(json_macros[index]);
-		catalog.CreateFunction(context, info.get());
+		catalog.CreateFunction(context, *info);
 	}
 
 	con.Commit();

package/src/duckdb/extension/parquet/parquet-extension.cpp

@@ -372,11 +372,11 @@ public:
 		}
 
 		result->column_ids = input.column_ids;
-		result->filters = input.filters;
+		result->filters = input.filters.get();
 		result->row_group_index = 0;
 		result->file_index = 0;
 		result->batch_index = 0;
-		result->max_threads = ParquetScanMaxThreads(context, input.bind_data);
+		result->max_threads = ParquetScanMaxThreads(context, input.bind_data.get());
 		if (input.CanRemoveFilterColumns()) {
 			result->projection_ids = input.projection_ids;
 			const auto table_types = bind_data.types;
@@ -721,15 +721,16 @@ void ParquetExtension::Load(DuckDB &db) {
 	auto &context = *con.context;
 	auto &catalog = Catalog::GetSystemCatalog(context);
 
-	if (catalog.GetEntry<TableFunctionCatalogEntry>(context, DEFAULT_SCHEMA, "parquet_scan", true)) {
+	if (catalog.GetEntry<TableFunctionCatalogEntry>(context, DEFAULT_SCHEMA, "parquet_scan",
+	                                                OnEntryNotFound::RETURN_NULL)) {
 		throw InvalidInputException("Parquet extension is either already loaded or built-in");
 	}
 
-	catalog.CreateCopyFunction(context, &info);
-	catalog.CreateTableFunction(context, &cinfo);
-	catalog.CreateTableFunction(context, &pq_scan);
-	catalog.CreateTableFunction(context, &meta_cinfo);
-	catalog.CreateTableFunction(context, &schema_cinfo);
+	catalog.CreateCopyFunction(context, info);
+	catalog.CreateTableFunction(context, cinfo);
+	catalog.CreateTableFunction(context, pq_scan);
+	catalog.CreateTableFunction(context, meta_cinfo);
+	catalog.CreateTableFunction(context, schema_cinfo);
 	con.Commit();
 
 	auto &config = DBConfig::GetConfig(*db.instance);