@malloydata/malloy-tests 0.0.311 → 0.0.312

package/package.json

@@ -21,14 +21,14 @@
   },
   "dependencies": {
     "@jest/globals": "^29.4.3",
-    "@malloydata/db-bigquery": "0.0.311",
-    "@malloydata/db-duckdb": "0.0.311",
-    "@malloydata/db-postgres": "0.0.311",
-    "@malloydata/db-snowflake": "0.0.311",
-    "@malloydata/db-trino": "0.0.311",
-    "@malloydata/malloy": "0.0.311",
-    "@malloydata/malloy-tag": "0.0.311",
-    "@malloydata/render": "0.0.311",
+    "@malloydata/db-bigquery": "0.0.312",
+    "@malloydata/db-duckdb": "0.0.312",
+    "@malloydata/db-postgres": "0.0.312",
+    "@malloydata/db-snowflake": "0.0.312",
+    "@malloydata/db-trino": "0.0.312",
+    "@malloydata/malloy": "0.0.312",
+    "@malloydata/malloy-tag": "0.0.312",
+    "@malloydata/render": "0.0.312",
     "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.311"
+  "version": "0.0.312"
 }

package/src/core/bugless.spec.ts

@@ -18,4 +18,36 @@ describe('misc tests for regressions that have no better home', () => {
       } -> { group_by: carriers.airline; limit: 1 }
     `).malloyResultMatches(runtime, [{}]);
   });
+
+  test('result data structure contains time zones for nested queries', async () => {
+    const query = runtime.loadQuery(`
+      run: duckdb.table('malloytest.flights') -> {
+        nest: arrive_yekaterinburg is {
+          timezone: 'Asia/Yekaterinburg'
+          group_by: utc_time is arr_time::string, civil_time is arr_time
+          limit: 5
+        }
+      }
+    `);
+    const result = await query.run();
+
+    // Inspect the result schema to find timezone metadata
+    const schema = result.resultExplore;
+
+    // Find the nested field
+    const nestedField = schema.getFieldByName('arrive_yekaterinburg');
+    expect(nestedField).toBeDefined();
+
+    if (nestedField?.isExploreField()) {
+      // Check if timezone information is present in the result data structure
+      const queryTimezone = nestedField.queryTimezone;
+
+      // Verify timezone is accessible in the result structure
+      expect(queryTimezone).toBe('Asia/Yekaterinburg');
+
+      // The timezone info should be available for later serialization
+      // (this is what gets turned into annotations during the to-stable process)
+      expect(nestedField.queryTimezone).toBeDefined();
+    }
+  });
 });

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

@@ -31,6 +31,7 @@ import {
   runQuery,
 } from '../../util';
 import {DateTime as LuxonDateTime} from 'luxon';
+import {API} from '@malloydata/malloy';
 
 const runtimes = new RuntimeList(databasesFromEnvironmentOr(allDatabases));
 
@@ -736,6 +737,67 @@ describe.each(runtimes.runtimeList)('%s: query tz', (dbName, runtime) => {
       }`
     ).malloyResultMatches(runtime, {mex_ts: zone_2020.toJSDate()});
   });
+
+  // Test for timezone rendering issue with nested queries
+  test.when(runtime.supportsNesting)(
+    'nested queries preserve timezone in rendering',
+    async () => {
+      const result = await runQuery(
+        runtime,
+        `run: ${dbName}.table('malloytest.flights') extend {
+        view: arrivals is {
+          group_by: arr_time.hour
+          order_by: arr_time desc
+          limit: 1
+        }
+      } -> {
+        nest: arrive_utc is arrivals
+        nest: arrive_yekaterinburg is arrivals + { timezone: 'Asia/Yekaterinburg' }
+      }`
+      );
+
+      // First, check that the raw result has the correct timezone metadata
+      const rawFields = result.resultExplore.structDef.fields;
+      const rawArriveUtc = rawFields.find(f => f.name === 'arrive_utc');
+      const rawArriveYek = rawFields.find(
+        f => f.name === 'arrive_yekaterinburg'
+      );
+
+      expect(rawArriveUtc).toBeDefined();
+      expect(rawArriveYek).toBeDefined();
+
+      // Check timezone properties on raw array/record fields
+      expect(rawArriveUtc!['queryTimezone']).toBeUndefined(); // Should be undefined for UTC
+      expect(rawArriveYek!['queryTimezone']).toBe('Asia/Yekaterinburg');
+
+      // Now check that the wrapped result also preserves timezone metadata
+      const wrappedResult = API.util.wrapResult(result);
+      const wrappedFields = wrappedResult.schema.fields;
+      const wrappedArriveUtc = wrappedFields.find(f => f.name === 'arrive_utc');
+      const wrappedArriveYek = wrappedFields.find(
+        f => f.name === 'arrive_yekaterinburg'
+      );
+
+      expect(wrappedArriveUtc).toBeDefined();
+      expect(wrappedArriveYek).toBeDefined();
+
+      // Check timezone properties in the wrapped result
+      // For nested views, the timezone should be in the annotations
+      const arriveUtcAnnotations = wrappedArriveUtc?.annotations;
+      const arriveYekAnnotations = wrappedArriveYek?.annotations;
+
+      // Check if timezone info is present in annotations
+      const utcTimezoneAnnotation = arriveUtcAnnotations?.find(ann =>
+        ann.value.includes('query_timezone')
+      );
+      const yekTimezoneAnnotation = arriveYekAnnotations?.find(ann =>
+        ann.value.includes('query_timezone')
+      );
+
+      expect(utcTimezoneAnnotation).toBeUndefined(); // UTC should have no timezone annotation
+      expect(yekTimezoneAnnotation?.value).toContain('Asia/Yekaterinburg');
+    }
+  );
 });
 
 afterAll(async () => {