@malloydata/malloy-tests 0.0.218-dev241120211046 → 0.0.218-dev241127170002

package/package.json

@@ -21,13 +21,13 @@
   },
   "dependencies": {
     "@jest/globals": "^29.4.3",
-    "@malloydata/db-bigquery": "^0.0.218-dev241120211046",
-    "@malloydata/db-duckdb": "^0.0.218-dev241120211046",
-    "@malloydata/db-postgres": "^0.0.218-dev241120211046",
-    "@malloydata/db-snowflake": "^0.0.218-dev241120211046",
-    "@malloydata/db-trino": "^0.0.218-dev241120211046",
-    "@malloydata/malloy": "^0.0.218-dev241120211046",
-    "@malloydata/render": "^0.0.218-dev241120211046",
+    "@malloydata/db-bigquery": "^0.0.218-dev241127170002",
+    "@malloydata/db-duckdb": "^0.0.218-dev241127170002",
+    "@malloydata/db-postgres": "^0.0.218-dev241127170002",
+    "@malloydata/db-snowflake": "^0.0.218-dev241127170002",
+    "@malloydata/db-trino": "^0.0.218-dev241127170002",
+    "@malloydata/malloy": "^0.0.218-dev241127170002",
+    "@malloydata/render": "^0.0.218-dev241127170002",
     "events": "^3.3.0",
     "jsdom": "^22.1.0",
     "luxon": "^2.4.0",
@@ -37,5 +37,5 @@
     "@types/jsdom": "^21.1.1",
     "@types/luxon": "^2.4.0"
   },
-  "version": "0.0.218-dev241120211046"
+  "version": "0.0.218-dev241127170002"
 }

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

@@ -197,4 +197,15 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
       }
     `).malloyResultMatches(runtime, {x: 1});
   });
+  it('reference composite field in nest', async () => {
+    await expect(`
+      ##! experimental { composite_sources parameters }
+      source: state_facts is ${databaseName}.table('malloytest.state_facts')
+      run: compose(state_facts, state_facts extend { dimension: x is 1 }) -> {
+        nest: foo is {
+          group_by: x
+        }
+      }
+    `).malloyResultMatches(runtime, {'foo.x': 1});
+  });
 });

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

@@ -1167,6 +1167,84 @@ SELECT row_to_json(finalStage) as row FROM __stage0 AS finalStage`);
     }
   );
 
+  test.when(
+    runtime.supportsNesting && runtime.dialect.supportsPipelinesInViews
+  )(`Nested pipelines sort properly - ${databaseName}`, async () => {
+    const result = await runtime
+      .loadQuery(
+        `
+        source: state_facts is ${databaseName}.table('malloytest.state_facts')
+        extend {
+            view: base_view is {
+                group_by: state
+                aggregate: airports is sum(airport_count)
+                order_by: airports asc
+            }
+            ->
+            {
+                group_by: state
+                aggregate: airports.sum()
+                order_by: airports
+            }
+            view: base_view2 is {
+                group_by: state
+                aggregate: aircrafts is sum(aircraft_count)
+                order_by: aircrafts asc
+            }
+            ->
+            {
+                group_by: state
+                aggregate: aircrafts.sum()
+                order_by: aircrafts
+            }
+            view: base_view3 is {
+                group_by: state
+                aggregate: aircrafts is sum(aircraft_count)
+            }
+            -> {
+              group_by: state
+              aggregate: aircrafts.sum()
+            }
+            view: sort_issue is {
+                where: popular_name ~ r'I'
+                group_by: popular_name
+                nest: base_view
+                nest: base_view2
+                nest: base_view3
+            }
+        }
+        run: state_facts -> sort_issue
+      `
+      )
+      .run();
+    console.log(result.sql);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const d: any = result.data.toObject();
+    const baseView: {state: string; airports: number}[] = d[0]['base_view'];
+    console.log(baseView);
+    let baseMax = baseView[0];
+    for (const b of baseView) {
+      expect(b.airports).toBeGreaterThanOrEqual(baseMax.airports);
+      baseMax = b;
+    }
+
+    const baseView2: {state: string; aircrafts: number}[] = d[0]['base_view2'];
+    console.log(baseView2);
+    let baseMax2 = baseView2[0];
+    for (const b of baseView2) {
+      expect(b.aircrafts).toBeGreaterThanOrEqual(baseMax2.aircrafts);
+      baseMax2 = b;
+    }
+    // implicit order by
+    const baseView3: {state: string; aircrafts: number}[] = d[0]['base_view3'];
+    console.log(baseView3);
+    let baseMax3 = baseView3[0];
+    for (const b of baseView3) {
+      expect(b.aircrafts).toBeLessThanOrEqual(baseMax3.aircrafts);
+      baseMax3 = b;
+    }
+  });
+
   test.when(runtime.supportsNesting)(
     'number as null- ${databaseName}',
     async () => {