@malloydata/db-duckdb 0.0.48 → 0.0.49-dev230626192330

package/dist/duckdb_common.d.ts

@@ -48,7 +48,7 @@ export declare abstract class DuckDBCommon implements TestableConnection, Persis
         error: string;
         structDef?: undefined;
     }>;
-    fetchSchemaForTables(tables: string[]): Promise<{
+    fetchSchemaForTables(tables: Record<string, string>): Promise<{
         schemas: Record<string, StructDef>;
         errors: Record<string, string>;
     }>;

package/dist/duckdb_common.js

@@ -23,7 +23,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DuckDBCommon = void 0;
-const malloy_1 = require("@malloydata/malloy");
 const duckDBToMalloyTypes = {
     'BIGINT': 'number',
     'INTEGER': 'number',
@@ -266,33 +265,33 @@ class DuckDBCommon {
     async fetchSchemaForTables(tables) {
         const schemas = {};
         const errors = {};
-        for (const tableURL of tables) {
-            let inCache = this.schemaCache.get(tableURL);
+        for (const tableKey in tables) {
+            let inCache = this.schemaCache.get(tableKey);
             if (!inCache) {
+                const tablePath = tables[tableKey];
                 try {
                     inCache = {
-                        schema: await this.getTableSchema(tableURL),
+                        schema: await this.getTableSchema(tableKey, tablePath),
                     };
-                    this.schemaCache.set(tableURL, inCache);
+                    this.schemaCache.set(tableKey, inCache);
                 }
                 catch (error) {
                     inCache = { error: error.message };
                 }
             }
             if (inCache.schema !== undefined) {
-                schemas[tableURL] = inCache.schema;
+                schemas[tableKey] = inCache.schema;
             }
             else {
-                errors[tableURL] = inCache.error || 'Unknown schema fetch error';
+                errors[tableKey] = inCache.error || 'Unknown schema fetch error';
             }
         }
         return { schemas, errors };
     }
-    async getTableSchema(tableURL) {
-        const { tablePath } = (0, malloy_1.parseTableURI)(tableURL);
+    async getTableSchema(tableKey, tablePath) {
         const structDef = {
             type: 'struct',
-            name: tablePath,
+            name: tableKey,
             dialect: 'duckdb',
             structSource: { type: 'table', tablePath },
             structRelationship: {

package/dist/duckdb_wasm_connection.d.ts

@@ -33,7 +33,7 @@ export declare abstract class DuckDBWASMConnection extends DuckDBCommon {
         error: string;
         structDef?: undefined;
     }>;
-    fetchSchemaForTables(tableUris: string[]): Promise<{
+    fetchSchemaForTables(missing: Record<string, string>): Promise<{
         schemas: Record<string, StructDef>;
         errors: Record<string, string>;
     }>;

package/dist/duckdb_wasm_connection.js

@@ -51,7 +51,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DuckDBWASMConnection = void 0;
 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;
@@ -267,13 +266,10 @@ class DuckDBWASMConnection extends duckdb_common_1.DuckDBCommon {
         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;
-        });
+    async fetchSchemaForTables(missing) {
+        const tables = Object.values(missing);
         await this.findTables(tables);
-        return super.fetchSchemaForTables(tableUris);
+        return super.fetchSchemaForTables(missing);
     }
     async close() {
         if (this._connection) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-duckdb",
-  "version": "0.0.48",
+  "version": "0.0.49-dev230626192330",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -41,7 +41,7 @@
   },
   "dependencies": {
     "@malloydata/duckdb-wasm": "0.0.2",
-    "@malloydata/malloy": "^0.0.48",
+    "@malloydata/malloy": "^0.0.49-dev230626192330",
     "apache-arrow": "^11.0.0",
     "duckdb": "0.8.1",
     "web-worker": "^1.2.0"