@malloydata/db-trino 0.0.433 → 0.0.435

package/dist/result-to-querydata.js

@@ -86,6 +86,9 @@ function convertArray(elementType, raw, unpack) {
  *   for rowDataToDate to handle downstream
  * - BIGINT precision is limited by the Trino JS client which
  *   delivers values as JS number (no bigint support)
+ * - A value the driver has already decoded past the scalar kinds (a map,
+ *   a JSON document) belongs to a `sql native` field and is handed on as
+ *   it came
  */
 function convertScalar(typeDef, raw) {
     if (raw === null || raw === undefined)
@@ -113,11 +116,6 @@ function convertScalar(typeDef, raw) {
         // Plain timestamps: Trino returns UTC values
         return new Date(raw + 'Z');
     }
-    if (typeof raw === 'string' ||
-        typeof raw === 'number' ||
-        typeof raw === 'boolean') {
-        return raw;
-    }
-    return null;
+    return raw;
 }
 //# sourceMappingURL=result-to-querydata.js.map

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 = '') {
@@ -247,10 +247,13 @@ class TrinoPrestoConnection extends connection_1.BaseConnection {
                 throw new Error(queryResult.error);
             }
             const rows = (_a = queryResult.rows) !== null && _a !== void 0 ? _a : [];
+            if (rows.length === 0) {
+                throw new Error('DESCRIBE returned no columns');
+            }
             this.structDefFromSchema(rows, structDef);
         }
         catch (e) {
-            throw new Error(`Could not fetch schema for ${element} ${e instanceof Error ? e.message : e}`);
+            throw new Error(`Could not fetch schema for ${element}: ${e instanceof Error ? e.message : e}`);
         }
         return structDef;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-trino",
-  "version": "0.0.433",
+  "version": "0.0.435",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,7 +15,7 @@
   "scripts": {
     "lint": "eslint '**/*.ts{,x}'",
     "lint-fix": "eslint '**/*.ts{,x}' --fix",
-    "test": "jest --config=../../jest.config.js",
+    "test": "cd ../.. && ts-node scripts/check_dialect_connection.ts trino presto && jest packages/malloy-db-trino",
     "build": "tsc --build",
     "dev": "tsc --build",
     "clean": "tsc --build --clean && rm -f tsconfig.tsbuildinfo",
@@ -23,11 +23,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "0.0.433",
+    "@malloydata/malloy": "0.0.435",
     "@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"