@malloydata/malloy 0.0.138-dev240402223657 → 0.0.138-dev240403155507

package/dist/dialect/trino/trino.js

@@ -204,7 +204,7 @@ class TrinoDialect extends dialect_1.Dialect {
                 if (f.isArray) {
                     s = `array(${s})`;
                 }
-                fields.push(s);
+                fields.push(`${f.sqlOutputName} ${s}`);
             }
             else {
                 fields.push(`${f.sqlOutputName} ${trinoTypeMap[f.type] || f.type}`);
@@ -216,7 +216,7 @@ class TrinoDialect extends dialect_1.Dialect {
     sqlAggregateTurtle(groupSet, fieldList, orderBy, limit) {
         const expressions = fieldList.map(f => f.sqlExpression).join(',\n ');
         const definitions = this.buildTypeExpression(fieldList);
-        let ret = `ARRAY_AGG(CASE WHEN group_set=${groupSet} THEN CAST(ROW(${expressions}) AS ROW(${definitions})) END ${orderBy})`;
+        let ret = `ARRAY_AGG(CAST(ROW(${expressions}) AS ROW(${definitions})) ${orderBy}) FILTER (WHERE group_set=${groupSet})`;
         if (limit !== undefined) {
             ret = `SLICE(${ret}, 1, ${limit})`;
         }
@@ -365,7 +365,7 @@ ${(0, utils_1.indent)(sql)}
             const dstType = typeof cast.dstType === 'string'
                 ? this.malloyTypeToSQLType({ type: cast.dstType })
                 : cast.dstType.raw;
-            const castFunc = cast.safe ? 'SAFE_CAST' : 'CAST';
+            const castFunc = cast.safe ? 'TRY_CAST' : 'CAST';
             return (0, malloy_types_1.mkExpr) `${castFunc}(${cast.expr} AS ${dstType})`;
         }
         return cast.expr;
@@ -436,12 +436,10 @@ ${(0, utils_1.indent)(sql)}
         return tableSQL;
     }
     sqlLiteralString(literal) {
-        const noVirgule = literal.replace(/\\/g, '\\\\');
-        return "'" + noVirgule.replace(/'/g, "\\'") + "'";
+        return "'" + literal.replace(/'/g, "''") + "'";
     }
     sqlLiteralRegexp(literal) {
-        const noVirgule = literal.replace(/\\/g, '\\\\');
-        return "'" + noVirgule.replace(/'/g, "\\'") + "'";
+        return "'" + literal.replace(/'/g, "''") + "'";
     }
     getGlobalFunctionDef(name) {
         // TODO: implement

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.138-dev240402223657",
+  "version": "0.0.138-dev240403155507",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",