@malloydata/db-trino 0.0.322 → 0.0.324

package/dist/test.nonspec.js

@@ -55,7 +55,7 @@ describe('Trino connection', () => {
       host: 'http://localhost',
       port: 8080,
       schema: 'malloytest',
-      timezone: 'America/Costa_Rica',
+      timezone: 'UTC',
       user: 'root',
     });
 

package/dist/trino_connection.js

@@ -28,6 +28,7 @@ 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 luxon_1 = require("luxon");
 class PrestoRunner {
     constructor(config) {
         const prestoClientConfig = {
@@ -35,7 +36,7 @@ class PrestoRunner {
             host: config.server,
             port: config.port,
             schema: config.schema,
-            timezone: 'America/Costa_Rica',
+            timezone: 'UTC',
             user: config.user || 'anyone',
             extraHeaders: { 'X-Presto-Session': 'legacy_unnest=true' },
         };
@@ -224,9 +225,24 @@ class TrinoPrestoConnection extends connection_1.BaseConnection {
             // decimal numbers come back as strings
             return Number(rawRow);
         }
-        else if (colSchema.type === 'timestamp' && typeof rawRow === 'string') {
+        else if ((colSchema.type === 'timestamp' || colSchema.type === 'timestamptz') &&
+            typeof rawRow === 'string') {
             // timestamps come back as strings
-            return new Date(rawRow);
+            if (colSchema.type === 'timestamptz') {
+                // TIMESTAMP WITH TIME ZONE format: "2020-02-20 00:00:00 America/Mexico_City"
+                const trinoTzPattern = /^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}(?:\.\d+)?) (.+)$/;
+                const match = rawRow.match(trinoTzPattern);
+                if (match) {
+                    const [, dateTimePart, tzName] = match;
+                    // Use Luxon to parse with timezone awareness
+                    const dt = luxon_1.DateTime.fromSQL(dateTimePart, { zone: tzName });
+                    if (dt.isValid) {
+                        return dt.toJSDate();
+                    }
+                }
+            }
+            // For plain timestamps, Trino returns UTC values - append 'Z' to parse as UTC
+            return new Date(rawRow + 'Z');
         }
         else {
             return rawRow;
@@ -492,7 +508,9 @@ class TrinoPrestoSchemaParser extends malloy_1.TinyParser {
                 }
                 if (this.peek().text === 'with') {
                     this.nextText('with', 'time', 'zone');
+                    return { type: 'timestamptz' };
                 }
+                return { type: 'timestamp' };
             }
             const typeDef = this.dialect.sqlTypeToMalloyType(sqlType);
             if (typeDef.type === 'number' && sqlType === 'decimal') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-trino",
-  "version": "0.0.322",
+  "version": "0.0.324",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,11 +22,15 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "0.0.322",
+    "@malloydata/malloy": "0.0.324",
     "@prestodb/presto-js-client": "^1.0.0",
     "gaxios": "^4.2.0",
+    "luxon": "^3.5.0",
     "trino-client": "^0.2.2"
   },
+  "devDependencies": {
+    "@types/luxon": "^3.5.0"
+  },
   "description": "Malloy is a modern open source language for describing data relationships and transformations. It is both a semantic modeling language and a querying language that runs queries against a relational database. Malloy currently connects to BigQuery and Postgres, and natively supports DuckDB. We've built a Visual Studio Code extension to facilitate building Malloy data models, querying and transforming data, and creating simple visualizations and dashboards.",
   "bugs": {
     "url": "https://github.com/malloydata/malloy/issues"