duckdb 0.3.2-dev479.0 → 0.3.2-dev492.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "duckdb",
   "main": "./lib/duckdb.js",
-  "version": "0.3.2-dev479.0",
+  "version": "0.3.2-dev492.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/duckdb.cpp

@@ -421,7 +421,7 @@ public:
 	string schema_name;
 	//! Table name
 	string table_name;
-	//! Alises for the column names
+	//! Aliases for the column names
 	vector<string> column_name_alias;
 
 public:
@@ -2380,7 +2380,7 @@ namespace duckdb {
 enum class AlterType : uint8_t { INVALID = 0, ALTER_TABLE = 1, ALTER_VIEW = 2 };
 
 struct AlterInfo : public ParseInfo {
-	AlterInfo(AlterType type, string schema, string name) : type(type), schema(schema), name(name) {
+	AlterInfo(AlterType type, string schema, string name) : type(type), schema(move(schema)), name(move(name)) {
 	}
 	~AlterInfo() override {
 	}
@@ -11690,6 +11690,14 @@ const char *Exception::what() const noexcept {
 	return exception_message_.c_str();
 }
 
+bool Exception::UncaughtException() {
+#if __cplusplus >= 201703L
+	return std::uncaught_exceptions() > 0;
+#else
+	return std::uncaught_exception();
+#endif
+}
+
 string Exception::ConstructMessageRecursive(const string &msg, vector<ExceptionFormatValue> &values) {
 	return ExceptionFormatValue::Format(msg, values);
 }
@@ -20653,7 +20661,7 @@ public:
 
 MiniZStreamWrapper::~MiniZStreamWrapper() {
 	// avoid closing if destroyed during stack unwinding
-	if (std::uncaught_exception()) {
+	if (Exception::UncaughtException()) {
 		return;
 	}
 	try {
@@ -40386,6 +40394,16 @@ Value Value::LIST(vector<Value> values) {
 	return result;
 }
 
+Value Value::LIST(LogicalType child_type, vector<Value> values) {
+	if (values.empty()) {
+		return Value::EMPTYLIST(move(child_type));
+	}
+	for (auto &val : values) {
+		val = val.CastAs(child_type);
+	}
+	return Value::LIST(move(values));
+}
+
 Value Value::EMPTYLIST(LogicalType child_type) {
 	Value result;
 	result.type_ = LogicalType::LIST(move(child_type));
@@ -97206,6 +97224,10 @@ struct DuckDBDependenciesFun {
 	static void RegisterFunction(BuiltinFunctions &set);
 };
 
+struct DuckDBFunctionsFun {
+	static void RegisterFunction(BuiltinFunctions &set);
+};
+
 struct DuckDBIndexesFun {
 	static void RegisterFunction(BuiltinFunctions &set);
 };
@@ -98921,6 +98943,420 @@ void DuckDBDependenciesFun::RegisterFunction(BuiltinFunctions &set) {
 
 
 
+
+
+namespace duckdb {
+
+struct DuckDBFunctionsData : public FunctionOperatorData {
+	DuckDBFunctionsData() : offset(0), offset_in_entry(0) {
+	}
+
+	vector<CatalogEntry *> entries;
+	idx_t offset;
+	idx_t offset_in_entry;
+};
+
+static unique_ptr<FunctionData> DuckDBFunctionsBind(ClientContext &context, vector<Value> &inputs,
+                                                    unordered_map<string, Value> &named_parameters,
+                                                    vector<LogicalType> &input_table_types,
+                                                    vector<string> &input_table_names,
+                                                    vector<LogicalType> &return_types, vector<string> &names) {
+	names.emplace_back("schema_name");
+	return_types.emplace_back(LogicalType::VARCHAR);
+
+	names.emplace_back("function_name");
+	return_types.emplace_back(LogicalType::VARCHAR);
+
+	names.emplace_back("function_type");
+	return_types.emplace_back(LogicalType::VARCHAR);
+
+	names.emplace_back("description");
+	return_types.emplace_back(LogicalType::VARCHAR);
+
+	names.emplace_back("return_type");
+	return_types.emplace_back(LogicalType::VARCHAR);
+
+	names.emplace_back("parameters");
+	return_types.push_back(LogicalType::LIST(LogicalType::VARCHAR));
+
+	names.emplace_back("parameter_types");
+	return_types.push_back(LogicalType::LIST(LogicalType::VARCHAR));
+
+	names.emplace_back("varargs");
+	return_types.emplace_back(LogicalType::VARCHAR);
+
+	names.emplace_back("macro_definition");
+	return_types.emplace_back(LogicalType::VARCHAR);
+
+	return nullptr;
+}
+
+static void ExtractFunctionsFromSchema(ClientContext &context, SchemaCatalogEntry &schema,
+                                       DuckDBFunctionsData &result) {
+	schema.Scan(context, CatalogType::SCALAR_FUNCTION_ENTRY,
+	            [&](CatalogEntry *entry) { result.entries.push_back(entry); });
+	schema.Scan(context, CatalogType::TABLE_FUNCTION_ENTRY,
+	            [&](CatalogEntry *entry) { result.entries.push_back(entry); });
+	schema.Scan(context, CatalogType::PRAGMA_FUNCTION_ENTRY,
+	            [&](CatalogEntry *entry) { result.entries.push_back(entry); });
+}
+
+unique_ptr<FunctionOperatorData> DuckDBFunctionsInit(ClientContext &context, const FunctionData *bind_data,
+                                                     const vector<column_t> &column_ids,
+                                                     TableFilterCollection *filters) {
+	auto result = make_unique<DuckDBFunctionsData>();
+
+	// scan all the schemas for tables and collect themand collect them
+	auto schemas = Catalog::GetCatalog(context).schemas->GetEntries<SchemaCatalogEntry>(context);
+	for (auto &schema : schemas) {
+		ExtractFunctionsFromSchema(context, *schema, *result);
+	};
+	ExtractFunctionsFromSchema(context, *context.temporary_objects, *result);
+
+	std::sort(result->entries.begin(), result->entries.end(),
+	          [&](CatalogEntry *a, CatalogEntry *b) { return (int)a->type < (int)b->type; });
+	return move(result);
+}
+
+struct ScalarFunctionExtractor {
+	static idx_t FunctionCount(ScalarFunctionCatalogEntry &entry) {
+		return entry.functions.size();
+	}
+
+	static Value GetFunctionType() {
+		return Value("scalar");
+	}
+
+	static Value GetFunctionDescription(ScalarFunctionCatalogEntry &entry, idx_t offset) {
+		return Value();
+	}
+
+	static Value GetReturnType(ScalarFunctionCatalogEntry &entry, idx_t offset) {
+		return Value(entry.functions[offset].return_type.ToString());
+	}
+
+	static Value GetParameters(ScalarFunctionCatalogEntry &entry, idx_t offset) {
+		vector<Value> results;
+		for (idx_t i = 0; i < entry.functions[offset].arguments.size(); i++) {
+			results.emplace_back("col" + to_string(i));
+		}
+		return Value::LIST(LogicalType::VARCHAR, move(results));
+	}
+
+	static Value GetParameterTypes(ScalarFunctionCatalogEntry &entry, idx_t offset) {
+		vector<Value> results;
+		for (idx_t i = 0; i < entry.functions[offset].arguments.size(); i++) {
+			results.emplace_back(entry.functions[offset].arguments[i].ToString());
+		}
+		return Value::LIST(LogicalType::VARCHAR, move(results));
+	}
+
+	static Value GetVarArgs(ScalarFunctionCatalogEntry &entry, idx_t offset) {
+		return entry.functions[offset].varargs.id() == LogicalTypeId::INVALID
+		           ? Value()
+		           : Value(entry.functions[offset].varargs.ToString());
+	}
+
+	static Value GetMacroDefinition(ScalarFunctionCatalogEntry &entry, idx_t offset) {
+		return Value();
+	}
+};
+
+struct AggregateFunctionExtractor {
+	static idx_t FunctionCount(AggregateFunctionCatalogEntry &entry) {
+		return entry.functions.size();
+	}
+
+	static Value GetFunctionType() {
+		return Value("aggregate");
+	}
+
+	static Value GetFunctionDescription(AggregateFunctionCatalogEntry &entry, idx_t offset) {
+		return Value();
+	}
+
+	static Value GetReturnType(AggregateFunctionCatalogEntry &entry, idx_t offset) {
+		return Value(entry.functions[offset].return_type.ToString());
+	}
+
+	static Value GetParameters(AggregateFunctionCatalogEntry &entry, idx_t offset) {
+		vector<Value> results;
+		for (idx_t i = 0; i < entry.functions[offset].arguments.size(); i++) {
+			results.emplace_back("col" + to_string(i));
+		}
+		return Value::LIST(LogicalType::VARCHAR, move(results));
+	}
+
+	static Value GetParameterTypes(AggregateFunctionCatalogEntry &entry, idx_t offset) {
+		vector<Value> results;
+		for (idx_t i = 0; i < entry.functions[offset].arguments.size(); i++) {
+			results.emplace_back(entry.functions[offset].arguments[i].ToString());
+		}
+		return Value::LIST(LogicalType::VARCHAR, move(results));
+	}
+
+	static Value GetVarArgs(AggregateFunctionCatalogEntry &entry, idx_t offset) {
+		return entry.functions[offset].varargs.id() == LogicalTypeId::INVALID
+		           ? Value()
+		           : Value(entry.functions[offset].varargs.ToString());
+	}
+
+	static Value GetMacroDefinition(AggregateFunctionCatalogEntry &entry, idx_t offset) {
+		return Value();
+	}
+};
+
+struct MacroExtractor {
+	static idx_t FunctionCount(MacroCatalogEntry &entry) {
+		return 1;
+	}
+
+	static Value GetFunctionType() {
+		return Value("macro");
+	}
+
+	static Value GetFunctionDescription(MacroCatalogEntry &entry, idx_t offset) {
+		return Value();
+	}
+
+	static Value GetReturnType(MacroCatalogEntry &entry, idx_t offset) {
+		return Value();
+	}
+
+	static Value GetParameters(MacroCatalogEntry &entry, idx_t offset) {
+		vector<Value> results;
+		for (auto &param : entry.function->parameters) {
+			D_ASSERT(param->type == ExpressionType::COLUMN_REF);
+			auto &colref = (ColumnRefExpression &)*param;
+			results.emplace_back(colref.GetColumnName());
+		}
+		for (auto &param_entry : entry.function->default_parameters) {
+			results.emplace_back(param_entry.first);
+		}
+		return Value::LIST(LogicalType::VARCHAR, move(results));
+	}
+
+	static Value GetParameterTypes(MacroCatalogEntry &entry, idx_t offset) {
+		vector<Value> results;
+		for (idx_t i = 0; i < entry.function->parameters.size(); i++) {
+			results.emplace_back(LogicalType::VARCHAR);
+		}
+		for (idx_t i = 0; i < entry.function->default_parameters.size(); i++) {
+			results.emplace_back(LogicalType::VARCHAR);
+		}
+		return Value::LIST(LogicalType::VARCHAR, move(results));
+	}
+
+	static Value GetVarArgs(MacroCatalogEntry &entry, idx_t offset) {
+		return Value();
+	}
+
+	static Value GetMacroDefinition(MacroCatalogEntry &entry, idx_t offset) {
+		return entry.function->expression->ToString();
+	}
+};
+
+struct TableFunctionExtractor {
+	static idx_t FunctionCount(TableFunctionCatalogEntry &entry) {
+		return entry.functions.size();
+	}
+
+	static Value GetFunctionType() {
+		return Value("table");
+	}
+
+	static Value GetFunctionDescription(TableFunctionCatalogEntry &entry, idx_t offset) {
+		return Value();
+	}
+
+	static Value GetReturnType(TableFunctionCatalogEntry &entry, idx_t offset) {
+		return Value();
+	}
+
+	static Value GetParameters(TableFunctionCatalogEntry &entry, idx_t offset) {
+		vector<Value> results;
+		for (idx_t i = 0; i < entry.functions[offset].arguments.size(); i++) {
+			results.emplace_back("col" + to_string(i));
+		}
+		for (auto &param : entry.functions[offset].named_parameters) {
+			results.emplace_back(param.first);
+		}
+		return Value::LIST(LogicalType::VARCHAR, move(results));
+	}
+
+	static Value GetParameterTypes(TableFunctionCatalogEntry &entry, idx_t offset) {
+		vector<Value> results;
+		for (idx_t i = 0; i < entry.functions[offset].arguments.size(); i++) {
+			results.emplace_back(entry.functions[offset].arguments[i].ToString());
+		}
+		for (auto &param : entry.functions[offset].named_parameters) {
+			results.emplace_back(param.second.ToString());
+		}
+		return Value::LIST(LogicalType::VARCHAR, move(results));
+	}
+
+	static Value GetVarArgs(TableFunctionCatalogEntry &entry, idx_t offset) {
+		return entry.functions[offset].varargs.id() == LogicalTypeId::INVALID
+		           ? Value()
+		           : Value(entry.functions[offset].varargs.ToString());
+	}
+
+	static Value GetMacroDefinition(TableFunctionCatalogEntry &entry, idx_t offset) {
+		return Value();
+	}
+};
+
+struct PragmaFunctionExtractor {
+	static idx_t FunctionCount(PragmaFunctionCatalogEntry &entry) {
+		return entry.functions.size();
+	}
+
+	static Value GetFunctionType() {
+		return Value("pragma");
+	}
+
+	static Value GetFunctionDescription(PragmaFunctionCatalogEntry &entry, idx_t offset) {
+		return Value();
+	}
+
+	static Value GetReturnType(PragmaFunctionCatalogEntry &entry, idx_t offset) {
+		return Value();
+	}
+
+	static Value GetParameters(PragmaFunctionCatalogEntry &entry, idx_t offset) {
+		vector<Value> results;
+		for (idx_t i = 0; i < entry.functions[offset].arguments.size(); i++) {
+			results.emplace_back("col" + to_string(i));
+		}
+		for (auto &param : entry.functions[offset].named_parameters) {
+			results.emplace_back(param.first);
+		}
+		return Value::LIST(LogicalType::VARCHAR, move(results));
+	}
+
+	static Value GetParameterTypes(PragmaFunctionCatalogEntry &entry, idx_t offset) {
+		vector<Value> results;
+		for (idx_t i = 0; i < entry.functions[offset].arguments.size(); i++) {
+			results.emplace_back(entry.functions[offset].arguments[i].ToString());
+		}
+		for (auto &param : entry.functions[offset].named_parameters) {
+			results.emplace_back(param.second.ToString());
+		}
+		return Value::LIST(LogicalType::VARCHAR, move(results));
+	}
+
+	static Value GetVarArgs(PragmaFunctionCatalogEntry &entry, idx_t offset) {
+		return entry.functions[offset].varargs.id() == LogicalTypeId::INVALID
+		           ? Value()
+		           : Value(entry.functions[offset].varargs.ToString());
+	}
+
+	static Value GetMacroDefinition(PragmaFunctionCatalogEntry &entry, idx_t offset) {
+		return Value();
+	}
+};
+
+template <class T, class OP>
+bool ExtractFunctionData(StandardEntry *entry, idx_t function_idx, DataChunk &output, idx_t output_offset) {
+	auto &function = (T &)*entry;
+	// schema_name, LogicalType::VARCHAR
+	output.SetValue(0, output_offset, Value(entry->schema->name));
+
+	// function_name, LogicalType::VARCHAR
+	output.SetValue(1, output_offset, Value(entry->name));
+
+	// function_type, LogicalType::VARCHAR
+	output.SetValue(2, output_offset, Value(OP::GetFunctionType()));
+
+	// function_description, LogicalType::VARCHAR
+	output.SetValue(3, output_offset, OP::GetFunctionDescription(function, function_idx));
+
+	// return_type, LogicalType::VARCHAR
+	output.SetValue(4, output_offset, OP::GetReturnType(function, function_idx));
+
+	// parameters, LogicalType::LIST(LogicalType::VARCHAR)
+	output.SetValue(5, output_offset, OP::GetParameters(function, function_idx));
+
+	// parameter_types, LogicalType::LIST(LogicalType::VARCHAR)
+	output.SetValue(6, output_offset, OP::GetParameterTypes(function, function_idx));
+
+	// varargs, LogicalType::VARCHAR
+	output.SetValue(7, output_offset, OP::GetVarArgs(function, function_idx));
+
+	// macro_definition, LogicalType::VARCHAR
+	output.SetValue(8, output_offset, OP::GetMacroDefinition(function, function_idx));
+
+	return function_idx + 1 == OP::FunctionCount(function);
+}
+
+void DuckDBFunctionsFunction(ClientContext &context, const FunctionData *bind_data,
+                             FunctionOperatorData *operator_state, DataChunk *input, DataChunk &output) {
+	auto &data = (DuckDBFunctionsData &)*operator_state;
+	if (data.offset >= data.entries.size()) {
+		// finished returning values
+		return;
+	}
+	// start returning values
+	// either fill up the chunk or return all the remaining columns
+	idx_t count = 0;
+	while (data.offset < data.entries.size() && count < STANDARD_VECTOR_SIZE) {
+		auto &entry = data.entries[data.offset];
+		auto standard_entry = (StandardEntry *)entry;
+		bool finished = false;
+
+		switch (entry->type) {
+		case CatalogType::SCALAR_FUNCTION_ENTRY:
+			finished = ExtractFunctionData<ScalarFunctionCatalogEntry, ScalarFunctionExtractor>(
+			    standard_entry, data.offset_in_entry, output, count);
+			break;
+		case CatalogType::AGGREGATE_FUNCTION_ENTRY:
+			finished = ExtractFunctionData<AggregateFunctionCatalogEntry, AggregateFunctionExtractor>(
+			    standard_entry, data.offset_in_entry, output, count);
+			break;
+		case CatalogType::MACRO_ENTRY:
+			finished = ExtractFunctionData<MacroCatalogEntry, MacroExtractor>(standard_entry, data.offset_in_entry,
+			                                                                  output, count);
+			break;
+		case CatalogType::TABLE_FUNCTION_ENTRY:
+			finished = ExtractFunctionData<TableFunctionCatalogEntry, TableFunctionExtractor>(
+			    standard_entry, data.offset_in_entry, output, count);
+			break;
+		case CatalogType::PRAGMA_FUNCTION_ENTRY:
+			finished = ExtractFunctionData<PragmaFunctionCatalogEntry, PragmaFunctionExtractor>(
+			    standard_entry, data.offset_in_entry, output, count);
+			break;
+		default:
+			throw InternalException("FIXME: unrecognized function type in duckdb_functions");
+		}
+		if (finished) {
+			// finished with this function, move to the next function
+			data.offset++;
+			data.offset_in_entry = 0;
+		} else {
+			// more functions remain
+			data.offset_in_entry++;
+		}
+		count++;
+	}
+	output.SetCardinality(count);
+}
+
+void DuckDBFunctionsFun::RegisterFunction(BuiltinFunctions &set) {
+	set.AddFunction(
+	    TableFunction("duckdb_functions", {}, DuckDBFunctionsFunction, DuckDBFunctionsBind, DuckDBFunctionsInit));
+}
+
+} // namespace duckdb
+
+
+
+
+
+
+
+
+
+
 namespace duckdb {
 
 struct DuckDBIndexesData : public FunctionOperatorData {
@@ -100547,6 +100983,7 @@ void BuiltinFunctions::RegisterSQLiteFunctions() {
 
 	DuckDBColumnsFun::RegisterFunction(*this);
 	DuckDBConstraintsFun::RegisterFunction(*this);
+	DuckDBFunctionsFun::RegisterFunction(*this);
 	DuckDBIndexesFun::RegisterFunction(*this);
 	DuckDBSchemasFun::RegisterFunction(*this);
 	DuckDBDependenciesFun::RegisterFunction(*this);
@@ -101152,7 +101589,7 @@ BaseAppender::~BaseAppender() {
 }
 
 void BaseAppender::Destructor() {
-	if (std::uncaught_exception()) {
+	if (Exception::UncaughtException()) {
 		return;
 	}
 	// flush any remaining chunks, but only if we are not cleaning up the appender as part of an exception stack unwind
@@ -103436,7 +103873,7 @@ ClientContext::ClientContext(shared_ptr<DatabaseInstance> database)
 }
 
 ClientContext::~ClientContext() {
-	if (std::uncaught_exception()) {
+	if (Exception::UncaughtException()) {
 		return;
 	}
 	// destroy the client context and rollback if there is an active transaction
@@ -105328,7 +105765,7 @@ DatabaseInstance::DatabaseInstance() {
 }
 
 DatabaseInstance::~DatabaseInstance() {
-	if (std::uncaught_exception()) {
+	if (Exception::UncaughtException()) {
 		return;
 	}
 
@@ -114513,7 +114950,7 @@ public:
 
 	//! The subquery
 	unique_ptr<SelectStatement> subquery;
-	//! Alises for the column names
+	//! Aliases for the column names
 	vector<string> column_name_alias;
 
 public:

package/src/duckdb.hpp

@@ -10,8 +10,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 #pragma once
 #define DUCKDB_AMALGAMATION 1
-#define DUCKDB_SOURCE_ID "8a0e93080"
-#define DUCKDB_VERSION "0.3.2-dev479"
+#define DUCKDB_SOURCE_ID "6d8e28328"
+#define DUCKDB_VERSION "0.3.2-dev492"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -1299,6 +1299,8 @@ public:
 		return ConstructMessageRecursive(msg, values, params...);
 	}
 
+	DUCKDB_API static bool UncaughtException();
+
 private:
 	string exception_message_;
 };
@@ -2621,8 +2623,11 @@ public:
 	DUCKDB_API static Value DOUBLE(double value);
 	//! Create a struct value with given list of entries
 	DUCKDB_API static Value STRUCT(child_list_t<Value> values);
-	//! Create a list value with the given entries
+	//! Create a list value with the given entries, list type is inferred from children
+	//! Cannot be called with an empty list, use either EMPTYLIST or LIST with a type instead
 	DUCKDB_API static Value LIST(vector<Value> values);
+	//! Create a list value with the given entries
+	DUCKDB_API static Value LIST(LogicalType child_type, vector<Value> values);
 	//! Create an empty list with the specified type
 	DUCKDB_API static Value EMPTYLIST(LogicalType child_type);
 	//! Creat a map value from a (key, value) pair