@malloydata/db-trino 0.0.272 → 0.0.274

package/dist/trino_connection.d.ts

@@ -22,7 +22,7 @@ export interface TrinoConnectionConfiguration {
 }
 export type TrinoConnectionOptions = ConnectionConfig;
 export interface BaseRunner {
-    runSQL(sql: string, limit: number | undefined, abortSignal?: AbortSignal): Promise<{
+    runSQL(sql: string, options: RunSQLOptions): Promise<{
         rows: unknown[][];
         columns: {
             name: string;

package/dist/trino_connection.js

@@ -47,9 +47,11 @@ class PrestoRunner {
         }
         this.client = new presto_js_client_1.PrestoClient(prestoClientConfig);
     }
-    async runSQL(sql, limit, _abortSignal) {
+    async runSQL(sql, options = {}) {
         let ret = undefined;
-        const q = limit ? `SELECT * FROM(${sql}) LIMIT ${limit}` : sql;
+        const q = options.rowLimit
+            ? `SELECT * FROM(${sql}) LIMIT ${options.rowLimit}`
+            : sql;
         let error = undefined;
         try {
             ret = (await this.client.query(q)) || [];
@@ -78,7 +80,7 @@ class TrinoRunner {
             auth: new trino_client_1.BasicAuth(config.user, config.password || ''),
         });
     }
-    async runSQL(sql, limit, _abortSignal) {
+    async runSQL(sql, options = {}) {
         var _a;
         const result = await this.client.query(sql);
         let queryResult = await result.next();
@@ -91,10 +93,11 @@ class TrinoRunner {
         }
         const columns = queryResult.value.columns;
         const outputRows = [];
-        while (queryResult !== null && (!limit || outputRows.length < limit)) {
+        while (queryResult !== null &&
+            (!options.rowLimit || outputRows.length < options.rowLimit)) {
             const rows = (_a = queryResult.value.data) !== null && _a !== void 0 ? _a : [];
             for (const row of rows) {
-                if (!limit || outputRows.length < limit) {
+                if (!options.rowLimit || outputRows.length < options.rowLimit) {
                     outputRows.push(row);
                 }
             }
@@ -184,7 +187,7 @@ class TrinoPrestoConnection extends connection_1.BaseConnection {
     async runSQL(sqlCommand, options = {}, 
     // TODO(figutierrez): Use.
     _rowIndex = 0) {
-        const r = await this.client.runSQL(sqlCommand, options.rowLimit, options.abortSignal);
+        const r = await this.client.runSQL(sqlCommand, options);
         if (r.error) {
             throw new Error(r.error);
         }
@@ -258,7 +261,7 @@ class TrinoPrestoConnection extends connection_1.BaseConnection {
         return structDef;
     }
     async executeAndWait(sqlBlock) {
-        await this.client.runSQL(sqlBlock, undefined);
+        await this.client.runSQL(sqlBlock, {});
         // TODO: make sure failure is handled correctly.
         //while (!(await result.next()).done);
     }
@@ -277,7 +280,7 @@ class TrinoPrestoConnection extends connection_1.BaseConnection {
     async loadSchemaForSqlBlock(sqlBlock, structDef, element) {
         var _a;
         try {
-            const queryResult = await this.client.runSQL(sqlBlock, undefined);
+            const queryResult = await this.client.runSQL(sqlBlock, {});
             if (queryResult.error) {
                 // TODO: handle.
                 throw new Error(queryResult.error);

package/package.json

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