duckdb 0.3.3-dev977.0 → 0.3.3-dev993.0

package/package.json

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

package/src/duckdb.cpp

@@ -13670,7 +13670,7 @@ struct LengthFun {
 
 struct LikeFun {
 	static void RegisterFunction(BuiltinFunctions &set);
-	static bool Glob(const char *s, idx_t slen, const char *pattern, idx_t plen);
+	DUCKDB_API static bool Glob(const char *s, idx_t slen, const char *pattern, idx_t plen);
 };
 
 struct LikeEscapeFun {
@@ -13994,10 +13994,14 @@ void FileSystem::FileSync(FileHandle &handle) {
 	throw NotImplementedException("%s: FileSync is not implemented!", GetName());
 }
 
-vector<string> FileSystem::Glob(const string &path) {
+vector<string> FileSystem::Glob(const string &path, FileOpener *opener) {
 	throw NotImplementedException("%s: Glob is not implemented!", GetName());
 }
 
+vector<string> FileSystem::Glob(const string &path, ClientContext &context) {
+	return Glob(path, GetFileOpener(context));
+}
+
 void FileSystem::RegisterSubSystem(unique_ptr<FileSystem> sub_fs) {
 	throw NotImplementedException("%s: Can't register a sub system on a non-virtual file system", GetName());
 }
@@ -16110,7 +16114,7 @@ public:
 	void FileSync(FileHandle &handle) override;
 
 	//! Runs a glob on the file system, returning a list of matching files
-	vector<string> Glob(const string &path) override;
+	vector<string> Glob(const string &path, FileOpener *opener = nullptr) override;
 
 	bool CanHandleFile(const string &fpath) override {
 		//! Whether or not a sub-system can handle a specific file path
@@ -17034,7 +17038,7 @@ static void GlobFiles(FileSystem &fs, const string &path, const string &glob, bo
 	});
 }
 
-vector<string> LocalFileSystem::Glob(const string &path) {
+vector<string> LocalFileSystem::Glob(const string &path, FileOpener *opener) {
 	if (path.empty()) {
 		return vector<string>();
 	}
@@ -46050,8 +46054,8 @@ public:
 		FindFileSystem(filename)->RemoveFile(filename);
 	}
 
-	vector<string> Glob(const string &path) override {
-		return FindFileSystem(path)->Glob(path);
+	virtual vector<string> Glob(const string &path, FileOpener *opener = nullptr) override {
+		return FindFileSystem(path)->Glob(path, opener);
 	}
 
 	void RegisterSubSystem(unique_ptr<FileSystem> fs) override {
@@ -96081,7 +96085,7 @@ static unique_ptr<FunctionData> ReadCSVBind(ClientContext &context, CopyInfo &in
 	string file_pattern = info.file_path;
 
 	auto &fs = FileSystem::GetFileSystem(context);
-	bind_data->files = fs.Glob(file_pattern);
+	bind_data->files = fs.Glob(file_pattern, context);
 	if (bind_data->files.empty()) {
 		throw IOException("No files found that match the pattern \"%s\"", file_pattern);
 	}
@@ -96462,7 +96466,7 @@ static unique_ptr<FunctionData> GlobFunctionBind(ClientContext &context, vector<
 	}
 	auto result = make_unique<GlobFunctionBindData>();
 	auto &fs = FileSystem::GetFileSystem(context);
-	result->files = fs.Glob(StringValue::Get(inputs[0]));
+	result->files = fs.Glob(StringValue::Get(inputs[0]), context);
 	return_types.emplace_back(LogicalType::VARCHAR);
 	names.emplace_back("file");
 	return move(result);
@@ -97185,7 +97189,7 @@ static unique_ptr<FunctionData> ReadCSVBind(ClientContext &context, vector<Value
 	auto &file_pattern = StringValue::Get(inputs[0]);
 
 	auto &fs = FileSystem::GetFileSystem(context);
-	result->files = fs.Glob(file_pattern);
+	result->files = fs.Glob(file_pattern, context);
 	if (result->files.empty()) {
 		throw IOException("No files found that match the pattern \"%s\"", file_pattern);
 	}

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 "440cba203"
-#define DUCKDB_VERSION "v0.3.3-dev977"
+#define DUCKDB_SOURCE_ID "ae38c6025"
+#define DUCKDB_VERSION "v0.3.3-dev993"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -1970,7 +1970,8 @@ public:
 	DUCKDB_API static string ExtractBaseName(const string &path);
 
 	//! Runs a glob on the file system, returning a list of matching files
-	DUCKDB_API virtual vector<string> Glob(const string &path);
+	DUCKDB_API virtual vector<string> Glob(const string &path, FileOpener *opener = nullptr);
+	DUCKDB_API virtual vector<string> Glob(const string &path, ClientContext &context);
 
 	//! registers a sub-file system to handle certain file name prefixes, e.g. http:// etc.
 	DUCKDB_API virtual void RegisterSubSystem(unique_ptr<FileSystem> sub_fs);