@malloydata/db-trino 0.0.221-dev241206191821 → 0.0.221-dev241209191943

package/dist/trino_connection.d.ts

@@ -31,11 +31,11 @@ export interface BaseRunner {
 }
 export declare abstract class TrinoPrestoConnection extends BaseConnection implements Connection, PersistSQLResults {
     name: string;
+    private client;
+    private queryOptions?;
     protected readonly dialect: TrinoDialect;
     static DEFAULT_QUERY_OPTIONS: RunSQLOptions;
-    private queryOptions?;
-    private client;
-    constructor(name: string, queryOptions?: QueryOptionsReader, pConfig?: TrinoConnectionConfiguration);
+    constructor(name: string, client: BaseRunner, queryOptions?: QueryOptionsReader | undefined);
     get dialectName(): string;
     private readQueryOptions;
     canPersist(): this is PersistSQLResults;

package/dist/trino_connection.js

@@ -103,19 +103,14 @@ class TrinoRunner {
     }
 }
 class TrinoPrestoConnection extends connection_1.BaseConnection {
-    constructor(name, queryOptions, pConfig) {
+    constructor(name, client, queryOptions) {
         super();
+        this.name = name;
+        this.client = client;
+        this.queryOptions = queryOptions;
         this.dialect = new malloy_1.TrinoDialect();
-        const config = pConfig || {};
         this.name = name;
-        if (name === 'trino') {
-            this.client = new TrinoRunner(config);
-        }
-        else {
-            this.client = new PrestoRunner(config);
-        }
         this.queryOptions = queryOptions;
-        //this.config = config;
     }
     get dialectName() {
         return this.name;
@@ -394,7 +389,7 @@ TrinoPrestoConnection.DEFAULT_QUERY_OPTIONS = {
 };
 class PrestoConnection extends TrinoPrestoConnection {
     constructor(arg, queryOptions, config = {}) {
-        super('presto', queryOptions, config);
+        super(typeof arg === 'string' ? arg : arg.name, new PrestoRunner(config), queryOptions);
     }
     async fillStructDefForSqlBlockSchema(sql, structDef) {
         const explainResult = await this.runSQL(`EXPLAIN ${sql}`, {});
@@ -423,7 +418,7 @@ class PrestoConnection extends TrinoPrestoConnection {
 exports.PrestoConnection = PrestoConnection;
 class TrinoConnection extends TrinoPrestoConnection {
     constructor(arg, queryOptions, config = {}) {
-        super('trino', queryOptions, config);
+        super(typeof arg === 'string' ? arg : arg.name, new TrinoRunner(config), queryOptions);
     }
     async fillStructDefForSqlBlockSchema(sql, structDef) {
         const tmpQueryName = `myMalloyQuery${(0, crypto_1.randomUUID)().replace(/-/g, '')}`;

package/package.json

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