@malloydata/malloy-tests 0.0.196-dev241008013446 → 0.0.196

package/package.json

@@ -21,13 +21,13 @@
   },
   "dependencies": {
     "@jest/globals": "^29.4.3",
-    "@malloydata/db-bigquery": "^0.0.196-dev241008013446",
-    "@malloydata/db-duckdb": "^0.0.196-dev241008013446",
-    "@malloydata/db-postgres": "^0.0.196-dev241008013446",
-    "@malloydata/db-snowflake": "^0.0.196-dev241008013446",
-    "@malloydata/db-trino": "^0.0.196-dev241008013446",
-    "@malloydata/malloy": "^0.0.196-dev241008013446",
-    "@malloydata/render": "^0.0.196-dev241008013446",
+    "@malloydata/db-bigquery": "^0.0.196",
+    "@malloydata/db-duckdb": "^0.0.196",
+    "@malloydata/db-postgres": "^0.0.196",
+    "@malloydata/db-snowflake": "^0.0.196",
+    "@malloydata/db-trino": "^0.0.196",
+    "@malloydata/malloy": "^0.0.196",
+    "@malloydata/render": "^0.0.196",
     "events": "^3.3.0",
     "jsdom": "^22.1.0",
     "luxon": "^2.4.0",
@@ -37,5 +37,5 @@
     "@types/jsdom": "^21.1.1",
     "@types/luxon": "^2.4.0"
   },
-  "version": "0.0.196-dev241008013446"
+  "version": "0.0.196"
 }

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

@@ -325,7 +325,7 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
 
   // TODO not sure why this test needs to be skipped on postgres, feels like an oversight
   // NOTE: unless underlying type is stored as a timestamp snowflake does not support extraction
-  test.when(!['postgres', 'snowflake'].includes(databaseName))(
+  test.when(!['postgres', 'snowflake', 'mysql'].includes(databaseName))(
     'model: dates named',
     async () => {
       await expect(`

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

@@ -478,9 +478,8 @@ expressionModels.forEach((x, databaseName) => {
     });
 
     it(`properly isolated nested calculations - ${databaseName}`, async () => {
-      const result = await expressionModel
-        .loadQuery(
-          `run: ${databaseName}.table('malloytest.airports') -> {
+      await expect(`
+            run: ${databaseName}.table('malloytest.airports') -> {
             group_by: faa_region
             aggregate: airport_count is count()
             calculate: id is row_number()
@@ -498,10 +497,10 @@ expressionModels.forEach((x, databaseName) => {
             // should be 2 rows, max of 2
             group_by: by_fac_type.id2
             order_by: id2 desc
-          }`
-        )
-        .run();
-      expect(result.data.path(0, 'id2').value).toBe(2);
+          }
+      `).malloyResultMatches(expressionModel, {
+        id2: 2,
+      });
     });
   });
 
@@ -944,7 +943,7 @@ expressionModels.forEach((x, databaseName) => {
     it(`trim works - ${databaseName}`, async () => {
       await funcTestMultiple(
         ["trim('  keep this  ')", 'keep this'],
-        ["trim('_ _keep_this_ _', '_ ')", 'keep_this'],
+        ["trim('__keep_this__', '_')", 'keep_this'],
         ["trim(' keep everything ', '')", ' keep everything '],
         ["trim('null example', null)", null],
         ["trim(null, 'a')", null],
@@ -956,7 +955,7 @@ expressionModels.forEach((x, databaseName) => {
     it(`ltrim works - ${databaseName}`, async () => {
       await funcTestMultiple(
         ["ltrim('  keep this ->  ')", 'keep this ->  '],
-        ["ltrim('_ _keep_this -> _ _', '_ ')", 'keep_this -> _ _'],
+        ["ltrim('__keep_this -> __', '_')", 'keep_this -> __'],
         ["ltrim(' keep everything ', '')", ' keep everything '],
         ["ltrim('null example', null)", null],
         ["ltrim(null, 'a')", null],
@@ -968,7 +967,7 @@ expressionModels.forEach((x, databaseName) => {
     it(`rtrim works - ${databaseName}`, async () => {
       await funcTestMultiple(
         ["rtrim('  <- keep this  ')", '  <- keep this'],
-        ["rtrim('_ _ <- keep_this_ _', '_ ')", '_ _ <- keep_this'],
+        ["rtrim('__ <- keep_this__', '_')", '__ <- keep_this'],
         ["rtrim(' keep everything ', '')", ' keep everything '],
         ["rtrim('null example', null)", null],
         ["rtrim(null, 'a')", null],
@@ -994,7 +993,7 @@ expressionModels.forEach((x, databaseName) => {
   });
 
   describe('byte_length', () => {
-    it(`works - ${databaseName}`, async () => {
+    it.when(databaseName !== 'mysql')(`works - ${databaseName}`, async () => {
       await funcTestMultiple(
         ["byte_length('hello')", 5],
         ["byte_length('©')", 2],
@@ -1059,7 +1058,7 @@ expressionModels.forEach((x, databaseName) => {
     });
   });
   describe('unicode', () => {
-    it(`works - ${databaseName}`, async () => {
+    it.when(databaseName !== 'mysql')(`works - ${databaseName}`, async () => {
       await funcTestMultiple(
         ["unicode('A')", 65],
         ["unicode('â')", 226],
@@ -1146,7 +1145,6 @@ expressionModels.forEach((x, databaseName) => {
     test.when(supported)('works generally', async () => {
       await expect(`
           // be accurate within 30%
-          // # test.debug
           run: ${databaseName}.table('malloytest.state_facts') -> {
             aggregate: passes is abs(count_approx(state)-count(state))/count(state) < 0.3
             aggregate: also_passes is abs(count_approx(airport_count)-count(airport_count))/count(airport_count) < 0.3
@@ -1445,7 +1443,11 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
 
     it(`works with fanout and order_by - ${databaseName}`, async () => {
       // TODO bigquery cannot handle both fanout and order_by today
-      if (['bigquery', 'snowflake', 'trino', 'presto'].includes(databaseName))
+      if (
+        ['bigquery', 'snowflake', 'trino', 'presto', 'mysql'].includes(
+          databaseName
+        )
+      )
         return;
       await expect(`##! experimental.aggregate_order_by
       run: state_facts extend { join_many:
@@ -1464,7 +1466,7 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
 
     it(`works with fanout - ${databaseName}`, async () => {
       // Snowflake cannot handle the fanout case today
-      if (databaseName === 'snowflake') return;
+      if (databaseName === 'snowflake' || databaseName === 'mysql') return;
       await expect(`##! experimental.aggregate_order_by
       run: state_facts extend { join_many:
         state_facts2 is ${databaseName}.table('malloytest.state_facts')
@@ -1480,7 +1482,7 @@ describe.each(runtimes.runtimeList)('%s', (databaseName, runtime) => {
 
     it(`works with fanout and separator - ${databaseName}`, async () => {
       // Snowflake cannot handle the fanout case today
-      if (databaseName === 'snowflake') return;
+      if (databaseName === 'snowflake' || databaseName === 'mysql') return;
       await expect(`##! experimental.aggregate_order_by
       run: state_facts extend { join_many:
         state_facts2 is ${databaseName}.table('malloytest.state_facts')