Merge pull request #59 from duckdb/jray/default-duckdb-api-config

default duckdb_api config
duckdb · Dec 12, 2024 · 38c9273 · 38c9273
2 parents e22ace1 + aa2b7b7
commit 38c9273
Show file tree

Hide file tree

Showing 4 changed files with 103 additions and 16 deletions.
diff --git a/api/src/DuckDBInstance.ts b/api/src/DuckDBInstance.ts
@@ -10,16 +10,16 @@ export class DuckDBInstance {
     path?: string,
     options?: Record<string, string>
   ): Promise<DuckDBInstance> {
+    const config = duckdb.create_config();
+    // Set the default duckdb_api value for the api. Can be overridden.
+    duckdb.set_config(config, 'duckdb_api', 'node-neo-api');
     if (options) {
-      const config = duckdb.create_config();
       for (const optionName in options) {
         const optionValue = String(options[optionName]);
         duckdb.set_config(config, optionName, optionValue);
       }
-      return new DuckDBInstance(await duckdb.open(path, config));
-    } else {
-      return new DuckDBInstance(await duckdb.open(path));
     }
+    return new DuckDBInstance(await duckdb.open(path, config));
   }
   public async connect(): Promise<DuckDBConnection> {
     return new DuckDBConnection(await duckdb.connect(this.db));

diff --git a/api/test/api.test.ts b/api/test/api.test.ts
@@ -973,4 +973,34 @@ describe('api', () => {
       assert.deepEqual(rows[4999], [4999, 14999]);
     });
   });
+  test('default duckdb_api without explicit options', async () => {
+    const instance = await DuckDBInstance.create();
+    const connection = await instance.connect();
+    const result = await connection.run(`select current_setting('duckdb_api') as duckdb_api`);
+    assertColumns(result, [{ name: 'duckdb_api', type: DuckDBVarCharType.instance }]);
+    const chunk = await result.fetchChunk();
+    assert.strictEqual(chunk.columnCount, 1);
+    assert.strictEqual(chunk.rowCount, 1);
+    assertValues<string, DuckDBVarCharVector>(chunk, 0, DuckDBVarCharVector, ['node-neo-api']);
+  });
+  test('default duckdb_api with explicit options', async () => {
+    const instance = await DuckDBInstance.create(undefined, {});
+    const connection = await instance.connect();
+    const result = await connection.run(`select current_setting('duckdb_api') as duckdb_api`);
+    assertColumns(result, [{ name: 'duckdb_api', type: DuckDBVarCharType.instance }]);
+    const chunk = await result.fetchChunk();
+    assert.strictEqual(chunk.columnCount, 1);
+    assert.strictEqual(chunk.rowCount, 1);
+    assertValues<string, DuckDBVarCharVector>(chunk, 0, DuckDBVarCharVector, ['node-neo-api']);
+  });
+  test('overriding duckdb_api', async () => {
+    const instance = await DuckDBInstance.create(undefined, { 'duckdb_api': 'custom-duckdb-api' });
+    const connection = await instance.connect();
+    const result = await connection.run(`select current_setting('duckdb_api') as duckdb_api`);
+    assertColumns(result, [{ name: 'duckdb_api', type: DuckDBVarCharType.instance }]);
+    const chunk = await result.fetchChunk();
+    assert.strictEqual(chunk.columnCount, 1);
+    assert.strictEqual(chunk.rowCount, 1);
+    assertValues<string, DuckDBVarCharVector>(chunk, 0, DuckDBVarCharVector, ['custom-duckdb-api']);
+  });
 });
diff --git a/bindings/src/duckdb_node_bindings.cpp b/bindings/src/duckdb_node_bindings.cpp
@@ -9,6 +9,8 @@
 
 #include "duckdb.h"
 
+#define DEFAULT_DUCKDB_API "node-neo-bindings"
+
 // Conversion betweeen structs and objects
 
 Napi::Object MakeDateObject(Napi::Env env, duckdb_date date) {
@@ -495,18 +497,25 @@ class OpenWorker : public PromiseWorker {
     if (path_) {
       path = path_->c_str();
     }
-    if (config_ != nullptr) {
-      char *error = nullptr;
-      if (duckdb_open_ext(path, &database_, config_, &error)) {
-        if (error != nullptr) {
-          SetError(error);
-          duckdb_free(error);
-        } else {
-          SetError("Failed to open");
-        }
+    duckdb_config cfg = config_;
+    // If no config was provided, create one with the default duckdb_api value.
+    if (cfg == nullptr) {
+      if (duckdb_create_config(&cfg)) {
+        duckdb_destroy_config(&cfg);
+        SetError("Failed to create config");
+        return;
+      }
+      if (duckdb_set_config(cfg, "duckdb_api", DEFAULT_DUCKDB_API)) {
+        SetError("Failed to set duckdb_api");
+        return;
       }
-    } else {
-      if (duckdb_open(path, &database_)) {
+    }
+    char *error = nullptr;
+    if (duckdb_open_ext(path, &database_, cfg, &error)) {
+      if (error != nullptr) {
+        SetError(error);
+        duckdb_free(error);
+      } else {
         SetError("Failed to open");
       }
     }
@@ -1170,6 +1179,10 @@ class DuckDBNodeAddon : public Napi::Addon<DuckDBNodeAddon> {
       duckdb_destroy_config(&config);
       throw Napi::Error::New(env, "Failed to create config");
     }
+    // Set the default duckdb_api value for the bindings. Can be overridden.
+    if (duckdb_set_config(config, "duckdb_api", DEFAULT_DUCKDB_API)) {
+      throw Napi::Error::New(env, "Failed to set duckdb_api");
+    }
     return CreateExternalForConfig(env, config);
   }
 

diff --git a/bindings/test/config.test.ts b/bindings/test/config.test.ts
@@ -1,5 +1,7 @@
 import duckdb from '@duckdb/node-bindings';
 import { expect, suite, test } from 'vitest';
+import { expectResult } from './utils/expectResult';
+import { data } from './utils/expectedVectors';
 
 suite('config', () => {
   test('config_count', () => {
@@ -13,8 +15,50 @@ suite('config', () => {
     expect(() => duckdb.get_config_flag(-1)).toThrowError(/^Config option not found$/);
   });
   test('create, set, and destroy', () => {
-    const config = duckdb.create_config()
+    const config = duckdb.create_config();
     expect(config).toBeTruthy();
     duckdb.set_config(config, 'custom_user_agent', 'my_user_agent');
   });
+  test('default duckdb_api without explicit config', async () => {
+    const db = await duckdb.open();
+    const connection = await duckdb.connect(db);
+    const result = await duckdb.query(connection, `select current_setting('duckdb_api') as duckdb_api`);
+      await expectResult(result, {
+        columns: [
+          { name: 'duckdb_api', logicalType: { typeId: duckdb.Type.VARCHAR } },
+        ],
+        chunks: [
+          { rowCount: 1, vectors: [data(16, [true], ['node-neo-bindings'])]},
+        ],
+      });
+  });
+  test('default duckdb_api with explicit config', async () => {
+    const config = duckdb.create_config();
+    const db = await duckdb.open(undefined, config);
+    const connection = await duckdb.connect(db);
+    const result = await duckdb.query(connection, `select current_setting('duckdb_api') as duckdb_api`);
+      await expectResult(result, {
+        columns: [
+          { name: 'duckdb_api', logicalType: { typeId: duckdb.Type.VARCHAR } },
+        ],
+        chunks: [
+          { rowCount: 1, vectors: [data(16, [true], ['node-neo-bindings'])]},
+        ],
+      });
+  });
+  test('overriding duckdb_api', async () => {
+    const config = duckdb.create_config();
+    duckdb.set_config(config, 'duckdb_api', 'custom-duckdb-api');
+    const db = await duckdb.open(undefined, config);
+    const connection = await duckdb.connect(db);
+    const result = await duckdb.query(connection, `select current_setting('duckdb_api') as duckdb_api`);
+      await expectResult(result, {
+        columns: [
+          { name: 'duckdb_api', logicalType: { typeId: duckdb.Type.VARCHAR } },
+        ],
+        chunks: [
+          { rowCount: 1, vectors: [data(16, [true], ['custom-duckdb-api'])]},
+        ],
+      });
+  });
 });