@malloydata/malloy 0.0.138-dev240401005446 → 0.0.138-dev240401194552

package/dist/dialect/trino/trino.js

@@ -77,7 +77,7 @@ class TrinoDialect extends dialect_1.Dialect {
         this.supportsQualify = true;
         this.supportsSafeCast = true;
         this.supportsNesting = true;
-        this.cantPartitionWindowFunctionsOnExpressions = true;
+        this.cantPartitionWindowFunctionsOnExpressions = false;
         this.orderByClause = 'output_name';
         // TODO(figutierrez): update.
         this.keywords = `
@@ -232,13 +232,10 @@ class TrinoDialect extends dialect_1.Dialect {
         return `ANY_VALUE(CASE WHEN group_set=${groupSet} THEN ${name} END) as ${sqlName}`;
     }
     sqlCoaleseMeasuresInline(groupSet, fieldList) {
-        const fields = fieldList
-            .map(f => `${f.sqlExpression} as ${f.sqlOutputName}`)
-            .join(', ');
-        const nullValues = fieldList
-            .map(f => `NULL as ${f.sqlOutputName}`)
-            .join(', ');
-        return `COALESCE(ANY_VALUE(CASE WHEN group_set=${groupSet} THEN STRUCT(${fields}) END), STRUCT(${nullValues}))`;
+        const fields = fieldList.map(f => f.sqlExpression).join(', ');
+        const nullValues = fieldList.map(_f => 'NULL').join(', ');
+        const definitions = this.buildTypeExpression(fieldList);
+        return `COALESCE(ANY_VALUE(CASE WHEN group_set=${groupSet} THEN CAST(ROW(${fields}) AS ROW(${definitions})) END), CAST(ROW(${nullValues}) AS ROW(${definitions})))`;
     }
     //
     // this code used to be:
@@ -309,12 +306,7 @@ ${(0, utils_1.indent)(sql)}
         return `(SELECT AS STRUCT ${alias}.*)`;
     }
     sqlMaybeQuoteIdentifier(identifier) {
-        // return this.keywords.indexOf(identifier.toUpperCase()) > 0
-        //   ? '`' + identifier + '`'
-        //   : identifier;
-        return identifier;
-        // TODO: may need to escape;
-        //return `"${identifier}"`;
+        return '"' + identifier + '"';
     }
     sqlNow() {
         return (0, malloy_types_1.mkExpr) `CURRENT_TIMESTAMP()`;

package/dist/model/malloy_query.js

@@ -2105,7 +2105,7 @@ class QueryQuery extends QueryField {
                         o.push(`${fi.fieldUsage.resultIndex} ${f.dir || 'ASC'}`);
                     }
                     else if (this.parent.dialect.orderByClause === 'output_name') {
-                        o.push(`${f.field}${f.dir || 'ASC'}`);
+                        o.push(`${this.parent.dialect.sqlMaybeQuoteIdentifier(f.field)} ${f.dir || 'ASC'}`);
                     }
                 }
                 else {

package/package.json

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