duckdb 0.5.2-dev602.0 → 0.5.2-dev610.0

package/package.json

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

package/src/duckdb.cpp

@@ -118459,7 +118459,8 @@ struct CSVCopyFunction {
 };
 
 struct ReadCSVTableFunction {
-	static TableFunction GetFunction();
+	static TableFunction GetFunction(bool list_parameter = false);
+	static TableFunction GetAutoFunction(bool list_parameter = false);
 	static void RegisterFunction(BuiltinFunctions &set);
 };
 
@@ -119649,12 +119650,24 @@ static unique_ptr<FunctionData> ReadCSVBind(ClientContext &context, TableFunctio
 	auto result = make_unique<ReadCSVData>();
 	auto &options = result->options;
 
-	auto &file_pattern = StringValue::Get(input.inputs[0]);
+	vector<string> patterns;
+	if (input.inputs[0].type().id() == LogicalTypeId::LIST) {
+		// list of globs
+		for (auto &val : ListValue::GetChildren(input.inputs[0])) {
+			patterns.push_back(StringValue::Get(val));
+		}
+	} else {
+		// single glob pattern
+		patterns.push_back(StringValue::Get(input.inputs[0]));
+	}
 
 	auto &fs = FileSystem::GetFileSystem(context);
-	result->files = fs.Glob(file_pattern, context);
-	if (result->files.empty()) {
-		throw IOException("No files found that match the pattern \"%s\"", file_pattern);
+	for (auto &file_pattern : patterns) {
+		auto files = fs.Glob(file_pattern, context);
+		if (files.empty()) {
+			throw IOException("No files found that match the pattern \"%s\"", file_pattern);
+		}
+		result->files.insert(result->files.end(), files.begin(), files.end());
 	}
 
 	for (auto &kv : input.named_parameters) {
@@ -120022,8 +120035,9 @@ static unique_ptr<FunctionData> CSVReaderDeserialize(ClientContext &context, Fie
 	return move(result_data);
 }
 
-TableFunction ReadCSVTableFunction::GetFunction() {
-	TableFunction read_csv("read_csv", {LogicalType::VARCHAR}, ReadCSVFunction, ReadCSVBind, ReadCSVInit);
+TableFunction ReadCSVTableFunction::GetFunction(bool list_parameter) {
+	auto parameter = list_parameter ? LogicalType::LIST(LogicalType::VARCHAR) : LogicalType::VARCHAR;
+	TableFunction read_csv("read_csv", {parameter}, ReadCSVFunction, ReadCSVBind, ReadCSVInit);
 	read_csv.table_scan_progress = CSVReaderProgress;
 	read_csv.pushdown_complex_filter = CSVComplexFilterPushdown;
 	read_csv.serialize = CSVReaderSerialize;
@@ -120032,15 +120046,26 @@ TableFunction ReadCSVTableFunction::GetFunction() {
 	return read_csv;
 }
 
-void ReadCSVTableFunction::RegisterFunction(BuiltinFunctions &set) {
-	set.AddFunction(ReadCSVTableFunction::GetFunction());
-
-	TableFunction read_csv_auto("read_csv_auto", {LogicalType::VARCHAR}, ReadCSVFunction, ReadCSVAutoBind, ReadCSVInit);
+TableFunction ReadCSVTableFunction::GetAutoFunction(bool list_parameter) {
+	auto parameter = list_parameter ? LogicalType::LIST(LogicalType::VARCHAR) : LogicalType::VARCHAR;
+	TableFunction read_csv_auto("read_csv_auto", {parameter}, ReadCSVFunction, ReadCSVAutoBind, ReadCSVInit);
 	read_csv_auto.table_scan_progress = CSVReaderProgress;
 	read_csv_auto.pushdown_complex_filter = CSVComplexFilterPushdown;
 	read_csv_auto.serialize = CSVReaderSerialize;
 	read_csv_auto.deserialize = CSVReaderDeserialize;
 	ReadCSVAddNamedParameters(read_csv_auto);
+	return read_csv_auto;
+}
+
+void ReadCSVTableFunction::RegisterFunction(BuiltinFunctions &set) {
+	TableFunctionSet read_csv("read_csv");
+	read_csv.AddFunction(ReadCSVTableFunction::GetFunction());
+	read_csv.AddFunction(ReadCSVTableFunction::GetFunction(true));
+	set.AddFunction(read_csv);
+
+	TableFunctionSet read_csv_auto("read_csv_auto");
+	read_csv_auto.AddFunction(ReadCSVTableFunction::GetAutoFunction());
+	read_csv_auto.AddFunction(ReadCSVTableFunction::GetAutoFunction(true));
 	set.AddFunction(read_csv_auto);
 }
 
@@ -141465,8 +141490,10 @@ namespace duckdb {
 class CreateViewRelation : public Relation {
 public:
 	CreateViewRelation(shared_ptr<Relation> child, string view_name, bool replace, bool temporary);
+	CreateViewRelation(shared_ptr<Relation> child, string schema_name, string view_name, bool replace, bool temporary);
 
 	shared_ptr<Relation> child;
+	string schema_name;
 	string view_name;
 	bool replace;
 	bool temporary;
@@ -141496,6 +141523,13 @@ CreateViewRelation::CreateViewRelation(shared_ptr<Relation> child_p, string view
 	context.GetContext()->TryBindRelation(*this, this->columns);
 }
 
+CreateViewRelation::CreateViewRelation(shared_ptr<Relation> child_p, string schema_name_p, string view_name_p,
+                                       bool replace_p, bool temporary_p)
+    : Relation(child_p->context, RelationType::CREATE_VIEW_RELATION), child(move(child_p)),
+      schema_name(move(schema_name_p)), view_name(move(view_name_p)), replace(replace_p), temporary(temporary_p) {
+	context.GetContext()->TryBindRelation(*this, this->columns);
+}
+
 BoundStatement CreateViewRelation::Bind(Binder &binder) {
 	auto select = make_unique<SelectStatement>();
 	select->node = child->GetQueryNode();
@@ -141505,7 +141539,7 @@ BoundStatement CreateViewRelation::Bind(Binder &binder) {
 	info->query = move(select);
 	info->view_name = view_name;
 	info->temporary = temporary;
-	info->schema = "";
+	info->schema = schema_name;
 	info->on_conflict = replace ? OnCreateConflict::REPLACE_ON_CONFLICT : OnCreateConflict::ERROR_ON_CONFLICT;
 	stmt.info = move(info);
 	return binder.Bind((SQLStatement &)stmt);
@@ -143537,6 +143571,16 @@ shared_ptr<Relation> Relation::CreateView(const string &name, bool replace, bool
 	return shared_from_this();
 }
 
+shared_ptr<Relation> Relation::CreateView(const string &schema_name, const string &name, bool replace, bool temporary) {
+	auto view = make_shared<CreateViewRelation>(shared_from_this(), schema_name, name, replace, temporary);
+	auto res = view->Execute();
+	if (res->HasError()) {
+		const string prepended_message = "Failed to create view '" + name + "': ";
+		res->ThrowError(prepended_message);
+	}
+	return shared_from_this();
+}
+
 unique_ptr<QueryResult> Relation::Query(const string &sql) {
 	return context.GetContext()->Query(sql, false);
 }

package/src/duckdb.hpp

@@ -11,8 +11,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #pragma once
 #define DUCKDB_AMALGAMATION 1
 #define DUCKDB_AMALGAMATION_EXTENDED 1
-#define DUCKDB_SOURCE_ID "2c41da9ac"
-#define DUCKDB_VERSION "v0.5.2-dev602"
+#define DUCKDB_SOURCE_ID "41f579d27"
+#define DUCKDB_VERSION "v0.5.2-dev610"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -23699,6 +23699,8 @@ public:
 	DUCKDB_API void Head(idx_t limit = 10);
 
 	DUCKDB_API shared_ptr<Relation> CreateView(const string &name, bool replace = true, bool temporary = false);
+	DUCKDB_API shared_ptr<Relation> CreateView(const string &schema_name, const string &name, bool replace = true,
+	                                           bool temporary = false);
 	DUCKDB_API unique_ptr<QueryResult> Query(const string &sql);
 	DUCKDB_API unique_ptr<QueryResult> Query(const string &name, const string &sql);