@malloydata/db-trino 0.0.230-dev250116214420 → 0.0.230-dev250116221349

package/dist/trino_connection.d.ts

@@ -1,4 +1,4 @@
-import { Connection, ConnectionConfig, MalloyQueryData, PersistSQLResults, QueryData, QueryOptionsReader, QueryRunStats, RunSQLOptions, TrinoDialect, StructDef, TableSourceDef, SQLSourceDef, AtomicTypeDef, FieldDef } from '@malloydata/malloy';
+import { Connection, ConnectionConfig, MalloyQueryData, PersistSQLResults, QueryData, QueryOptionsReader, QueryRunStats, RunSQLOptions, TrinoDialect, StructDef, TableSourceDef, SQLSourceDef, AtomicTypeDef, Dialect, FieldDef } from '@malloydata/malloy';
 import { BaseConnection } from '@malloydata/malloy/connection';
 export interface TrinoManagerOptions {
     credentials?: {
@@ -65,8 +65,8 @@ export declare abstract class TrinoPrestoConnection extends BaseConnection imple
 export declare class PrestoConnection extends TrinoPrestoConnection {
     constructor(name: string, queryOptions?: QueryOptionsReader, config?: TrinoConnectionConfiguration);
     constructor(option: TrinoConnectionOptions, queryOptions?: QueryOptionsReader);
+    static schemaFromExplain(explainResult: MalloyQueryData, structDef: StructDef, dialect: Dialect): void;
     protected fillStructDefForSqlBlockSchema(sql: string, structDef: StructDef): Promise<void>;
-    protected schemaFromExplain(explainResult: MalloyQueryData, structDef: StructDef): void;
     unpackArray(data: unknown): unknown[];
 }
 export declare class TrinoConnection extends TrinoPrestoConnection {

package/dist/trino_connection.js

@@ -310,11 +310,7 @@ class PrestoConnection extends TrinoPrestoConnection {
     constructor(arg, queryOptions, config = {}) {
         super(typeof arg === 'string' ? arg : arg.name, new PrestoRunner(config), queryOptions);
     }
-    async fillStructDefForSqlBlockSchema(sql, structDef) {
-        const explainResult = await this.runSQL(`EXPLAIN ${sql}`, {});
-        this.schemaFromExplain(explainResult, structDef);
-    }
-    schemaFromExplain(explainResult, structDef) {
+    static schemaFromExplain(explainResult, structDef, dialect) {
         if (explainResult.rows.length === 0) {
             throw new Error('Received empty explain result when trying to fetch schema.');
         }
@@ -327,9 +323,13 @@ class PrestoConnection extends TrinoPrestoConnection {
         if ((lines === null || lines === void 0 ? void 0 : lines.length) === 0) {
             throw new Error('Received invalid explain result when trying to fetch schema.');
         }
-        const schemaDesc = new TrinoPrestoSchemaParser(lines[0], this.dialect);
+        const schemaDesc = new TrinoPrestoSchemaParser(lines[0], dialect);
         structDef.fields = schemaDesc.parseQueryPlan();
     }
+    async fillStructDefForSqlBlockSchema(sql, structDef) {
+        const explainResult = await this.runSQL(`EXPLAIN ${sql}`, {});
+        PrestoConnection.schemaFromExplain(explainResult, structDef, this.dialect);
+    }
     unpackArray(data) {
         return JSON.parse(data);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-trino",
-  "version": "0.0.230-dev250116214420",
+  "version": "0.0.230-dev250116221349",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.230-dev250116214420",
+    "@malloydata/malloy": "^0.0.230-dev250116221349",
     "@prestodb/presto-js-client": "^1.0.0",
     "gaxios": "^4.2.0",
     "trino-client": "^0.2.2"