@malloydata/db-duckdb 0.0.15-dev221209192619 → 0.0.15-dev221209193631

package/dist/duckdb_common.d.ts

@@ -6,6 +6,8 @@ export declare type QueryOptionsReader = Partial<DuckDBQueryOptions> | (() => Pa
 export declare abstract class DuckDBCommon implements Connection, PersistSQLResults, StreamingConnection {
     private queryOptions?;
     static DEFAULT_QUERY_OPTIONS: DuckDBQueryOptions;
+    private schemaCache;
+    private sqlSchemaCache;
     readonly name: string;
     get dialectName(): string;
     private readQueryOptions;

package/dist/duckdb_common.js

@@ -28,6 +28,8 @@ const duckDBToMalloyTypes = {
 class DuckDBCommon {
     constructor(queryOptions) {
         this.queryOptions = queryOptions;
+        this.schemaCache = new Map();
+        this.sqlSchemaCache = new Map();
         this.name = "duckdb_common";
     }
     get dialectName() {
@@ -216,22 +218,42 @@ class DuckDBCommon {
         this.fillStructDefFromTypeMap(structDef, typeMap);
     }
     async fetchSchemaForSQLBlock(sqlRef) {
-        try {
-            return { structDef: await this.getSQLBlockSchema(sqlRef) };
-        }
-        catch (error) {
-            return { error: error.message };
+        const key = sqlRef.name;
+        let inCache = this.sqlSchemaCache.get(key);
+        if (!inCache) {
+            try {
+                inCache = {
+                    structDef: await this.getSQLBlockSchema(sqlRef),
+                };
+            }
+            catch (error) {
+                inCache = { error: error.message };
+            }
+            this.sqlSchemaCache.set(key, inCache);
         }
+        return inCache;
     }
     async fetchSchemaForTables(tables) {
         const schemas = {};
         const errors = {};
         for (const tableURL of tables) {
-            try {
-                schemas[tableURL] = await this.getTableSchema(tableURL);
+            let inCache = this.schemaCache.get(tableURL);
+            if (!inCache) {
+                try {
+                    inCache = {
+                        schema: await this.getTableSchema(tableURL),
+                    };
+                    this.schemaCache.set(tableURL, inCache);
+                }
+                catch (error) {
+                    inCache = { error: error.message };
+                }
             }
-            catch (error) {
-                errors[tableURL] = error.toString();
+            if (inCache.schema !== undefined) {
+                schemas[tableURL] = inCache.schema;
+            }
+            else {
+                errors[tableURL] = inCache.error;
             }
         }
         return { schemas, errors };

package/dist/duckdb_connection.d.ts

@@ -7,7 +7,7 @@ export declare class DuckDBConnection extends DuckDBCommon {
     private workingDirectory;
     protected connection: import("duckdb").Connection;
     protected database: Database;
-    protected isSetup: boolean;
+    protected isSetup: Promise<void> | undefined;
     constructor(name: string, databasePath?: string, workingDirectory?: string, queryOptions?: QueryOptionsReader);
     protected setup(): Promise<void>;
     protected runDuckDBQuery(sql: string): Promise<{

package/dist/duckdb_connection.js

@@ -44,7 +44,6 @@ class DuckDBConnection extends duckdb_common_1.DuckDBCommon {
         super(queryOptions);
         this.name = name;
         this.workingDirectory = workingDirectory;
-        this.isSetup = false;
         this.database = new duckdb_1.Database(databasePath, duckdb_1.OPEN_READWRITE, // databasePath === ":memory:" ? OPEN_READWRITE : OPEN_READONLY,
         (err) => {
             if (err) {
@@ -54,28 +53,31 @@ class DuckDBConnection extends duckdb_common_1.DuckDBCommon {
         this.connection = this.database.connect();
     }
     async setup() {
-        if (!this.isSetup) {
+        const doSetup = async () => {
             if (this.workingDirectory) {
-                this.runDuckDBQuery(`SET FILE_SEARCH_PATH='${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);
             }
-            // TODO: This is where we will load extensions once we figure
-            // out how to better support them.
-            // await this.runDuckDBQuery("INSTALL 'json'");
-            // await this.runDuckDBQuery("LOAD 'json'");
-            // await this.runDuckDBQuery("INSTALL 'httpfs'");
-            // await this.runDuckDBQuery("LOAD 'httpfs'");
-            //   await this.runDuckDBQuery("DROP MACRO sum_distinct");
-            //   try {
-            //     await this.runDuckDBQuery(
-            //       `
-            //       create macro sum_distinct(l) as  (
-            //         select sum(x.val) as value FROM (select unnest(l)) x
-            //       )
-            //       `
-            //     );
-            //   } catch (e) {}
+            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);
+            }
+        };
+        if (!this.isSetup) {
+            this.isSetup = doSetup();
         }
-        this.isSetup = true;
+        await this.isSetup;
     }
     async runDuckDBQuery(sql) {
         return new Promise((resolve, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-duckdb",
-  "version": "0.0.15-dev221209192619",
+  "version": "0.0.15-dev221209193631",
   "license": "GPL-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@duckdb/duckdb-wasm": "^1.17.0",
-    "@malloydata/malloy": "^0.0.15-dev221209192619",
+    "@malloydata/malloy": "^0.0.15-dev221209193631",
     "duckdb": "0.6.1"
   }
 }