@malloydata/db-trino 0.0.235-dev250207190835 → 0.0.235-dev250207192049

package/dist/trino_connection.d.ts

@@ -1,4 +1,4 @@
-import { Connection, ConnectionConfig, MalloyQueryData, PersistSQLResults, QueryData, QueryOptionsReader, QueryRunStats, RunSQLOptions, TrinoDialect, StructDef, TableSourceDef, SQLSourceDef, AtomicTypeDef, Dialect, FieldDef } from '@malloydata/malloy';
+import { ConnectionConfig, MalloyQueryData, PersistSQLResults, QueryData, QueryOptionsReader, QueryRunStats, RunSQLOptions, TrinoDialect, StructDef, TableSourceDef, SQLSourceDef, AtomicTypeDef, Dialect, FieldDef, TestableConnection } from '@malloydata/malloy';
 import { BaseConnection } from '@malloydata/malloy/connection';
 export interface TrinoManagerOptions {
     credentials?: {
@@ -27,9 +27,10 @@ export interface BaseRunner {
             error?: string;
         }[];
         error?: string;
+        profilingUrl?: string;
     }>;
 }
-export declare abstract class TrinoPrestoConnection extends BaseConnection implements Connection, PersistSQLResults {
+export declare abstract class TrinoPrestoConnection extends BaseConnection implements TestableConnection, PersistSQLResults {
     name: string;
     private client;
     private queryOptions?;
@@ -65,6 +66,7 @@ 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);
+    get dialectName(): string;
     static schemaFromExplain(explainResult: MalloyQueryData, structDef: StructDef, dialect: Dialect): void;
     protected fillStructDefForSqlBlockSchema(sql: string, structDef: StructDef): Promise<void>;
     unpackArray(_fields: FieldDef[], data: unknown): unknown[];
@@ -72,5 +74,6 @@ export declare class PrestoConnection extends TrinoPrestoConnection {
 export declare class TrinoConnection extends TrinoPrestoConnection {
     constructor(name: string, queryOptions?: QueryOptionsReader, config?: TrinoConnectionConfiguration);
     constructor(option: TrinoConnectionOptions, queryOptions?: QueryOptionsReader);
+    get dialectName(): string;
     protected fillStructDefForSqlBlockSchema(sql: string, structDef: StructDef): Promise<void>;
 }

package/dist/trino_connection.js

@@ -30,7 +30,7 @@ const crypto_1 = require("crypto");
 const trino_client_1 = require("trino-client");
 class PrestoRunner {
     constructor(config) {
-        this.client = new presto_js_client_1.PrestoClient({
+        const prestoClientConfig = {
             catalog: config.catalog,
             host: config.server,
             port: config.port,
@@ -38,7 +38,14 @@ class PrestoRunner {
             timezone: 'America/Costa_Rica',
             user: config.user || 'anyone',
             extraHeaders: { 'X-Presto-Session': 'legacy_unnest=true' },
-        });
+        };
+        if (config.user && config.password) {
+            prestoClientConfig.basicAuthentication = {
+                user: config.user,
+                password: config.password,
+            };
+        }
+        this.client = new presto_js_client_1.PrestoClient(prestoClientConfig);
     }
     async runSQL(sql, limit, _abortSignal) {
         let ret = undefined;
@@ -180,8 +187,7 @@ class TrinoPrestoConnection extends connection_1.BaseConnection {
         if (r.error) {
             throw new Error(r.error);
         }
-        const inputRows = r.rows;
-        const columns = r.columns;
+        const { rows: inputRows, columns, profilingUrl } = r;
         const malloyColumns = columns.map(c => (0, malloy_1.mkFieldDef)(this.malloyTypeFromTrinoType(c.type), c.name));
         const malloyRows = [];
         const rows = inputRows !== null && inputRows !== void 0 ? inputRows : [];
@@ -194,7 +200,7 @@ class TrinoPrestoConnection extends connection_1.BaseConnection {
             }
             malloyRows.push(malloyRow);
         }
-        return { rows: malloyRows, totalRows: malloyRows.length };
+        return { rows: malloyRows, totalRows: malloyRows.length, profilingUrl };
     }
     resultRow(colSchema, rawRow) {
         if (colSchema.type === 'record') {
@@ -296,7 +302,7 @@ class TrinoPrestoConnection extends connection_1.BaseConnection {
         throw new Error('Not implemented 7');
     }
     async test() {
-        // await this.dryRunSQLQuery('SELECT 1');
+        await this.runSQL('SELECT 1');
     }
     async close() {
         return;
@@ -310,6 +316,9 @@ class PrestoConnection extends TrinoPrestoConnection {
     constructor(arg, queryOptions, config = {}) {
         super(typeof arg === 'string' ? arg : arg.name, new PrestoRunner(config), queryOptions);
     }
+    get dialectName() {
+        return 'presto';
+    }
     static schemaFromExplain(explainResult, structDef, dialect) {
         if (explainResult.rows.length === 0) {
             throw new Error('Received empty explain result when trying to fetch schema.');
@@ -339,6 +348,9 @@ class TrinoConnection extends TrinoPrestoConnection {
     constructor(arg, queryOptions, config = {}) {
         super(typeof arg === 'string' ? arg : arg.name, new TrinoRunner(config), queryOptions);
     }
+    get dialectName() {
+        return 'trino';
+    }
     async fillStructDefForSqlBlockSchema(sql, structDef) {
         const tmpQueryName = `myMalloyQuery${(0, crypto_1.randomUUID)().replace(/-/g, '')}`;
         await this.executeAndWait(`PREPARE ${tmpQueryName} FROM ${sql}`);

package/package.json

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