@malloydata/malloy-tests 0.0.271-experiment-250430155127 → 0.0.271

package/package.json

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

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

@@ -448,8 +448,7 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
       run: x(param is 2) -> { group_by: b }
     `).malloyResultMatches(wrappedRuntime, {b: 3});
   });
-  // TODO still need to fix this
-  it.skip('nested composite where field usage depends on which composite selected', async () => {
+  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')

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/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}\n\nSTACK:\n${e.stack}`,
+          `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};
   }