@malloydata/malloy-tests 0.0.299 → 0.0.301

package/package.json

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

package/src/core/api.spec.ts

@@ -39,6 +39,22 @@ if (!envDatabases.includes('duckdb')) {
   describe.skip = describe;
 }
 
+describe('basic', () => {
+  test('can get query by name from explore', async () => {
+    const model = runtime.loadModel(`
+      source: s1 is duckdb.table('malloytest.aircraft') extend {
+        view: v is {
+          where: state = 'CA'
+          group_by: state
+        }
+      }
+    `);
+    const q1 = model.loadExploreByName('s1');
+    const oneState = await q1.loadQueryByName('v').run();
+    expect(oneState.data.path(0, 'state').value).toBe('CA');
+  });
+});
+
 describe('extendModel', () => {
   test('can run query in extend section', async () => {
     const model = runtime.loadModel(`

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

@@ -275,7 +275,7 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
         ),
         state_facts extend { dimension: foo is 1.3, bar is 2.3, baz is 3.3 }
       )
-      // even though the first composite has all the fields foo, bar, baz; it is impossible
+      // even though the first composite hAS all the fields foo, bar, baz; it is impossible
       // to resolve it using the first composite, because you can't have both bar and baz
       // so the second input source is used instead
       run: x -> { group_by: foo, bar, baz }
@@ -541,4 +541,65 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
       run: x -> { group_by: x }
     `).malloyResultMatches(runtime, {x: 'b1'});
   });
+  describe('partition composites', () => {
+    const id = (n: string) => (databaseName === 'snowflake' ? `"${n}"` : n);
+    test('partition composite basic', async () => {
+      await expect(`
+        #! experimental { partition_composite { partition_field=p partitions={a={a} b={b}} } }
+        source: comp is ${databaseName}.sql("""
+                    SELECT 10 AS ${id('a')}, 0 AS ${id('b')}, 'a' AS ${id('p')}
+          UNION ALL SELECT 20 AS ${id('a')}, 0 AS ${id('b')}, 'a' AS ${id('p')}
+          UNION ALL SELECT 0  AS ${id('a')}, 1 AS ${id('b')}, 'b' AS ${id('p')}
+          UNION ALL SELECT 0  AS ${id('a')}, 2 AS ${id('b')}, 'b' AS ${id('p')}
+        """)
+
+        run: comp -> {
+          aggregate: a_avg is a.avg()
+          aggregate: c is count()
+        }
+      `).malloyResultMatches(runtime, {a_avg: 15, c: 2});
+    });
+    test('extended partition composite', async () => {
+      await expect(`
+        #! experimental { partition_composite { partition_field=p partitions={a={a} b={b}} } }
+        source: comp is ${databaseName}.sql("""
+                    SELECT 10 AS ${id('a')}, 0 AS ${id('b')}, 'a' AS ${id('p')}
+          UNION ALL SELECT 20 AS ${id('a')}, 0 AS ${id('b')}, 'a' AS ${id('p')}
+          UNION ALL SELECT 0  AS ${id('a')}, 1 AS ${id('b')}, 'b' AS ${id('p')}
+          UNION ALL SELECT 0  AS ${id('a')}, 2 AS ${id('b')}, 'b' AS ${id('p')}
+        """)
+
+        source: comp_ext is comp extend {
+          measure: a_avg is a.avg()
+        }
+
+        run: comp_ext -> {
+          aggregate: a_avg
+          aggregate: c is count()
+        }
+      `).malloyResultMatches(runtime, {a_avg: 15, c: 2});
+    });
+    test('partition composite nested in composite', async () => {
+      await expect(`
+        ##! experimental.composite_sources
+        #! experimental { partition_composite { partition_field=p partitions={a={a} b={b}} } }
+        source: part_comp is ${databaseName}.sql("""
+                    SELECT 10 AS ${id('a')}, 0 AS ${id('b')}, 'a' AS ${id('p')}
+          UNION ALL SELECT 20 AS ${id('a')}, 0 AS ${id('b')}, 'a' AS ${id('p')}
+          UNION ALL SELECT 0  AS ${id('a')}, 1 AS ${id('b')}, 'b' AS ${id('p')}
+          UNION ALL SELECT 0  AS ${id('a')}, 2 AS ${id('b')}, 'b' AS ${id('p')}
+        """)
+
+        source: comp is compose(
+          part_comp,
+          ${databaseName}.sql('SELECT 10 AS ${id('c')}')
+        )
+
+        run: comp -> {
+          aggregate: a_avg is a.avg()
+          aggregate: c is count()
+        }
+      `).malloyResultMatches(runtime, {a_avg: 15, c: 2});
+    });
+  });
 });

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

@@ -55,9 +55,9 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
       run: models->{
         group_by:
           manufacturer,
-          big is seats >=21
+          big is seats >= 21
         aggregate: model_count is count()
-      }->{
+      } -> {
         group_by: big
         aggregate: model_count is model_count.sum()
       }