duckdb 0.6.2-dev772.0 → 0.6.2-dev889.0

package/binding.gyp

@@ -54,8 +54,8 @@
                 "src/duckdb/ub_src_function_aggregate_holistic.cpp", 
                 "src/duckdb/ub_src_function_aggregate_nested.cpp", 
                 "src/duckdb/ub_src_function_aggregate_regression.cpp", 
-                "src/duckdb/ub_src_function_cast.cpp", 
                 "src/duckdb/ub_src_function.cpp", 
+                "src/duckdb/ub_src_function_cast.cpp", 
                 "src/duckdb/ub_src_function_pragma.cpp", 
                 "src/duckdb/ub_src_function_scalar_blob.cpp", 
                 "src/duckdb/ub_src_function_scalar_date.cpp", 

package/package.json

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

package/src/connection.cpp

@@ -326,10 +326,11 @@ struct UnregisterUdfTask : public Task {
 		auto &con = *connection.connection;
 		con.BeginTransaction();
 		auto &context = *con.context;
-		auto &catalog = duckdb::Catalog::GetCatalog(context);
+		auto &catalog = duckdb::Catalog::GetSystemCatalog(context);
 		duckdb::DropInfo info;
 		info.type = duckdb::CatalogType::SCALAR_FUNCTION_ENTRY;
 		info.name = name;
+		info.allow_drop_internal = true;
 		catalog.DropEntry(context, &info);
 		con.Commit();
 	}

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

@@ -195,7 +195,7 @@ struct ICUDateAdd : public ICUDateFunc {
 		                                                                            LogicalType::TIMESTAMP_TZ));
 
 		CreateScalarFunctionInfo func_info(set);
-		auto &catalog = Catalog::GetCatalog(context);
+		auto &catalog = Catalog::GetSystemCatalog(context);
 		catalog.AddFunction(context, &func_info);
 	}
 
@@ -220,7 +220,7 @@ struct ICUDateAdd : public ICUDateFunc {
 		                                                                               LogicalType::TIMESTAMP_TZ));
 
 		CreateScalarFunctionInfo func_info(set);
-		auto &catalog = Catalog::GetCatalog(context);
+		auto &catalog = Catalog::GetSystemCatalog(context);
 		catalog.AddFunction(context, &func_info);
 	}
 
@@ -232,7 +232,7 @@ struct ICUDateAdd : public ICUDateFunc {
 		set.AddFunction(GetUnaryAgeFunction<timestamp_t, ICUCalendarAge>(LogicalType::TIMESTAMP_TZ));
 
 		CreateScalarFunctionInfo func_info(set);
-		auto &catalog = Catalog::GetCatalog(context);
+		auto &catalog = Catalog::GetSystemCatalog(context);
 		catalog.AddFunction(context, &func_info);
 	}
 };

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

@@ -432,7 +432,7 @@ struct ICUDatePart : public ICUDateFunc {
 	}
 
 	static void AddUnaryPartCodeFunctions(const string &name, ClientContext &context) {
-		auto &catalog = Catalog::GetCatalog(context);
+		auto &catalog = Catalog::GetSystemCatalog(context);
 		ScalarFunctionSet set(name);
 		set.AddFunction(GetUnaryPartCodeFunction<timestamp_t, int64_t>(LogicalType::TIMESTAMP_TZ));
 		CreateScalarFunctionInfo func_info(set);
@@ -456,7 +456,7 @@ struct ICUDatePart : public ICUDateFunc {
 	}
 
 	static void AddDatePartFunctions(const string &name, ClientContext &context) {
-		auto &catalog = Catalog::GetCatalog(context);
+		auto &catalog = Catalog::GetSystemCatalog(context);
 		ScalarFunctionSet set(name);
 		set.AddFunction(GetBinaryPartCodeFunction<timestamp_t, int64_t>(LogicalType::TIMESTAMP_TZ));
 		set.AddFunction(GetStructFunction<timestamp_t>(LogicalType::TIMESTAMP_TZ));
@@ -476,7 +476,7 @@ struct ICUDatePart : public ICUDateFunc {
 		                      BindLastDate);
 	}
 	static void AddLastDayFunctions(const string &name, ClientContext &context) {
-		auto &catalog = Catalog::GetCatalog(context);
+		auto &catalog = Catalog::GetSystemCatalog(context);
 		ScalarFunctionSet set(name);
 		set.AddFunction(GetLastDayFunction<timestamp_t>(LogicalType::TIMESTAMP_TZ));
 		CreateScalarFunctionInfo func_info(set);

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

@@ -143,7 +143,7 @@ struct ICUCalendarSub : public ICUDateFunc {
 		set.AddFunction(GetFunction<timestamp_t>(LogicalType::TIMESTAMP_TZ));
 
 		CreateScalarFunctionInfo func_info(set);
-		auto &catalog = Catalog::GetCatalog(context);
+		auto &catalog = Catalog::GetSystemCatalog(context);
 		catalog.AddFunction(context, &func_info);
 	}
 };
@@ -270,7 +270,7 @@ struct ICUCalendarDiff : public ICUDateFunc {
 		set.AddFunction(GetFunction<timestamp_t>(LogicalType::TIMESTAMP_TZ));
 
 		CreateScalarFunctionInfo func_info(set);
-		auto &catalog = Catalog::GetCatalog(context);
+		auto &catalog = Catalog::GetSystemCatalog(context);
 		catalog.AddFunction(context, &func_info);
 	}
 };

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

