@malloydata/db-duckdb 0.0.11-dev221129185945 → 0.0.11-dev221202180154

package/dist/duckdb_common.d.ts

@@ -1,4 +1,4 @@
-import { Connection, FetchSchemaAndRunSimultaneously, FetchSchemaAndRunStreamSimultaneously, MalloyQueryData, PersistSQLResults, PooledConnection, RunSQLOptions, SQLBlock, StreamingConnection, StructDef, QueryDataRow } from "@malloydata/malloy";
+import { Connection, MalloyQueryData, PersistSQLResults, PooledConnection, RunSQLOptions, SQLBlock, StreamingConnection, StructDef, QueryDataRow } from "@malloydata/malloy";
 export interface DuckDBQueryOptions {
     rowLimit: number;
 }
@@ -23,10 +23,6 @@ export declare abstract class DuckDBCommon implements Connection, PersistSQLResu
     }>;
     runSQL(sql: string, options?: RunSQLOptions): Promise<MalloyQueryData>;
     abstract runSQLStream(sql: string, _options: RunSQLOptions): AsyncIterableIterator<QueryDataRow>;
-    runSQLBlockAndFetchResultSchema(sqlBlock: SQLBlock): Promise<{
-        data: MalloyQueryData;
-        schema: StructDef;
-    }>;
     private getSQLBlockSchema;
     /**
      * Split's a structs columns declaration into individual columns
@@ -42,18 +38,19 @@ export declare abstract class DuckDBCommon implements Connection, PersistSQLResu
     private stringToTypeMap;
     private fillStructDefFromTypeMap;
     private schemaFromQuery;
-    fetchSchemaForSQLBlocks(sqlRefs: SQLBlock[]): Promise<{
-        schemas: Record<string, StructDef>;
-        errors: Record<string, string>;
+    fetchSchemaForSQLBlock(sqlRef: SQLBlock): Promise<{
+        structDef: StructDef;
+        error?: undefined;
+    } | {
+        error: string;
+        structDef?: undefined;
     }>;
     fetchSchemaForTables(tables: string[]): Promise<{
         schemas: Record<string, StructDef>;
         errors: Record<string, string>;
     }>;
     private getTableSchema;
-    canFetchSchemaAndRunSimultaneously(): this is FetchSchemaAndRunSimultaneously;
     canStream(): this is StreamingConnection;
-    canFetchSchemaAndRunStreamSimultaneously(): this is FetchSchemaAndRunStreamSimultaneously;
     test(): Promise<void>;
     protected abstract createHash(sqlCommand: string): Promise<string>;
     manifestTemporaryTable(sqlCommand: string): Promise<string>;

package/dist/duckdb_common.js

@@ -73,11 +73,6 @@ class DuckDBCommon {
         }
         return { rows: result, totalRows: result.length };
     }
-    async runSQLBlockAndFetchResultSchema(sqlBlock) {
-        const data = await this.runSQL(sqlBlock.select);
-        const schema = (await this.fetchSchemaForSQLBlocks([sqlBlock])).schemas[sqlBlock.name];
-        return { data, schema };
-    }
     async getSQLBlockSchema(sqlRef) {
         const structDef = {
             type: "struct",
@@ -94,7 +89,7 @@ class DuckDBCommon {
             },
             fields: [],
         };
-        await this.schemaFromQuery(`DESCRIBE SELECT * FROM (${sqlRef.select})`, structDef);
+        await this.schemaFromQuery(`DESCRIBE SELECT * FROM (${sqlRef.selectStr})`, structDef);
         return structDef;
     }
     /**
@@ -220,18 +215,13 @@ class DuckDBCommon {
         }
         this.fillStructDefFromTypeMap(structDef, typeMap);
     }
-    async fetchSchemaForSQLBlocks(sqlRefs) {
-        const schemas = {};
-        const errors = {};
-        for (const sqlRef of sqlRefs) {
-            try {
-                schemas[sqlRef.name] = await this.getSQLBlockSchema(sqlRef);
-            }
-            catch (error) {
-                errors[sqlRef.name] = error;
-            }
+    async fetchSchemaForSQLBlock(sqlRef) {
+        try {
+            return { structDef: await this.getSQLBlockSchema(sqlRef) };
+        }
+        catch (error) {
+            return { error: error.message };
         }
-        return { schemas, errors };
     }
     async fetchSchemaForTables(tables) {
         const schemas = {};
@@ -266,15 +256,9 @@ class DuckDBCommon {
         await this.schemaFromQuery(infoQuery, structDef);
         return structDef;
     }
-    canFetchSchemaAndRunSimultaneously() {
-        return false;
-    }
     canStream() {
         return true;
     }
-    canFetchSchemaAndRunStreamSimultaneously() {
-        return false;
-    }
     async test() {
         await this.runRawSQL("SELECT 1");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-duckdb",
-  "version": "0.0.11-dev221129185945",
+  "version": "0.0.11-dev221202180154",
   "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.11-dev221129185945",
+    "@malloydata/malloy": "^0.0.11-dev221202180154",
     "duckdb": "0.5.1"
   }
 }