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

package/dist/duckdb_wasm_connection.d.ts

@@ -1,5 +1,5 @@
 import * as duckdb from '@malloydata/duckdb-wasm';
-import { QueryDataRow, RunSQLOptions, StructDef } from '@malloydata/malloy';
+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

@@ -54,6 +54,7 @@ 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-duckdb",
-  "version": "0.0.29-dev230330180545",
+  "version": "0.0.29-dev230330224139",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@malloydata/duckdb-wasm": "0.0.1",
-    "@malloydata/malloy": "^0.0.29-dev230330180545",
+    "@malloydata/malloy": "^0.0.29-dev230330224139",
     "apache-arrow": "^11.0.0",
     "duckdb": "0.7.1",
     "web-worker": "^1.2.0"