@@ -145,7 +145,7 @@ struct ICUDateTrunc : public ICUDateFunc {
 		set.AddFunction(GetDateTruncFunction<timestamp_t>(LogicalType::TIMESTAMP_TZ));
 
 		CreateScalarFunctionInfo func_info(set);
-		auto &catalog = Catalog::GetCatalog(context);
+		auto &catalog = Catalog::GetSystemCatalog(context);
 		catalog.AddFunction(context, &func_info);
 	}
 };

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

@@ -225,7 +225,7 @@ void ICUExtension::Load(DuckDB &db) {
 	Connection con(db);
 	con.BeginTransaction();
 
-	auto &catalog = Catalog::GetCatalog(*con.context);
+	auto &catalog = Catalog::GetSystemCatalog(*con.context);
 
 	// iterate over all the collations
 	int32_t count;

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

@@ -88,7 +88,7 @@ struct ICUMakeTimestampTZFunc : public ICUDateFunc {
 		set.AddFunction(GetSeptenaryFunction<int64_t>(LogicalType::BIGINT));
 
 		CreateScalarFunctionInfo func_info(set);
-		auto &catalog = Catalog::GetCatalog(context);
+		auto &catalog = Catalog::GetSystemCatalog(context);
 		catalog.AddFunction(context, &func_info);
 	}
 };

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

@@ -142,7 +142,7 @@ struct ICUStrptime : public ICUDateFunc {
 
 	static void AddBinaryTimestampFunction(const string &name, ClientContext &context) {
 		// Find the old function
-		auto &catalog = Catalog::GetCatalog(context);
+		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 = (ScalarFunctionCatalogEntry &)*entry;
@@ -330,7 +330,7 @@ struct ICUStrftime : public ICUDateFunc {
 		                               ICUStrftimeFunction, Bind));
 
 		CreateScalarFunctionInfo func_info(set);
-		auto &catalog = Catalog::GetCatalog(context);
+		auto &catalog = Catalog::GetSystemCatalog(context);
 		catalog.AddFunction(context, &func_info);
 	}
 

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

@@ -4,6 +4,7 @@
 #include "duckdb/parser/parsed_data/create_scalar_function_info.hpp"
 #include "duckdb/parser/parsed_data/create_table_function_info.hpp"
 #include "include/icu-datefunc.hpp"
+#include "duckdb/transaction/meta_transaction.hpp"
 
 namespace duckdb {
 
@@ -151,7 +152,7 @@ struct ICULocalTimestampFunc : public ICUDateFunc {
 
 	struct BindDataNow : public BindData {
 		explicit BindDataNow(ClientContext &context) : BindData(context) {
-			now = context.ActiveTransaction().start_timestamp;
+			now = MetaTransaction::Get(context).start_timestamp;
 		}
 
 		BindDataNow(const BindDataNow &other) : BindData(other), now(other.now) {
@@ -200,7 +201,7 @@ struct ICULocalTimestampFunc : public ICUDateFunc {
 		set.AddFunction(ScalarFunction({}, LogicalType::TIMESTAMP, Execute, BindNow));
 
 		CreateScalarFunctionInfo func_info(set);
-		auto &catalog = Catalog::GetCatalog(context);
+		auto &catalog = Catalog::GetSystemCatalog(context);
 		catalog.AddFunction(context, &func_info);
 	}
 };
@@ -220,7 +221,7 @@ struct ICULocalTimeFunc : public ICUDateFunc {
 		set.AddFunction(ScalarFunction({}, LogicalType::TIME, Execute, ICULocalTimestampFunc::BindNow));
 
 		CreateScalarFunctionInfo func_info(set);
-		auto &catalog = Catalog::GetCatalog(context);
+		auto &catalog = Catalog::GetSystemCatalog(context);
 		catalog.AddFunction(context, &func_info);
 	}
 };
@@ -272,13 +273,13 @@ struct ICUTimeZoneFunc : public ICUDateFunc {
 		                               Execute<ICUToLocalTimestamp>, Bind));
 
 		CreateScalarFunctionInfo func_info(set);
-		auto &catalog = Catalog::GetCatalog(context);
+		auto &catalog = Catalog::GetSystemCatalog(context);
 		catalog.AddFunction(context, &func_info);
 	}
 };
 
 void RegisterICUTimeZoneFunctions(ClientContext &context) {
-	auto &catalog = Catalog::GetCatalog(context);
+	auto &catalog = Catalog::GetSystemCatalog(context);
 	TableFunction tz_names("pg_timezone_names", {}, ICUTimeZoneFunction, ICUTimeZoneBind, ICUTimeZoneInit);
 	CreateTableFunctionInfo tz_names_info(move(tz_names));
 	catalog.CreateTableFunction(context, &tz_names_info);

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

@@ -30,7 +30,7 @@ void JSONExtension::Load(DuckDB &db) {
 	Connection con(db);
 	con.BeginTransaction();
 
-	auto &catalog = Catalog::GetCatalog(*con.context);
+	auto &catalog = Catalog::GetSystemCatalog(*con.context);
 	for (auto &fun : JSONFunctions::GetFunctions()) {
 		catalog.CreateFunction(*con.context, &fun);
 	}

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

@@ -790,7 +790,7 @@ void ParquetExtension::Load(DuckDB &db) {
 	Connection con(db);
 	con.BeginTransaction();
 	auto &context = *con.context;
-	auto &catalog = Catalog::GetCatalog(context);
+	auto &catalog = Catalog::GetSystemCatalog(context);
 
 	if (catalog.GetEntry<TableFunctionCatalogEntry>(context, DEFAULT_SCHEMA, "parquet_scan", true)) {
 		throw InvalidInputException("Parquet extension is either already loaded or built-in");