@malloydata/malloy 0.0.138-dev240331204754 → 0.0.138-dev240401131656

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 = `
@@ -248,19 +248,20 @@ class TrinoDialect extends dialect_1.Dialect {
     // BigQuery will allocate more resources if we use a CROSS JOIN so we do that instead.
     //
     sqlUnnestAlias(source, alias, fieldList, needDistinctKey, isArray, _isInNestedPipeline) {
+        const fieldsNames = fieldList.map(f => this.sqlMaybeQuoteIdentifier(f.sqlOutputName));
         if (isArray) {
             if (needDistinctKey) {
-                return `LEFT JOIN UNNEST(ARRAY(( SELECT AS STRUCT row_number() over() as __row_id, value FROM UNNEST(${source}) value))) as ${alias}`;
+                return `,UNNEST(ARRAY(( SELECT AS STRUCT row_number() over() as __row_id, value FROM UNNEST(${source}) value))) as ${alias}`;
             }
             else {
-                return `LEFT JOIN UNNEST(ARRAY((SELECT AS STRUCT value FROM unnest(${source}) value))) as ${alias}`;
+                return `,UNNEST(ARRAY((SELECT AS STRUCT value FROM unnest(${source}) value))) as ${alias}`;
             }
         }
         else if (needDistinctKey) {
-            return `LEFT JOIN UNNEST(ARRAY(( SELECT AS STRUCT row_number() over() as __row_id, * FROM UNNEST(${source})))) as ${alias}`;
+            return `,UNNEST(zip_with(a, SEQUENCE(1,cardinality(a)), (r,__row_id) -> (r, __row_id))) as ${alias}_outer(${alias},__row_id)`;
         }
         else {
-            return `LEFT JOIN UNNEST(${source}) as ${alias}`;
+            return `,UNNEST(${source}) as ${alias}(${fieldsNames.join(', ')})`;
         }
     }
     sqlSumDistinctHashedKey(sqlDistinctKey) {
@@ -271,9 +272,13 @@ class TrinoDialect extends dialect_1.Dialect {
         return `(${upperPart} + ${lowerPart}) * ${precisionShiftMultiplier}`;
     }
     sqlGenerateUUID() {
-        return 'GENERATE_UUID()';
+        return 'UUID()';
     }
     sqlFieldReference(alias, fieldName, _fieldType, _isNested, _isArray) {
+        // LTNOTE: hack, in duckdb we can't have structs as tables so we kind of simulate it.
+        if (fieldName === '__row_id') {
+            return `${alias}_outer.__row_id`;
+        }
         return `${alias}.${fieldName}`;
     }
     sqlUnnestPipelineHead(isSingleton, sourceSQLExpression) {
@@ -304,12 +309,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()`;
@@ -374,7 +374,7 @@ ${(0, utils_1.indent)(sql)}
         return cast.expr;
     }
     sqlRegexpMatch(expr, regexp) {
-        return (0, malloy_types_1.mkExpr) `REGEXP_CONTAINS(${expr}, ${regexp})`;
+        return (0, malloy_types_1.mkExpr) `REGEXP_LIKE(${expr}, ${regexp})`;
     }
     sqlLiteralTime(qi, timeString, type, timezone) {
         if (type === 'date') {

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-dev240331204754",
+  "version": "0.0.138-dev240401131656",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",