@malloydata/malloy-tests 0.0.138-dev240405003346 → 0.0.138-dev240408220220

package/package.json

@@ -21,13 +21,13 @@
   },
   "dependencies": {
     "@jest/globals": "^29.4.3",
-    "@malloydata/db-bigquery": "^0.0.138-dev240405003346",
-    "@malloydata/db-duckdb": "^0.0.138-dev240405003346",
-    "@malloydata/db-postgres": "^0.0.138-dev240405003346",
-    "@malloydata/db-snowflake": "^0.0.138-dev240405003346",
-    "@malloydata/db-trino": "^0.0.138-dev240405003346",
-    "@malloydata/malloy": "^0.0.138-dev240405003346",
-    "@malloydata/render": "^0.0.138-dev240405003346",
+    "@malloydata/db-bigquery": "^0.0.138-dev240408220220",
+    "@malloydata/db-duckdb": "^0.0.138-dev240408220220",
+    "@malloydata/db-postgres": "^0.0.138-dev240408220220",
+    "@malloydata/db-snowflake": "^0.0.138-dev240408220220",
+    "@malloydata/db-trino": "^0.0.138-dev240408220220",
+    "@malloydata/malloy": "^0.0.138-dev240408220220",
+    "@malloydata/render": "^0.0.138-dev240408220220",
     "jsdom": "^22.1.0",
     "luxon": "^2.4.0",
     "madge": "^6.0.0"
@@ -36,5 +36,5 @@
     "@types/jsdom": "^21.1.1",
     "@types/luxon": "^2.4.0"
   },
-  "version": "0.0.138-dev240405003346"
+  "version": "0.0.138-dev240408220220"
 }

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

@@ -105,6 +105,8 @@ expressionModels.forEach((expressionModel, databaseName) => {
 
     const result = await run();
     testCases.forEach((testCase, i) => {
+      // console.log(databaseName, result.sql);
+      // console.log(result.data);
       expect(result.data.path(0, `f${i}`).value).toBe(testCase[1]);
     });
   };
@@ -170,11 +172,7 @@ expressionModels.forEach((expressionModel, databaseName) => {
     it(`works - ${databaseName}`, async () => {
       await funcTestMultiple(
         ['ceil(1.9)', 2],
-        // TODO Remove when we upgrade to DuckDB 0.8.X -- DuckDB has some bugs with rounding
-        // that are fixed in 0.8.
-        ...(databaseName === 'duckdb_wasm'
-          ? []
-          : ([['ceil(-1.9)', -1]] as [string, number][])),
+        ['ceil(-1.9)', -1],
         ['ceil(null)', null]
       );
     });
@@ -216,9 +214,16 @@ expressionModels.forEach((expressionModel, databaseName) => {
         ["replace('aaaa', r'.', 'c')", 'cccc'],
         [
           "replace('axbxc', r'(a).(b).(c)', '\\\\0 - \\\\1 - \\\\2 - \\\\3')",
-          databaseName === 'postgres' ? '\\0 - a - b - c' : 'axbxc - a - b - c',
+          databaseName === 'postgres'
+            ? '\\0 - a - b - c'
+            : databaseName === 'trino'
+            ? '0 - 1 - 2 - 3'
+            : 'axbxc - a - b - c',
+        ],
+        [
+          "replace('aaaa', '', 'c')",
+          databaseName === 'trino' ? 'cacacacac' : 'aaaa',
         ],
-        ["replace('aaaa', '', 'c')", 'aaaa'],
         ["replace(null, 'a', 'c')", null],
         ["replace('aaaa', null, 'c')", null],
         ["replace('aaaa', 'a', null)", null]
@@ -232,7 +237,7 @@ expressionModels.forEach((expressionModel, databaseName) => {
         ["substr('foo', 2)", 'oo'],
         ["substr('foo', 2, 1)", 'o'],
         ["substr('foo bar baz', -3)", 'baz'],
-        ['substr(null, 1, 2)', null],
+        ["substr(nullif('x','x'), 1, 2)", null], //  nullMatchesFunctionSignature.
         ["substr('aaaa', null, 1)", null],
         ["substr('aaaa', 1, null)", null]
       );
@@ -245,7 +250,7 @@ expressionModels.forEach((expressionModel, databaseName) => {
         ['floor(cbrt!(27)::number)', 3],
         ['floor(cbrt!number(27))', 3],
         ["substr('foo bar baz', -3)", 'baz'],
-        ['substr(null, 1, 2)', null],
+        ["substr(nullif('x','x'), 1, 2)", null], // nullMatchesFunctionSignature
         ["substr('aaaa', null, 1)", null],
         ["substr('aaaa', 1, null)", null]
       );
@@ -254,7 +259,7 @@ expressionModels.forEach((expressionModel, databaseName) => {
 
   describe('stddev', () => {
     // TODO symmetric aggregates don't work with custom aggregate functions in BQ currently
-    if (['bigquery', 'snowflake'].includes(databaseName)) return;
+    if (['bigquery', 'snowflake', 'trino'].includes(databaseName)) return;
     it(`works - ${databaseName}`, async () => {
       await funcTestAgg('round(stddev(aircraft_models.seats))', 29);
     });

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

@@ -7,7 +7,7 @@
  * (the "Software"), to deal in the Software without restriction,
  * including without limitation the rights to use, copy, modify, merge,
  * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
+ * and to permit persons to whom the Software is furnished to do so
  * subject to the following conditions:
  *
  * The above copyright notice and this permission notice shall be
@@ -231,7 +231,7 @@ runtimes.runtimeMap.forEach((runtime, databaseName) => {
       }
       run: f->{
         aggregate:
-          row_count is count(concat(state,a.r))
+          row_count is count(concat(state,a.r::string))
           left_sum is airport_count.sum()
           right_sum is a.r.sum()
           sum_sum is sum(airport_count + a.r)
@@ -897,7 +897,10 @@ SELECT row_to_json(finalStage) as row FROM __stage0 AS finalStage`);
 
   it(`sql as source - ${databaseName}`, async () => {
     await expect(`
-      run: ${sql1234} -> { select: a }
+      run: ${sql1234} -> {
+        select: a
+        order_by: 1
+      }
     `).malloyResultMatches(runtime, {a: 1});
   });
 
@@ -919,6 +922,7 @@ SELECT row_to_json(finalStage) as row FROM __stage0 AS finalStage`);
         } AS by_name_query
       """) -> {
           select: *; where: popular_name = 'Emma'
+          order_by: state_count DESC
         }`;
     await expect(turduckenQuery).malloyResultMatches(runtime, {state_count: 6});
   });
@@ -929,6 +933,7 @@ SELECT row_to_json(finalStage) as row FROM __stage0 AS finalStage`);
       run: ${sql1234} -> {
         extend: { dimension: c is a + 1 }
         select: c
+        order_by: 1
       }
     `).malloyResultMatches(runtime, {c: 2});
   });
@@ -939,6 +944,7 @@ SELECT row_to_json(finalStage) as row FROM __stage0 AS finalStage`);
         view: bar is {
           extend: { dimension: c is a + 1 }
           select: c
+          order_by: 1
         }
       } -> bar
     `).malloyResultMatches(runtime, {c: 2});
@@ -950,10 +956,12 @@ SELECT row_to_json(finalStage) as row FROM __stage0 AS finalStage`);
         view: bar is {
           extend: {dimension: c is a + 1}
           select: c
+          order_by: 1
         }
         view: baz is bar +  {
           extend: {dimension: d is c + 1}
           select: d
+          order_by: 1
         }
       } -> baz
     `).malloyResultMatches(runtime, {d: 3});