@malloydata/db-duckdb 0.0.29-dev230329215340 → 0.0.29-dev230330224139

package/dist/duckdb_connection.d.ts

@@ -11,6 +11,7 @@ export declare class DuckDBConnection extends DuckDBCommon {
     protected isSetup: Promise<void> | undefined;
     constructor(name: string, databasePath?: string, workingDirectory?: string, queryOptions?: QueryOptionsReader);
     private init;
+    loadExtension(ext: string): Promise<void>;
     protected setup(): Promise<void>;
     protected runDuckDBQuery(sql: string): Promise<{
         rows: Row[];

package/dist/duckdb_connection.js

@@ -52,26 +52,23 @@ class DuckDBConnection extends duckdb_common_1.DuckDBCommon {
             resolve();
         });
     }
+    async loadExtension(ext) {
+        try {
+            await this.runDuckDBQuery(`INSTALL '${ext}'`);
+            await this.runDuckDBQuery(`LOAD '${ext}'`);
+        }
+        catch (error) {
+            // eslint-disable-next-line no-console
+            console.error('Unable to load ${ext} extension', error);
+        }
+    }
     async setup() {
         const doSetup = async () => {
             if (this.workingDirectory) {
                 await this.runDuckDBQuery(`SET FILE_SEARCH_PATH='${this.workingDirectory}'`);
             }
-            try {
-                await this.runDuckDBQuery("INSTALL 'json'");
-                await this.runDuckDBQuery("LOAD 'json'");
-            }
-            catch (error) {
-                // eslint-disable-next-line no-console
-                console.error('Unable to load json extension', error);
-            }
-            try {
-                await this.runDuckDBQuery("INSTALL 'httpfs'");
-                await this.runDuckDBQuery("LOAD 'httpfs'");
-            }
-            catch (error) {
-                // eslint-disable-next-line no-console
-                console.error('Unable to load httpfs extension', error);
+            for (const ext of ['json', 'httpfs', 'icu']) {
+                await this.loadExtension(ext);
             }
         };
         await this.connecting;

package/dist/duckdb_wasm_connection.d.ts

@@ -1,5 +1,5 @@
-import * as duckdb from '@duckdb/duckdb-wasm';
-import { QueryDataRow, RunSQLOptions, StructDef } from '@malloydata/malloy';
+import * as duckdb from '@malloydata/duckdb-wasm';
+import { QueryDataRow, RunSQLOptions, StructDef, SQLBlock } from '@malloydata/malloy';
 import { DuckDBCommon, QueryOptionsReader } from './duckdb_common';
 declare type RemoteFileCallback = (tableName: string) => Promise<Uint8Array | undefined>;
 export declare abstract class DuckDBWASMConnection extends DuckDBCommon {
@@ -24,7 +24,15 @@ export declare abstract class DuckDBWASMConnection extends DuckDBCommon {
         totalRows: number;
     }>;
     runSQLStream(sql: string, _options?: RunSQLOptions): AsyncIterableIterator<QueryDataRow>;
-    fetchSchemaForTables(tables: string[]): Promise<{
+    private findTables;
+    fetchSchemaForSQLBlock(sqlRef: SQLBlock): Promise<{
+        structDef: StructDef;
+        error?: undefined;
+    } | {
+        error: string;
+        structDef?: undefined;
+    }>;
+    fetchSchemaForTables(tableUris: string[]): Promise<{
         schemas: Record<string, StructDef>;
         errors: Record<string, string>;
     }>;

package/dist/duckdb_wasm_connection.js

@@ -49,11 +49,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DuckDBWASMConnection = void 0;
-const duckdb = __importStar(require("@duckdb/duckdb-wasm"));
+const duckdb = __importStar(require("@malloydata/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;
 /**
  * Arrow's toJSON() doesn't really do what I'd expect, since
  * it still includes Arrow objects like DecimalBigNums and Vectors,
@@ -201,7 +202,7 @@ class DuckDBWASMConnection extends duckdb_common_1.DuckDBCommon {
             }
         }
     }
-    async fetchSchemaForTables(tables) {
+    async findTables(tables) {
         const fetchRemoteFile = async (tablePath) => {
             var _a;
             for (const callback of this.remoteFileCallbacks) {
@@ -214,8 +215,7 @@ class DuckDBWASMConnection extends duckdb_common_1.DuckDBCommon {
             return true;
         };
         await this.setup();
-        for (const tableUri of tables) {
-            const { tablePath } = (0, malloy_1.parseTableURI)(tableUri);
+        for (const tablePath of tables) {
             // http and s3 urls are handled by duckdb-wasm
             if (tablePath.match(/^https?:\/\//)) {
                 continue;
@@ -230,7 +230,22 @@ class DuckDBWASMConnection extends duckdb_common_1.DuckDBCommon {
             // Wait for response
             await this.remoteFileStatus[tablePath];
         }
-        return super.fetchSchemaForTables(tables);
+    }
+    async fetchSchemaForSQLBlock(sqlRef) {
+        const tables = [];
+        for (const match of sqlRef.selectStr.matchAll(TABLE_MATCH)) {
+            tables.push(match[1]);
+        }
+        await this.findTables(tables);
+        return super.fetchSchemaForSQLBlock(sqlRef);
+    }
+    async fetchSchemaForTables(tableUris) {
+        const tables = tableUris.map(tableUri => {
+            const { tablePath } = (0, malloy_1.parseTableURI)(tableUri);
+            return tablePath;
+        });
+        await this.findTables(tables);
+        return super.fetchSchemaForTables(tableUris);
     }
     async close() {
         if (this._connection) {

package/dist/duckdb_wasm_connection_browser.d.ts

@@ -1,4 +1,4 @@
-import * as duckdb from '@duckdb/duckdb-wasm';
+import * as duckdb from '@malloydata/duckdb-wasm';
 import { DuckDBWASMConnection as DuckDBWASMConnectionBase } from './duckdb_wasm_connection';
 export declare class DuckDBWASMConnection extends DuckDBWASMConnectionBase {
     getBundles(): duckdb.DuckDBBundles;

package/dist/duckdb_wasm_connection_browser.js

@@ -46,7 +46,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DuckDBWASMConnection = void 0;
-const duckdb = __importStar(require("@duckdb/duckdb-wasm"));
+const duckdb = __importStar(require("@malloydata/duckdb-wasm"));
 const duckdb_wasm_connection_1 = require("./duckdb_wasm_connection");
 class DuckDBWASMConnection extends duckdb_wasm_connection_1.DuckDBWASMConnection {
     getBundles() {

package/dist/duckdb_wasm_connection_node.d.ts

@@ -1,4 +1,4 @@
-import { DuckDBBundles } from '@duckdb/duckdb-wasm';
+import { DuckDBBundles } from '@malloydata/duckdb-wasm';
 import { DuckDBWASMConnection as DuckDBWASMConnectionBase } from './duckdb_wasm_connection';
 export declare class DuckDBWASMConnection extends DuckDBWASMConnectionBase {
     getBundles(): DuckDBBundles;

package/dist/duckdb_wasm_connection_node.js

@@ -30,13 +30,13 @@ const crypto_1 = __importDefault(require("crypto"));
 const duckdb_wasm_connection_1 = require("./duckdb_wasm_connection");
 class DuckDBWASMConnection extends duckdb_wasm_connection_1.DuckDBWASMConnection {
     getBundles() {
-        const resolvePath = require.resolve('@duckdb/duckdb-wasm');
+        const resolvePath = require.resolve('@malloydata/duckdb-wasm');
         if (!resolvePath) {
-            throw new Error('Unable to resolve @duckdb/duckdb-wasm path');
+            throw new Error('Unable to resolve @malloydata/duckdb-wasm path');
         }
         const distMatch = resolvePath.match(/^.*\/dist\//);
         if (!distMatch) {
-            throw new Error('Unable to resolve @duckdb/duckdb-wasm dist path');
+            throw new Error('Unable to resolve @malloydata/duckdb-wasm dist path');
         }
         const dist = distMatch[0];
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-duckdb",
-  "version": "0.0.29-dev230329215340",
+  "version": "0.0.29-dev230330224139",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -40,8 +40,8 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@duckdb/duckdb-wasm": "1.24.0",
-    "@malloydata/malloy": "^0.0.29-dev230329215340",
+    "@malloydata/duckdb-wasm": "0.0.1",
+    "@malloydata/malloy": "^0.0.29-dev230330224139",
     "apache-arrow": "^11.0.0",
     "duckdb": "0.7.1",
     "web-worker": "^1.2.0"