@malloydata/malloy-tests 0.0.271-whscullin-pinning-250430202557 → 0.0.272

package/package.json

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

package/src/core/parameters.spec.ts

@@ -345,4 +345,20 @@ describe('parameters', () => {
       `
     ).malloyResultMatches(runtime, {param_value: 10});
   });
+  // TODO fix this when we redo namespaces
+  it.skip('default value not passed through extension propagates, with composite source', async () => {
+    await expect(
+      `
+        ##! experimental { parameters composite_sources }
+        source: ab_new(param::number is 10) is compose(
+          duckdb.table('malloytest.state_facts'),
+          duckdb.table('malloytest.state_facts') extend { dimension: foo is 1 }
+        ) extend {
+          dimension: param_value is param
+        }
+        source: ab_new_new is ab_new extend {}
+        run: ab_new_new -> { group_by: param_value, foo }
+      `
+    ).malloyResultMatches(runtime, {param_value: 10});
+  });
 });

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

@@ -448,4 +448,33 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
       run: x(param is 2) -> { group_by: b }
     `).malloyResultMatches(wrappedRuntime, {b: 3});
   });
+  it('nested composite where field usage depends on which composite selected', async () => {
+    await expect(`
+      ##! experimental.composite_sources
+      source: state_facts is ${databaseName}.table('malloytest.state_facts')
+      source: x is compose(
+        compose(
+          state_facts extend {
+            dimension: a is 'a1'
+          },
+          state_facts extend {
+            dimension: b is 'b1'
+          }
+        ) extend {
+          dimension: x is b
+        },
+        compose(
+          state_facts extend {
+            dimension: a is 'a2'
+          },
+          state_facts extend {
+            dimension: b is 'b2'
+          }
+        ) extend {
+          dimension: x is b
+        }
+      )
+      run: x -> { group_by: x }
+    `).malloyResultMatches(runtime, {x: 'b1'});
+  });
 });

package/src/databases/all/compound-atomic.spec.ts

@@ -579,13 +579,9 @@ describe.each(runtimes.runtimeList)(
       test('nest a group_by repeated record', async () => {
         await expect(`
           run: ${conName}.sql(""" ${selectAB('ab')} """)
-          -> {
-            nest: gab is {group_by: ab }
-          } -> {
-            // mtoy todo fix malloyResultMatches, this un-nest should not be needed
-            select: gab.ab
-          }
-        `).malloyResultMatches(runtime, {ab: ab_eq});
+          -> { nest: gab is {group_by: ab } }
+          -> { select: gab.ab }
+        `).matchesRows(runtime, {ab: ab_eq});
       });
     });
   }

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

@@ -28,6 +28,7 @@ import {databasesFromEnvironmentOr} from '../../util';
 import '../../util/db-jest-matchers';
 
 const runtimes = new RuntimeList(databasesFromEnvironmentOr(allDatabases));
+
 function modelText(connectionName: string) {
   return `
   source: aircraft_models is ${connectionName}.table('malloytest.aircraft_models') extend {

package/src/util/db-matcher-support.ts

@@ -41,6 +41,18 @@ interface QueryRunResult {
   queryTestTag: Tag;
 }
 
+function errInfo(e: {message?: string; stack?: string}) {
+  let err = '';
+  const trace = e.stack ?? '';
+  if (e.message && !trace.includes(e.message)) {
+    err = `ERROR: ${e.message}\n`;
+  }
+  if (e.stack) {
+    err += `STACK: ${e.stack}\n`;
+  }
+  return err;
+}
+
 export async function runQuery(
   tq: TestQuery
 ): Promise<Partial<QueryRunResult>> {
@@ -60,7 +72,7 @@ export async function runQuery(
       fail: {
         pass: false,
         message: () =>
-          `Could not prepare query to run: ${e.message}\n\nQUERY:\n${queryText}`,
+          `Could not prepare query to run:\n${queryText}\n\n${errInfo(e)}`,
       },
     };
   }
@@ -78,13 +90,11 @@ export async function runQuery(
       )}`;
     } else {
       try {
-        failMsg += `\nMESSAGE: ${e.message}\nSQL: ${await query.getSQL()}\n`;
+        failMsg += `\nSQL: ${await query.getSQL()}\n`;
       } catch (e2) {
         failMsg += '\nSQL FOR QUERY COULD NOT BE COMPUTED\n';
       }
-      if (e.stack) {
-        failMsg += `STACK:\n${e.stack}\n`;
-      }
+      failMsg += errInfo(e);
     }
     return {fail: {pass: false, message: () => failMsg}, query};
   }