@malloydata/malloy-tests 0.0.144-dev240426151705 → 0.0.144-dev240503150037

package/package.json

@@ -21,13 +21,13 @@
   },
   "dependencies": {
     "@jest/globals": "^29.4.3",
-    "@malloydata/db-bigquery": "^0.0.144-dev240426151705",
-    "@malloydata/db-duckdb": "^0.0.144-dev240426151705",
-    "@malloydata/db-postgres": "^0.0.144-dev240426151705",
-    "@malloydata/db-snowflake": "^0.0.144-dev240426151705",
-    "@malloydata/db-trino": "^0.0.144-dev240426151705",
-    "@malloydata/malloy": "^0.0.144-dev240426151705",
-    "@malloydata/render": "^0.0.144-dev240426151705",
+    "@malloydata/db-bigquery": "^0.0.144-dev240503150037",
+    "@malloydata/db-duckdb": "^0.0.144-dev240503150037",
+    "@malloydata/db-postgres": "^0.0.144-dev240503150037",
+    "@malloydata/db-snowflake": "^0.0.144-dev240503150037",
+    "@malloydata/db-trino": "^0.0.144-dev240503150037",
+    "@malloydata/malloy": "^0.0.144-dev240503150037",
+    "@malloydata/render": "^0.0.144-dev240503150037",
     "jsdom": "^22.1.0",
     "luxon": "^2.4.0",
     "madge": "^6.0.0"
@@ -36,5 +36,5 @@
     "@types/jsdom": "^21.1.1",
     "@types/luxon": "^2.4.0"
   },
-  "version": "0.0.144-dev240426151705"
+  "version": "0.0.144-dev240503150037"
 }

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

@@ -430,6 +430,33 @@ expressionModels.forEach((expressionModel, databaseName) => {
       expect(result.data.path(2, 'neg_r').value).toBe(-3);
       expect(result.data.path(3, 'neg_r').value).toBe(-3);
     });
+
+    it(`properly isolated nested calculations - ${databaseName}`, async () => {
+      const result = await expressionModel
+        .loadQuery(
+          `run: ${databaseName}.table('malloytest.airports') -> {
+            group_by: faa_region
+            aggregate: airport_count is count()
+            calculate: id is row_number()
+            nest: by_fac_type is {
+              group_by: fac_type
+              aggregate: airport_count is count()
+              calculate: id2 is row_number()
+              nest: elevation is {
+                aggregate: avg_elevation is elevation.avg()
+              }
+              limit: 2
+            }
+          }
+          -> {
+            // should be 2 rows, max of 2
+            group_by: by_fac_type.id2
+            order_by: id2 desc
+          }`
+        )
+        .run();
+      expect(result.data.path(0, 'id2').value).toBe(2);
+    });
   });
 
   describe('lag', () => {

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

@@ -1226,6 +1226,15 @@ SELECT row_to_json(finalStage) as row FROM __stage0 AS finalStage`);
       `).malloyResultMatches(runtime, {back});
     });
 
+    test('source with reserve word', async () => {
+      await expect(`
+        source: create is ${databaseName}.table('malloytest.state_facts')
+        run: create -> {
+          aggregate: c is count()
+        }
+      `).malloyResultMatches(runtime, {c: 51});
+    });
+
     test.when(runtime.supportsNesting)('spaces in names', async () => {
       await expect(`
         source: \`space race\` is ${databaseName}.table('malloytest.state_facts') extend {

package/src/model/sql_source.spec.ts

@@ -33,7 +33,7 @@ describe('turducken', () => {
       run: duckdb.sql("""SELECT one as num FROM %{hasone->{select:*}}""")
     `);
     const qsql = await q.getSQL();
-    expect(qsql).toContain(`FROM (${sql}) as hasone`);
+    expect(qsql).toContain(`FROM (${sql}) as base`);
   });
   test('malloy source code not double-wrapped in parens', async () => {
     const sql = 'SELECT 1 as one';
@@ -42,6 +42,6 @@ describe('turducken', () => {
       run: duckdb.sql("""SELECT one as num FROM (%{hasone->{select:*}})""")
     `);
     const qsql = await q.getSQL();
-    expect(qsql).toContain(`FROM (${sql}) as hasone`);
+    expect(qsql).toContain(`FROM (${sql}) as base`);
   });
 });