duckdb 0.5.2-dev870.0 → 0.5.2-dev874.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "duckdb",
3
3
  "main": "./lib/duckdb.js",
4
- "version": "0.5.2-dev870.0",
4
+ "version": "0.5.2-dev874.0",
5
5
  "description": "DuckDB node.js API",
6
6
  "gypfile": true,
7
7
  "dependencies": {
package/src/duckdb.cpp CHANGED
@@ -21126,7 +21126,7 @@ vector<string> LocalFileSystem::FetchFileWithoutGlob(const string &path, FileOpe
21126
21126
  result.push_back(path);
21127
21127
  } else if (!absolute_path) {
21128
21128
  Value value;
21129
- if (opener->TryGetCurrentSetting("file_search_path", value)) {
21129
+ if (opener && opener->TryGetCurrentSetting("file_search_path", value)) {
21130
21130
  auto search_paths_str = value.ToString();
21131
21131
  std::vector<std::string> search_paths = StringUtil::Split(search_paths_str, ',');
21132
21132
  for (const auto &search_path : search_paths) {
@@ -21192,7 +21192,18 @@ vector<string> LocalFileSystem::Glob(const string &path, FileOpener *opener) {
21192
21192
  if (absolute_path) {
21193
21193
  // for absolute paths, we don't start by scanning the current directory
21194
21194
  previous_directories.push_back(splits[0]);
21195
+ } else {
21196
+ // If file_search_path is set, use those paths as the first glob elements
21197
+ Value value;
21198
+ if (opener && opener->TryGetCurrentSetting("file_search_path", value)) {
21199
+ auto search_paths_str = value.ToString();
21200
+ std::vector<std::string> search_paths = StringUtil::Split(search_paths_str, ',');
21201
+ for (const auto &search_path : search_paths) {
21202
+ previous_directories.push_back(search_path);
21203
+ }
21204
+ }
21195
21205
  }
21206
+
21196
21207
  for (idx_t i = absolute_path ? 1 : 0; i < splits.size(); i++) {
21197
21208
  bool is_last_chunk = i + 1 == splits.size();
21198
21209
  bool has_glob = HasGlob(splits[i]);
package/src/duckdb.hpp CHANGED
@@ -11,8 +11,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
11
11
  #pragma once
12
12
  #define DUCKDB_AMALGAMATION 1
13
13
  #define DUCKDB_AMALGAMATION_EXTENDED 1
14
- #define DUCKDB_SOURCE_ID "b67e10e8d"
15
- #define DUCKDB_VERSION "v0.5.2-dev870"
14
+ #define DUCKDB_SOURCE_ID "0eaaab7fb"
15
+ #define DUCKDB_VERSION "v0.5.2-dev874"
16
16
  //===----------------------------------------------------------------------===//
17
17
  // DuckDB
18
18
  //