@malloydata/malloy-tests 0.0.322 → 0.0.323

package/package.json

@@ -21,14 +21,14 @@
   },
   "dependencies": {
     "@jest/globals": "^29.4.3",
-    "@malloydata/db-bigquery": "0.0.322",
-    "@malloydata/db-duckdb": "0.0.322",
-    "@malloydata/db-postgres": "0.0.322",
-    "@malloydata/db-snowflake": "0.0.322",
-    "@malloydata/db-trino": "0.0.322",
-    "@malloydata/malloy": "0.0.322",
-    "@malloydata/malloy-tag": "0.0.322",
-    "@malloydata/render": "0.0.322",
+    "@malloydata/db-bigquery": "0.0.323",
+    "@malloydata/db-duckdb": "0.0.323",
+    "@malloydata/db-postgres": "0.0.323",
+    "@malloydata/db-snowflake": "0.0.323",
+    "@malloydata/db-trino": "0.0.323",
+    "@malloydata/malloy": "0.0.323",
+    "@malloydata/malloy-tag": "0.0.323",
+    "@malloydata/render": "0.0.323",
     "events": "^3.3.0",
     "jsdom": "^22.1.0",
     "luxon": "^2.4.0",
@@ -38,5 +38,5 @@
     "@types/jsdom": "^21.1.1",
     "@types/luxon": "^2.4.0"
   },
-  "version": "0.0.322"
+  "version": "0.0.323"
 }

package/src/databases/all/db_filter_expressions.spec.ts

@@ -1091,6 +1091,25 @@ describe.each(runtimes.runtimeList)('filter expressions %s', (dbName, db) => {
           }
         `).malloyResultMatches(exactTimeModel, {n: 'exact'});
       });
+      test.when(tzTesting)(
+        'month offsets cross DST boundary in query time zone',
+        async () => {
+          // November 15, 2024 - Dublin is UTC+0 (no DST)
+          nowIs('2024-11-15 12:00:00', 'Europe/Dublin');
+
+          // 2 months ago = September 2024 - Dublin is UTC+1 (DST)
+          // The month arithmetic must happen in Dublin civil time
+          // September 1 00:00:00 Dublin = August 31 23:00:00 UTC (due to DST offset)
+          // October 1 00:00:00 Dublin = September 30 23:00:00 UTC
+          const rangeQuery = mkRangeQuery(
+            "f'2 months ago'",
+            '2024-09-01 00:00:00', // Interpreted as Dublin time
+            '2024-10-01 00:00:00', // Interpreted as Dublin time
+            'Europe/Dublin'
+          );
+          await expect(rangeQuery).malloyResultMatches(db, inRange);
+        }
+      );
     });
   });
 });

package/src/databases/all/time.spec.ts

@@ -814,6 +814,37 @@ describe.each(runtimes.runtimeList)('%s: query tz', (dbName, runtime) => {
       expect(yekTimezoneAnnotation?.value).toContain('Asia/Yekaterinburg');
     }
   );
+
+  test('intervals are evalutated in query timezone', async () => {
+    const truth = runtime.dialect.resultBoolean(true);
+    await expect(
+      `source: onerow is ${dbName}.sql("SELECT 1 as rownum") extend {
+        dimension:
+          // Dublin is UTC+1 in June and UTC in November
+          november is @2024-11-01 00:00:00[Europe/Dublin]
+          june1_correct is @2024-06-01 00:00:00[Europe/Dublin],
+          august1_correct is @2024-08-01 00:00:00[Europe/Dublin],
+          by_month is november - 5 months,
+          by_day is november - 153 days,
+          by_hour is november - 3673 hours, // 153 days * 24 hours + 1 hour fall back
+          by_quarter is november - 1 quarter, // 3 months back crosses DST boundary
+      }
+      run: onerow -> {
+        timezone: 'Europe/Dublin'
+        select:
+          june1_correct,
+          month_ok is by_month = june1_correct, by_month
+          day_ok is by_day = june1_correct, by_day
+          hour_ok is by_hour = june1_correct, by_hour
+          quarter_ok is by_quarter = august1_correct, by_quarter
+      }`
+    ).malloyResultMatches(runtime, {
+      month_ok: truth,
+      day_ok: truth,
+      hour_ok: truth,
+      quarter_ok: truth,
+    });
+  });
 });
 
 afterAll(async () => {

package/src/databases/bigquery/double_truncation.spec.ts

@@ -42,10 +42,11 @@ describe('BigQuery double truncation', () => {
         }
       `;
       const result = await runtime.loadQuery(src).run();
-      const truncs = (result.sql.match(/TIMESTAMP_TRUNC/gi) || []).length;
-      if (truncs !== 1) {
-        fail(`Expected 1 TIMESTAMP_TRUNC, got ${truncs}\n${result.sql}`);
-      }
+      // Check for either TIMESTAMP_TRUNC or DATETIME_TRUNC (civil time path)
+      const truncs = (
+        result.sql.match(/(TIMESTAMP_TRUNC|DATETIME_TRUNC)/gi) || []
+      ).length;
+      expect(truncs).toBe(1);
     }
   });
 });

package/trino/trino_start.sh

@@ -20,7 +20,7 @@ bigquery.arrow-serialization.enabled=false
 EOF
 
 # run docker
-docker run -p ${TRINO_PORT:-8080}:8080 -d -v ./.tmp/bigquery-trino.properties:/etc/trino/catalog/bigquery.properties --name trino-malloy trinodb/trino
+docker run -p ${TRINO_PORT:-8080}:8080 -d -e TZ=UTC -v ./.tmp/bigquery-trino.properties:/etc/trino/catalog/bigquery.properties --name trino-malloy trinodb/trino
 
 # wait for server to start
 counter=0