duckdb 0.5.2-dev870.0 → 0.5.2-dev878.0

package/.mocharc.json

@@ -0,0 +1,5 @@
+{
+  "extension": ["js", "ts"],
+  "spec": ["test/*.js", "test/*.ts"],
+  "require": "ts-node/register"
+}

package/lib/duckdb.d.ts

@@ -0,0 +1,94 @@
+/**
+ * TypeScript declarations for Node.JS bindings for DuckDb.
+ * See https://duckdb.org/docs/api/nodejs/overview for details
+ * on Node.JS API
+ */
+export class DuckDbError extends Error {
+  errno: number;
+  code: string;
+}
+
+type Callback<T> = (err: DuckDbError | null, res: T) => void;
+
+export type RowData = {
+  [columnName: string]: any;
+};
+
+export type TableData = RowData[];
+
+export class Connection {
+  constructor(db: Database, callback?: Callback<any>);
+
+  all(sql: string, ...args: [...any, Callback<TableData>] | []): void;
+  each(sql: string, ...args: [...any, Callback<RowData>] | []): void;
+  exec(sql: string, ...args: [...any, Callback<void>] | []): void;
+
+  prepare(sql: string, ...args: [...any, Callback<Statement>] | []): Statement;
+  run(sql: string, ...args: [...any, Callback<void>] | []): Statement;
+
+  register(
+    name: string,
+    return_type: string,
+    fun: (...args: any[]) => any
+  ): void;
+
+  register_bulk(
+    name: string,
+    return_type: string,
+    fun: (...args: any[]) => any
+  ): void;
+  unregister(name: string, callback: Callback<any>): void;
+
+  stream(sql: any, ...args: any[]): QueryResult;
+}
+
+export class QueryResult {
+  [Symbol.asyncIterator](): AsyncIterator<RowData>;
+}
+
+export class Database {
+  constructor(path: string, callback?: Callback<any>);
+
+  close(callback: Callback<void>): void;
+
+  connect(): Connection;
+
+  all(sql: string, ...args: [...any, Callback<TableData>] | []): void;
+  each(sql: string, ...args: [...any, Callback<RowData>] | []): void;
+  exec(sql: string, ...args: [...any, Callback<void>] | []): void;
+
+  prepare(sql: string, ...args: [...any, Callback<Statement>] | []): Statement;
+  run(sql: string, ...args: [...any, Callback<void>] | []): Statement;
+
+  register(
+    name: string,
+    return_type: string,
+    fun: (...args: any[]) => any
+  ): void;
+  unregister(name: string, callback: Callback<any>): void;
+}
+
+export class Statement {
+  constructor();
+
+  all(...args: [...any, Callback<TableData>] | []): void;
+  each(...args: [...any, Callback<RowData>] | []): void;
+
+  finalize(callback?: Callback<void>): void;
+
+  run(...args: [...any, Callback<void>] | []): Statement;
+}
+
+export const ERROR: number;
+
+export const OPEN_CREATE: number;
+
+export const OPEN_FULLMUTEX: number;
+
+export const OPEN_PRIVATECACHE: number;
+
+export const OPEN_READONLY: number;
+
+export const OPEN_READWRITE: number;
+
+export const OPEN_SHAREDCACHE: number;

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "duckdb",
   "main": "./lib/duckdb.js",
-  "version": "0.5.2-dev870.0",
+  "types": "./lib/duckdb.d.ts",
+  "version": "0.5.2-dev878.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {
@@ -25,15 +26,25 @@
     "test": "test"
   },
   "devDependencies": {
+    "@types/mocha": "^10.0.0",
+    "@types/node": "^18.11.0",
     "aws-sdk": "^2.790.0",
     "chai": "^4.3.6",
     "jsdoc3-parser": "^2.0.0",
-    "mocha": "^8.3.0"
+    "mocha": "^8.3.0",
+    "ts-node": "^10.9.1",
+    "tsconfig-paths": "^4.0.0",
+    "typescript": "^4.8.4"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cwida/duckdb.git"
   },
+  "ts-node": {
+    "require": [
+      "tsconfig-paths/register"
+    ]
+  },
   "keywords": [
     "database",
     "sql",

package/src/duckdb.cpp

@@ -21126,7 +21126,7 @@ vector<string> LocalFileSystem::FetchFileWithoutGlob(const string &path, FileOpe
 		result.push_back(path);
 	} else if (!absolute_path) {
 		Value value;
-		if (opener->TryGetCurrentSetting("file_search_path", value)) {
+		if (opener && 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) {
@@ -21192,7 +21192,18 @@ vector<string> LocalFileSystem::Glob(const string &path, FileOpener *opener) {
 	if (absolute_path) {
 		// for absolute paths, we don't start by scanning the current directory
 		previous_directories.push_back(splits[0]);
+	} else {
+		// If file_search_path is set, use those paths as the first glob elements
+		Value value;
+		if (opener && 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) {
+				previous_directories.push_back(search_path);
+			}
+		}
 	}
+
 	for (idx_t i = absolute_path ? 1 : 0; i < splits.size(); i++) {
 		bool is_last_chunk = i + 1 == splits.size();
 		bool has_glob = HasGlob(splits[i]);