duckdb 0.3.5-dev1330.0 → 0.3.5-dev1350.0

package/package.json

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

package/src/duckdb.cpp

@@ -551,6 +551,9 @@ struct ClientData {
 	//! The file opener of the client context
 	unique_ptr<FileOpener> file_opener;
 
+	//! The file search path
+	string file_search_path;
+
 public:
 	DUCKDB_API static ClientData &Get(ClientContext &context);
 };
@@ -17235,6 +17238,31 @@ private:
 
 
 
+//===----------------------------------------------------------------------===//
+//                         DuckDB
+//
+// duckdb/common/file_opener.hpp
+//
+//
+//===----------------------------------------------------------------------===//
+
+
+
+
+
+namespace duckdb {
+
+class Value;
+
+//! Abstract type that provide client-specific context to FileSystem.
+class FileOpener {
+public:
+	virtual ~FileOpener() {};
+
+	virtual bool TryGetCurrentSetting(const string &key, Value &result) = 0;
+};
+
+} // namespace duckdb
 
 
 
@@ -17283,8 +17311,9 @@ public:
 
 } // namespace duckdb
 
-#include <string>
+
 #include <io.h>
+#include <string>
 
 #ifdef __MINGW32__
 #include <sys/stat.h>
@@ -18126,15 +18155,6 @@ vector<string> LocalFileSystem::Glob(const string &path, FileOpener *opener) {
 	if (path.empty()) {
 		return vector<string>();
 	}
-	// first check if the path has a glob at all
-	if (!HasGlob(path)) {
-		// no glob: return only the file (if it exists or is a pipe)
-		vector<string> result;
-		if (FileExists(path) || IsPipe(path)) {
-			result.push_back(path);
-		}
-		return result;
-	}
 	// split up the path into separate chunks
 	vector<string> splits;
 	idx_t last_pos = 0;
@@ -18170,6 +18190,27 @@ vector<string> LocalFileSystem::Glob(const string &path, FileOpener *opener) {
 			splits[0] = home_directory;
 		}
 	}
+	// Check if the path has a glob at all
+	if (!HasGlob(path)) {
+		// no glob: return only the file (if it exists or is a pipe)
+		vector<string> result;
+		if (FileExists(path) || IsPipe(path)) {
+			result.push_back(path);
+		} else if (!absolute_path) {
+			Value value;
+			if (opener->TryGetCurrentSetting("file_search_path", value)) {
+				auto search_paths_str = value.ToString();
+				std::vector<std::string> search_paths = StringUtil::Split(search_paths_str, ',');
+				for (const auto &search_path : search_paths) {
+					auto joined_path = JoinPath(search_path, path);
+					if (FileExists(joined_path) || IsPipe(joined_path)) {
+						result.push_back(joined_path);
+					}
+				}
+			}
+		}
+		return result;
+	}
 	vector<string> previous_directories;
 	if (absolute_path) {
 		// for absolute paths, we don't start by scanning the current directory
@@ -114584,32 +114625,8 @@ bool duckdb_value_is_null(duckdb_result *result, idx_t col, idx_t row) {
 
 
 
-//===----------------------------------------------------------------------===//
-//                         DuckDB
-//
-// duckdb/common/file_opener.hpp
-//
-//
-//===----------------------------------------------------------------------===//
-
-
-
 
 
-namespace duckdb {
-
-class Value;
-
-//! Abstract type that provide client-specific context to FileSystem.
-class FileOpener {
-public:
-	virtual ~FileOpener() {};
-
-	virtual bool TryGetCurrentSetting(const string &key, Value &result) = 0;
-};
-
-} // namespace duckdb
-
 namespace duckdb {
 
 class ClientContext;
@@ -116180,6 +116197,7 @@ RandomEngine &RandomEngine::Get(ClientContext &context) {
 
 
 
+
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -116343,6 +116361,14 @@ struct ExternalThreadsSetting {
 	static Value GetSetting(ClientContext &context);
 };
 
+struct FileSearchPathSetting {
+	static constexpr const char *Name = "file_search_path";
+	static constexpr const char *Description = "A comma separated list of directories to search for input files";
+	static constexpr const LogicalTypeId InputType = LogicalTypeId::VARCHAR;
+	static void SetLocal(ClientContext &context, const Value &parameter);
+	static Value GetSetting(ClientContext &context);
+};
+
 struct ForceCompressionSetting {
 	static constexpr const char *Name = "force_compression";
 	static constexpr const char *Description = "DEBUG SETTING: forces a specific compression method to be used";
@@ -116512,6 +116538,7 @@ static ConfigurationOption internal_options[] = {DUCKDB_GLOBAL(AccessModeSetting
                                                  DUCKDB_LOCAL(EnableProgressBarSetting),
                                                  DUCKDB_LOCAL(ExplainOutputSetting),
                                                  DUCKDB_GLOBAL(ExternalThreadsSetting),
+                                                 DUCKDB_LOCAL(FileSearchPathSetting),
                                                  DUCKDB_GLOBAL(ForceCompressionSetting),
                                                  DUCKDB_LOCAL(LogQueryPathSetting),
                                                  DUCKDB_LOCAL(MaximumExpressionDepthSetting),
@@ -130089,6 +130116,20 @@ Value ExternalThreadsSetting::GetSetting(ClientContext &context) {
 	return Value::BIGINT(config.external_threads);
 }
 
+//===--------------------------------------------------------------------===//
+// File Search Path
+//===--------------------------------------------------------------------===//
+void FileSearchPathSetting::SetLocal(ClientContext &context, const Value &input) {
+	auto parameter = input.ToString();
+	auto &client_data = ClientData::Get(context);
+	client_data.file_search_path = parameter;
+}
+
+Value FileSearchPathSetting::GetSetting(ClientContext &context) {
+	auto &client_data = ClientData::Get(context);
+	return Value(client_data.file_search_path);
+}
+
 //===--------------------------------------------------------------------===//
 // Force Compression
 //===--------------------------------------------------------------------===//

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 "c981f010b"
-#define DUCKDB_VERSION "v0.3.5-dev1330"
+#define DUCKDB_SOURCE_ID "a1cf1352d"
+#define DUCKDB_VERSION "v0.3.5-dev1350"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //