@malloydata/db-duckdb 0.0.335 → 0.0.336

package/dist/duckdb_common.d.ts

@@ -15,6 +15,7 @@ export declare abstract class DuckDBCommon extends BaseConnection implements Tes
     constructor(queryOptions?: QueryOptionsReader | undefined);
     isPool(): this is PooledConnection;
     canPersist(): this is PersistSQLResults;
+    abstract getDigest(): string;
     protected abstract setup(): Promise<void>;
     protected abstract runDuckDBQuery(sql: string): Promise<{
         rows: QueryDataRow[];

package/dist/duckdb_connection.d.ts

@@ -26,6 +26,7 @@ export declare class DuckDBConnection extends DuckDBCommon {
     static activeDBs: Record<string, ActiveDB>;
     constructor(options: DuckDBConnectionOptions, queryOptions?: QueryOptionsReader);
     constructor(name: string, databasePath?: string, workingDirectory?: string, queryOptions?: QueryOptionsReader);
+    getDigest(): string;
     private init;
     loadExtension(ext: string): Promise<void>;
     protected setup(): Promise<void>;
@@ -36,5 +37,10 @@ export declare class DuckDBConnection extends DuckDBCommon {
     runSQLStream(sql: string, { rowLimit, abortSignal }?: RunSQLOptions): AsyncIterableIterator<QueryDataRow>;
     createHash(sqlCommand: string): Promise<string>;
     close(): Promise<void>;
+    /**
+     * Forcefully close all cached DuckDB instances. Useful for test cleanup
+     * to release file locks between test runs.
+     */
+    static closeAllInstances(): void;
 }
 export {};

package/dist/duckdb_connection.js

@@ -26,9 +26,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DuckDBConnection = void 0;
-const crypto_1 = __importDefault(require("crypto"));
 const duckdb_common_1 = require("./duckdb_common");
 const node_api_1 = require("@duckdb/node-api");
+const malloy_1 = require("@malloydata/malloy");
 const package_json_1 = __importDefault(require("@malloydata/malloy/package.json"));
 class DuckDBConnection extends duckdb_common_1.DuckDBCommon {
     constructor(arg, arg2, workingDirectory, queryOptions) {
@@ -79,6 +79,10 @@ class DuckDBConnection extends duckdb_common_1.DuckDBCommon {
                 this.databasePath.startsWith('motherduck:');
         this.connecting = this.init();
     }
+    getDigest() {
+        const data = `duckdb:${this.databasePath}:${this.workingDirectory}`;
+        return (0, malloy_1.makeDigest)(data);
+    }
     async init() {
         try {
             if (this.databasePath in DuckDBConnection.activeDBs) {
@@ -202,7 +206,7 @@ class DuckDBConnection extends duckdb_common_1.DuckDBCommon {
         }
     }
     async createHash(sqlCommand) {
-        return crypto_1.default.createHash('md5').update(sqlCommand).digest('hex');
+        return (0, malloy_1.makeDigest)(sqlCommand);
     }
     async close() {
         const activeDB = DuckDBConnection.activeDBs[this.databasePath];
@@ -214,6 +218,21 @@ class DuckDBConnection extends duckdb_common_1.DuckDBCommon {
             }
         }
     }
+    /**
+     * Forcefully close all cached DuckDB instances. Useful for test cleanup
+     * to release file locks between test runs.
+     */
+    static closeAllInstances() {
+        for (const path of Object.keys(DuckDBConnection.activeDBs)) {
+            try {
+                DuckDBConnection.activeDBs[path].instance.closeSync();
+            }
+            catch {
+                // Ignore errors during cleanup
+            }
+        }
+        DuckDBConnection.activeDBs = {};
+    }
 }
 exports.DuckDBConnection = DuckDBConnection;
 DuckDBConnection.activeDBs = {};

package/dist/duckdb_wasm_connection.d.ts

@@ -23,6 +23,7 @@ export declare abstract class DuckDBWASMConnection extends DuckDBCommon {
     private remoteFileStatus;
     constructor(options: DuckDBWasmOptions, queryOptions?: QueryOptionsReader);
     constructor(name: string, databasePath?: string | null, workingDirectory?: string, queryOptions?: QueryOptionsReader);
+    getDigest(): string;
     protected init(): Promise<void>;
     abstract getBundles(): duckdb.DuckDBBundles;
     get connection(): duckdb.AsyncDuckDBConnection | null;

package/dist/duckdb_wasm_connection.js

@@ -61,6 +61,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DuckDBWASMConnection = void 0;
 const duckdb = __importStar(require("@duckdb/duckdb-wasm"));
 const web_worker_1 = __importDefault(require("web-worker"));
+const malloy_1 = require("@malloydata/malloy");
 const apache_arrow_1 = require("apache-arrow");
 const duckdb_common_1 = require("./duckdb_common");
 const TABLE_MATCH = /FROM\s*('([^']*)'|"([^"]*)")/gi;
@@ -275,6 +276,10 @@ class DuckDBWASMConnection extends duckdb_common_1.DuckDBCommon {
                 false;
         this.connecting = this.init();
     }
+    getDigest() {
+        var _a;
+        return (0, malloy_1.makeDigest)('duckdb-wasm', (_a = this.databasePath) !== null && _a !== void 0 ? _a : ':memory:', this.workingDirectory);
+    }
     async init() {
         // Select a bundle based on browser checks
         const bundle = await duckdb.selectBundle(this.getBundles());

package/dist/duckdb_wasm_connection_browser.js

@@ -59,6 +59,7 @@ exports.DuckDBWASMConnection = void 0;
 const duckdb = __importStar(require("@duckdb/duckdb-wasm"));
 const duckdb_wasm_connection_1 = require("./duckdb_wasm_connection");
 const wasm_client_1 = require("@motherduck/wasm-client");
+const malloy_1 = require("@malloydata/malloy");
 function unwrapMotherDuck(value) {
     let result = null;
     if (value !== null && typeof value === 'object') {
@@ -198,13 +199,7 @@ class DuckDBWASMConnection extends duckdb_wasm_connection_1.DuckDBWASMConnection
         }
     }
     async createHash(sqlCommand) {
-        const msgUint8 = new TextEncoder().encode(sqlCommand);
-        const hashBuffer = await crypto.subtle.digest('SHA-256', msgUint8);
-        const hashArray = Array.from(new Uint8Array(hashBuffer));
-        const hashHex = hashArray
-            .map(b => b.toString(16).padStart(2, '0'))
-            .join('');
-        return hashHex;
+        return (0, malloy_1.makeDigest)(sqlCommand);
     }
 }
 exports.DuckDBWASMConnection = DuckDBWASMConnection;

package/dist/duckdb_wasm_connection_node.js

@@ -21,13 +21,10 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DuckDBWASMConnection = void 0;
-const crypto_1 = __importDefault(require("crypto"));
 const duckdb_wasm_connection_1 = require("./duckdb_wasm_connection");
+const malloy_1 = require("@malloydata/malloy");
 class DuckDBWASMConnection extends duckdb_wasm_connection_1.DuckDBWASMConnection {
     getBundles() {
         const resolvePath = require.resolve('@duckdb/duckdb-wasm');
@@ -51,7 +48,7 @@ class DuckDBWASMConnection extends duckdb_wasm_connection_1.DuckDBWASMConnection
         };
     }
     async createHash(sqlCommand) {
-        return crypto_1.default.createHash('md5').update(sqlCommand).digest('hex');
+        return (0, malloy_1.makeDigest)(sqlCommand);
     }
 }
 exports.DuckDBWASMConnection = DuckDBWASMConnection;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-duckdb",
-  "version": "0.0.335",
+  "version": "0.0.336",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -46,7 +46,7 @@
   "dependencies": {
     "@duckdb/duckdb-wasm": "1.33.1-dev13.0",
     "@duckdb/node-api": "1.4.3-r.1",
-    "@malloydata/malloy": "0.0.335",
+    "@malloydata/malloy": "0.0.336",
     "@motherduck/wasm-client": "^0.6.6",
     "apache-arrow": "^17.0.0",
     "web-worker": "^1.3.0"