@malloydata/db-trino 0.0.432 → 0.0.434

package/dist/test.nonspec.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-/*import {Trino, BasicAuth} from 'trino-client';
+/*import {Trino, BasicAuth} from '@trinodb/trino-js-client';
 import PrestoClient from '@prestodb/presto-js-client';
 
 // function CallPresto(client: Client, query: string ) {

package/dist/trino_connection.js

@@ -10,7 +10,7 @@ const internal_1 = require("@malloydata/malloy/internal");
 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");
+const trino_js_client_1 = require("@trinodb/trino-js-client");
 const result_to_querydata_1 = require("./result-to-querydata");
 class PrestoRunner {
     constructor(config) {
@@ -58,7 +58,7 @@ class PrestoRunner {
 class TrinoRunner {
     constructor(config) {
         let server = config.server;
-        // trino-client has no separate port field — merge into the server URL
+        // the client has no separate port field — merge into the server URL
         if (server && config.port) {
             try {
                 const url = new URL(server);
@@ -71,13 +71,13 @@ class TrinoRunner {
                 // If server isn't a parseable URL, leave it as-is
             }
         }
-        this.client = trino_client_1.Trino.create({
+        this.client = trino_js_client_1.Trino.create({
             ...config.extraConfig,
             source: config.source,
             catalog: config.catalog,
             server,
             schema: config.schema,
-            auth: new trino_client_1.BasicAuth(config.user, config.password || ''),
+            auth: new trino_js_client_1.BasicAuth(config.user, config.password || ''),
         });
     }
     async runSQL(sql, options = {}, queryMetadataComment = '') {
@@ -364,9 +364,16 @@ class TrinoPrestoSchemaParser extends internal_1.TinyParser {
         this.input = input;
         this.dialect = dialect;
     }
+    /**
+     * Presto 0.284+ writes "Output[PlanNodeId N][NAME_LIST] => ...",
+     * earlier versions write "Output[NAME_LIST] => ...".
+     */
     fieldNameList() {
-        this.skipTo(']'); // Skip to end of plan
-        this.expect('['); // Expect start of name list
+        this.skipTo('[');
+        if (this.match('id', 'id')) {
+            // [PlanNodeId N] is the only group with two adjacent ids
+            this.skipTo('[');
+        }
         const fieldNames = [];
         for (;;) {
             const nmToken = this.expect('id');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-trino",
-  "version": "0.0.432",
+  "version": "0.0.434",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -23,11 +23,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "0.0.432",
+    "@malloydata/malloy": "0.0.434",
     "@prestodb/presto-js-client": "^1.1.0",
+    "@trinodb/trino-js-client": "0.3.2",
     "gaxios": "^4.2.0",
-    "luxon": "^3.7.2",
-    "trino-client": "^0.2.2"
+    "luxon": "^3.7.2"
   },
   "devDependencies": {
     "@types/luxon": "^3.7.2"