@malloydata/malloy-tests 0.0.301 → 0.0.303

package/package.json

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

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

@@ -43,6 +43,16 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
       run: x -> multistage
     `).malloyResultMatches(runtime, {foo: 1});
   });
+  it('SQL function contributes to field usage', async () => {
+    await expect(`
+      ##! experimental {composite_sources sql_functions}
+      source: state_facts is ${databaseName}.table('malloytest.state_facts')
+      source: x is compose(state_facts, state_facts extend { dimension: foo is 1 }) extend {
+        dimension: foo_copy is sql_number('\${foo}')
+      }
+      run: x -> { group_by: foo_copy }
+    `).malloyResultMatches(runtime, {foo_copy: 1});
+  });
   describe('composited joins', () => {
     it('basic composited join', async () => {
       await expect(`
@@ -559,6 +569,41 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
         }
       `).malloyResultMatches(runtime, {a_avg: 15, c: 2});
     });
+    test('sql function contributes to partition composite selection', async () => {
+      await expect(`
+        ##! experimental.sql_functions
+        #! 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 -> {
+          // a partition comes first, so it would be selected if there was no field usage
+          group_by: b_copy is sql_number('\${b}')
+          limit: 1
+          order_by: b_copy asc
+        }
+      `).malloyResultMatches(runtime, {b_copy: 1});
+    });
+    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}} } }