@malloydata/malloy 0.0.138-dev240404154020 → 0.0.138-dev240404193102

package/dist/dialect/dialect.d.ts

@@ -91,6 +91,7 @@ export declare abstract class Dialect {
     sqlSampleTable(tableSQL: string, sample: Sampling | undefined): string;
     sqlOrderBy(orderTerms: string[]): string;
     sqlTzStr(qi: QueryInfo): string;
+    sqlMakeUnnestKey(key: string, rowKey: string): string;
     abstract sqlTypeToMalloyType(sqlType: string): FieldAtomicTypeDef | undefined;
     abstract malloyTypeToSQLType(malloyType: FieldAtomicTypeDef): string;
     abstract validateTypeName(sqlType: string): boolean;

package/dist/dialect/dialect.js

@@ -145,6 +145,9 @@ class Dialect {
     sqlTzStr(qi) {
         return `"${qi.queryTimezone}"`;
     }
+    sqlMakeUnnestKey(key, rowKey) {
+        return this.concat(key, "'x'", rowKey);
+    }
 }
 exports.Dialect = Dialect;
 //# sourceMappingURL=dialect.js.map

package/dist/dialect/trino/trino.d.ts

@@ -59,5 +59,6 @@ export declare class TrinoDialect extends Dialect {
     sqlTypeToMalloyType(_sqlType: string): FieldAtomicTypeDef | undefined;
     castToString(expression: string): string;
     concat(...values: string[]): string;
+    sqlMakeUnnestKey(key: string, rowKey: string): string;
     validateTypeName(sqlType: string): boolean;
 }

package/dist/dialect/trino/trino.js

@@ -248,14 +248,14 @@ class TrinoDialect extends dialect_1.Dialect {
         const fieldsNames = fieldList.map(f => this.sqlMaybeQuoteIdentifier(f.sqlOutputName));
         if (isArray) {
             if (needDistinctKey) {
-                return `,UNNEST(ARRAY(( SELECT AS STRUCT row_number() over() as __row_id, value FROM UNNEST(${source}) value))) as ${alias}`;
+                return `,UNNEST(zip(${source}, SEQUENCE(1,cardinality(${source})))) as words_0(value,__row_id_from_${alias})`;
             }
             else {
-                return `,UNNEST(ARRAY((SELECT AS STRUCT value FROM unnest(${source}) value))) as ${alias}`;
+                return `,UNNEST(transform(${source}, x -> ROW(x) )) as ${alias}(value)`;
             }
         }
         else if (needDistinctKey) {
-            return `,UNNEST(zip_with(a, SEQUENCE(1,cardinality(a)), (r,__row_id) -> (r, __row_id))) as ${alias}_outer(${alias},__row_id)`;
+            return `,UNNEST(zip_with(a, SEQUENCE(1,cardinality(a)), (r,__row_id) -> (r, __row_id))) as ${alias}_outer(${alias},__row_id_from_${alias})`;
         }
         else {
             return `,UNNEST(${source}) as ${alias}(${fieldsNames.join(', ')})`;
@@ -274,7 +274,7 @@ class TrinoDialect extends dialect_1.Dialect {
     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 `__row_id_from_${alias}`;
         }
         return `${alias}.${fieldName}`;
     }
@@ -469,6 +469,9 @@ ${(0, utils_1.indent)(sql)}
     concat(...values) {
         return values.join(' || ');
     }
+    sqlMakeUnnestKey(key, rowKey) {
+        return `CAST(${key} as VARCHAR) || 'x' || CAST(${rowKey} as VARCHAR)`;
+    }
     validateTypeName(sqlType) {
         // Letters:              BIGINT
         // Numbers:              INT8

package/dist/model/malloy_query.js

@@ -905,8 +905,8 @@ class QueryFieldDistinctKey extends QueryAtomicField {
         }
         else if (this.parent.fieldDef.structSource.type === 'nested') {
             const parentKey = (_a = this.parent.parent) === null || _a === void 0 ? void 0 : _a.getDistinctKey().generateExpression(resultSet);
-            return this.parent.dialect.concat(parentKey || '', // shouldn't have to do this...
-            "'x'", this.parent.dialect.sqlFieldReference(this.parent.getIdentifier(), '__row_id', 'string', true, false));
+            return this.parent.dialect.sqlMakeUnnestKey(parentKey || '', // shouldn't have to do this...
+            this.parent.dialect.sqlFieldReference(this.parent.getIdentifier(), '__row_id', 'string', true, false));
         }
         else {
             // return this.parent.getIdentifier() + "." + "__distinct_key";

package/package.json

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