@malloydata/malloy-tests 0.0.300 → 0.0.302

package/package.json

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

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,81 @@ 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('partition composite with fields different from partition name', async () => {
+      await expect(`
+        #! experimental { partition_composite { partition_field=p partitions={x={a} y={b}} } }
+        source: comp is ${databaseName}.sql("""
+                    SELECT 10 AS ${id('a')}, 0 AS ${id('b')}, 'x' AS ${id('p')}
+          UNION ALL SELECT 20 AS ${id('a')}, 0 AS ${id('b')}, 'x' AS ${id('p')}
+          UNION ALL SELECT 0  AS ${id('a')}, 1 AS ${id('b')}, 'y' AS ${id('p')}
+          UNION ALL SELECT 0  AS ${id('a')}, 2 AS ${id('b')}, 'y' 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/duckdb/streaming.spec.ts

@@ -22,7 +22,7 @@
  */
 
 import type {WriteStream} from '@malloydata/malloy';
-import {CSVWriter} from '@malloydata/malloy';
+import {CSVWriter, JSONWriter} from '@malloydata/malloy';
 import {describeIfDatabaseAvailable} from '../../util';
 import {RuntimeList} from '../../runtimes';
 
@@ -40,7 +40,7 @@ class StringAccumulator implements WriteStream {
 
 const runtimes = ['duckdb'];
 
-const [_describe, databases] = describeIfDatabaseAvailable(runtimes);
+const [describe, databases] = describeIfDatabaseAvailable(runtimes);
 
 function modelText(databaseName: string) {
   return `source: airports is ${databaseName}.table('test/data/duckdb/airports.parquet') extend {
@@ -101,15 +101,17 @@ describe('Streaming tests', () => {
   });
 
   runtimes.runtimeMap.forEach((runtime, databaseName) => {
-    it(`stream nested results to CSV - ${databaseName}`, async () => {
-      const stream = runtime
-        .loadModel(modelText(databaseName))
-        .loadQuery('run: airports -> airports_by_region')
-        .runStream();
-      const accummulator = new StringAccumulator();
-      const csvWriter = new CSVWriter(accummulator);
-      await csvWriter.process(stream);
-      const expectedCsv = `faa_region,by_state,,,,by_facility_type,,airport_count
+    describe('csv', () => {
+      it(`stream nested results - ${databaseName}`, async () => {
+        const stream = runtime
+          .loadModel(modelText(databaseName))
+          .loadQuery('run: airports -> airports_by_region')
+          .runStream();
+        const accumulator = new StringAccumulator();
+        const csvWriter = new CSVWriter(accumulator);
+        await csvWriter.process(stream);
+        const expectedCsv = `\
+faa_region,by_state,,,,by_facility_type,,airport_count
 AGL,state,airport_count,by_county,,facility_type,airport_count,4437
 ,IL,890,county,airport_count,AIRPORT,3443,
 ,,,COOK,51,HELIPORT,826,
@@ -125,25 +127,172 @@ ASW,state,airport_count,by_county,,facility_type,airport_count,3268
 ,,,PLAQUEMINES,31,,,
 ,,,VERMILION,29,,,
 `;
-      expect(accummulator.accumulatedValue).toBe(expectedCsv);
-    });
+        expect(accumulator.accumulatedValue).toBe(expectedCsv);
+      });
 
-    it(`stream simple results to CSV - ${databaseName}`, async () => {
-      const stream = runtime
-        .loadModel(modelText(databaseName))
-        .loadQuery('run: airports -> higher_elevation')
-        .runStream();
-      const accummulator = new StringAccumulator();
-      const csvWriter = new CSVWriter(accummulator);
-      await csvWriter.process(stream);
-      const expectedCsv = `faa_region,airport_count,avg_elevation
+      it(`stream simple results - ${databaseName}`, async () => {
+        const stream = runtime
+          .loadModel(modelText(databaseName))
+          .loadQuery('run: airports -> higher_elevation')
+          .runStream();
+        const accumulator = new StringAccumulator();
+        const csvWriter = new CSVWriter(accumulator);
+        await csvWriter.process(stream);
+        const expectedCsv = `\
+faa_region,airport_count,avg_elevation
 ANM,2102,3284.3910561370126
 AWP,1503,1667.0991350632069
 ACE,1579,1339.0139328689045
 ASW,3268,1007.2873317013464
 AGL,4437,983.4800540906018
 `;
-      expect(accummulator.accumulatedValue).toBe(expectedCsv);
+        expect(accumulator.accumulatedValue).toBe(expectedCsv);
+      });
+    });
+
+    describe('json', () => {
+      it(`stream nested results - ${databaseName}`, async () => {
+        const stream = runtime
+          .loadModel(modelText(databaseName))
+          .loadQuery('run: airports -> airports_by_region')
+          .runStream();
+        const accumulator = new StringAccumulator();
+        const jsonWriter = new JSONWriter(accumulator);
+        await jsonWriter.process(stream);
+        const expectedJson = `\
+[
+  {
+    "faa_region": "AGL",
+    "by_state": [
+      {
+        "state": "IL",
+        "airport_count": 890,
+        "by_county": [
+          {
+            "county": "COOK",
+            "airport_count": 51
+          },
+          {
+            "county": "LA SALLE",
+            "airport_count": 39
+          }
+        ]
+      },
+      {
+        "state": "OH",
+        "airport_count": 749,
+        "by_county": [
+          {
+            "county": "FRANKLIN",
+            "airport_count": 27
+          },
+          {
+            "county": "CUYAHOGA",
+            "airport_count": 27
+          }
+        ]
+      }
+    ],
+    "by_facility_type": [
+      {
+        "facility_type": "AIRPORT",
+        "airport_count": 3443
+      },
+      {
+        "facility_type": "HELIPORT",
+        "airport_count": 826
+      }
+    ],
+    "airport_count": 4437
+  },
+  {
+    "faa_region": "ASW",
+    "by_state": [
+      {
+        "state": "TX",
+        "airport_count": 1845,
+        "by_county": [
+          {
+            "county": "HARRIS",
+            "airport_count": 135
+          },
+          {
+            "county": "TARRANT",
+            "airport_count": 63
+          }
+        ]
+      },
+      {
+        "state": "LA",
+        "airport_count": 500,
+        "by_county": [
+          {
+            "county": "PLAQUEMINES",
+            "airport_count": 31
+          },
+          {
+            "county": "VERMILION",
+            "airport_count": 29
+          }
+        ]
+      }
+    ],
+    "by_facility_type": [
+      {
+        "facility_type": "AIRPORT",
+        "airport_count": 2341
+      },
+      {
+        "facility_type": "HELIPORT",
+        "airport_count": 861
+      }
+    ],
+    "airport_count": 3268
+  }
+]
+`;
+        expect(accumulator.accumulatedValue).toBe(expectedJson);
+      });
+
+      it(`stream simple results - ${databaseName}`, async () => {
+        const stream = runtime
+          .loadModel(modelText(databaseName))
+          .loadQuery('run: airports -> higher_elevation')
+          .runStream();
+        const accumulator = new StringAccumulator();
+        const jsonWriter = new JSONWriter(accumulator);
+        await jsonWriter.process(stream);
+        const expectedJson = `\
+[
+  {
+    "faa_region": "ANM",
+    "airport_count": 2102,
+    "avg_elevation": 3284.3910561370126
+  },
+  {
+    "faa_region": "AWP",
+    "airport_count": 1503,
+    "avg_elevation": 1667.0991350632069
+  },
+  {
+    "faa_region": "ACE",
+    "airport_count": 1579,
+    "avg_elevation": 1339.0139328689045
+  },
+  {
+    "faa_region": "ASW",
+    "airport_count": 3268,
+    "avg_elevation": 1007.2873317013464
+  },
+  {
+    "faa_region": "AGL",
+    "airport_count": 4437,
+    "avg_elevation": 983.4800540906018
+  }
+]
+`;
+        expect(accumulator.accumulatedValue).toBe(expectedJson);
+      });
     });
   });
 });