@malloydata/db-trino 0.0.165-dev240813192511 → 0.0.165-dev240813215510

package/dist/trino_connection.d.ts

@@ -1,4 +1,5 @@
-import { Connection, ConnectionConfig, FetchSchemaOptions, MalloyQueryData, FieldAtomicTypeDef, PersistSQLResults, PooledConnection, QueryData, QueryOptionsReader, QueryRunStats, RunSQLOptions, SQLBlock, StreamingConnection, StructDef } from '@malloydata/malloy';
+import { Connection, ConnectionConfig, FetchSchemaOptions, MalloyQueryData, FieldAtomicTypeDef, PersistSQLResults, QueryData, QueryOptionsReader, QueryRunStats, RunSQLOptions, SQLBlock, StructDef } from '@malloydata/malloy';
+import { BaseConnection } from '@malloydata/malloy/connection';
 export interface TrinoManagerOptions {
     credentials?: {
         clientId: string;
@@ -17,7 +18,7 @@ export interface TrinoConnectionConfiguration {
     password?: string;
 }
 export type TrinoConnectionOptions = ConnectionConfig;
-export interface BaseConnection {
+export interface BaseRunner {
     runSQL(sql: string, limit: number | undefined): Promise<{
         rows: unknown[][];
         columns: {
@@ -28,7 +29,7 @@ export interface BaseConnection {
         error?: string;
     }>;
 }
-export declare abstract class TrinoPrestoConnection implements Connection, PersistSQLResults {
+export declare abstract class TrinoPrestoConnection extends BaseConnection implements Connection, PersistSQLResults {
     trinoToMalloyTypes: {
         [key: string]: FieldAtomicTypeDef;
     };
@@ -43,9 +44,7 @@ export declare abstract class TrinoPrestoConnection implements Connection, Persi
     constructor(name: string, queryOptions?: QueryOptionsReader, pConfig?: TrinoConnectionConfiguration);
     get dialectName(): string;
     private readQueryOptions;
-    isPool(): this is PooledConnection;
     canPersist(): this is PersistSQLResults;
-    canStream(): this is StreamingConnection;
     get supportsNesting(): boolean;
     manifestTemporaryTable(_sqlCommand: string): Promise<string>;
     unpackArray(data: unknown): unknown[];

package/dist/trino_connection.js

@@ -24,10 +24,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrinoConnection = exports.PrestoConnection = exports.TrinoPrestoConnection = void 0;
 const malloy_1 = require("@malloydata/malloy");
+const connection_1 = require("@malloydata/malloy/connection");
 const presto_js_client_1 = require("@prestodb/presto-js-client");
 const crypto_1 = require("crypto");
 const trino_client_1 = require("trino-client");
-class PrestoBase {
+class PrestoRunner {
     constructor(config) {
         this.client = new presto_js_client_1.PrestoClient({
             catalog: config.catalog,
@@ -60,7 +61,7 @@ class PrestoBase {
         };
     }
 }
-class TrinooBase {
+class TrinoRunner {
     constructor(config) {
         this.client = trino_client_1.Trino.create({
             catalog: config.catalog,
@@ -102,7 +103,7 @@ class TrinooBase {
     }
 }
 // manage access to BQ, control costs, enforce global data/API limits
-class TrinoPrestoConnection {
+class TrinoPrestoConnection extends connection_1.BaseConnection {
     sqlToMalloyType(sqlType) {
         var _a, _b;
         const baseSqlType = (_b = (_a = sqlType.match(/^(\w+)/)) === null || _a === void 0 ? void 0 : _a.at(0)) !== null && _b !== void 0 ? _b : sqlType;
@@ -112,6 +113,7 @@ class TrinoPrestoConnection {
         return undefined;
     }
     constructor(name, queryOptions, pConfig) {
+        super();
         this.trinoToMalloyTypes = {
             'varchar': { type: 'string' },
             'integer': { type: 'number', numberType: 'integer' },
@@ -144,10 +146,10 @@ class TrinoPrestoConnection {
         const config = pConfig || {};
         this.name = name;
         if (name === 'trino') {
-            this.client = new TrinooBase(config);
+            this.client = new TrinoRunner(config);
         }
         else {
-            this.client = new PrestoBase(config);
+            this.client = new PrestoRunner(config);
         }
         this.queryOptions = queryOptions;
         //this.config = config;
@@ -169,15 +171,9 @@ class TrinoPrestoConnection {
             return options;
         }
     }
-    isPool() {
-        return false;
-    }
     canPersist() {
         return true;
     }
-    canStream() {
-        return false;
-    }
     get supportsNesting() {
         return true;
     }

package/package.json

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