@malloydata/malloy 0.0.149 → 0.0.150

package/dist/dialect/dialect.d.ts

@@ -57,6 +57,7 @@ export declare abstract class Dialect {
     supportsComplexFilteredSources: boolean;
     supportsTempTables: boolean;
     hasModOperator: boolean;
+    supportsLeftJoinUnnest: boolean;
     abstract getGlobalFunctionDef(name: string): DialectFunctionOverloadDef[] | undefined;
     abstract quoteTablePath(tablePath: string): string;
     abstract sqlGroupSetTable(groupSetCount: number): string;

package/dist/dialect/dialect.js

@@ -79,6 +79,8 @@ class Dialect {
         // can create temp tables
         this.supportsTempTables = true;
         this.hasModOperator = true;
+        // can LEFT JOIN UNNEST
+        this.supportsLeftJoinUnnest = true;
     }
     sqlFinalStage(_lastStageName, _fields) {
         throw new Error('Dialect has no final Stage but called Anyway');

package/dist/dialect/trino/functions/log.js

@@ -29,8 +29,8 @@ function fnLog() {
     const base = (0, util_1.makeParam)('base', (0, util_1.anyExprType)('number'));
     return [
         (0, util_1.overload)((0, util_1.minScalar)('number'), [value.param, base.param], 
-        // Snowflake take base first, then value
-        (0, util_1.sql) `LOG(${base.arg},${value.arg})`),
+        // Trino has it but Presto doesn't
+        (0, util_1.sql) `(LN(${value.arg}) / LN(${base.arg}))`),
     ];
 }
 exports.fnLog = fnLog;

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

@@ -36,7 +36,7 @@ export declare class TrinoDialect extends Dialect {
     sqlAnyValueTurtle(groupSet: number, fieldList: DialectFieldList): string;
     sqlAnyValueLastTurtle(name: string, groupSet: number, sqlName: string): string;
     sqlCoaleseMeasuresInline(groupSet: number, fieldList: DialectFieldList): string;
-    sqlUnnestAlias(source: string, alias: string, fieldList: DialectFieldList, needDistinctKey: boolean, isArray: boolean, _isInNestedPipeline: boolean): string;
+    sqlUnnestAlias(source: string, alias: string, _fieldList: DialectFieldList, needDistinctKey: boolean, isArray: boolean, _isInNestedPipeline: boolean): string;
     sqlSumDistinctHashedKey(sqlDistinctKey: string): string;
     sqlGenerateUUID(): string;
     sqlFieldReference(alias: string, fieldName: string, _fieldType: string, _isNested: boolean, _isArray: boolean): string;
@@ -70,5 +70,7 @@ export declare class TrinoDialect extends Dialect {
 export declare class PrestoDialect extends TrinoDialect {
     name: string;
     supportsPipelinesInViews: boolean;
+    supportsLeftJoinUnnest: boolean;
     sqlGenerateUUID(): string;
+    sqlUnnestAlias(source: string, alias: string, _fieldList: DialectFieldList, needDistinctKey: boolean, isArray: boolean, _isInNestedPipeline: boolean): string;
 }

package/dist/dialect/trino/trino.js

@@ -246,21 +246,21 @@ 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));
+    sqlUnnestAlias(source, alias, _fieldList, needDistinctKey, isArray, _isInNestedPipeline) {
         if (isArray) {
             if (needDistinctKey) {
-                return `CROSS JOIN UNNEST(COALESCE(zip(${source}, SEQUENCE(1,cardinality(${source}))),ARRAY[null])) as words_0(value,__row_id_from_${alias})`;
+                // return `LEFT JOIN UNNEST(transform(${source}, x -> ROW(x) )) WITH ORDINALIITY as words_0(value,__row_id_from_${alias}) ON TRUE`;
+                return `LEFT JOIN UNNEST(zip_with(${source},array[],(r,ignore) -> (r, ignore))) WITH ORDINALITY as ${alias}(value, ignore,__row_id_from_${alias}) ON TRUE`;
             }
             else {
-                return `CROSS JOIN UNNEST(COALESCE(transform(${source}, x -> ROW(x) ), ARRAY[null])) as ${alias}(value)`;
+                return `LEFT JOIN UNNEST(zip_with(${source},array[],(r,ignore) -> (r, ignore))) as ${alias}(value, ignore) ON TRUE`;
             }
         }
         else if (needDistinctKey) {
-            return `CROSS JOIN UNNEST(COALESCE(zip_with(${source}, SEQUENCE(1,cardinality(${source})), (r,__row_id) -> (r, __row_id)),ARRAY[null])) as ${alias}_outer(${alias},__row_id_from_${alias})`;
+            return `LEFT JOIN UNNEST(zip_with(${source},array[],(r,ignore) -> (r, ignore))) WITH ORDINALITY as ${alias}_outer(${alias}, ignore,__row_id_from_${alias}) ON TRUE`;
         }
         else {
-            return `CROSS JOIN UNNEST(COALESCE(${source}, ARRAY[null])) as ${alias}(${fieldsNames.join(', ')})`;
+            return `LEFT JOIN UNNEST(zip_with(${source},array[],(r,ignore) -> (r, ignore)))as ${alias}_outer(${alias},ignore) ON TRUE`;
         }
     }
     sqlSumDistinctHashedKey(sqlDistinctKey) {
@@ -499,10 +499,28 @@ class PrestoDialect extends TrinoDialect {
         super(...arguments);
         this.name = 'presto';
         this.supportsPipelinesInViews = false; // what a drag...
+        this.supportsLeftJoinUnnest = false; // we need to fix this....
     }
     sqlGenerateUUID() {
         return 'CAST(UUID() AS VARCHAR)';
     }
+    sqlUnnestAlias(source, alias, _fieldList, needDistinctKey, isArray, _isInNestedPipeline) {
+        if (isArray) {
+            if (needDistinctKey) {
+                // return `LEFT JOIN UNNEST(transform(${source}, x -> ROW(x) )) WITH ORDINALIITY as words_0(value,__row_id_from_${alias}) ON TRUE`;
+                return `CROSS JOIN UNNEST(zip_with(${source},array[],(r,ignore) -> (r, ignore))) WITH ORDINALITY as ${alias}(value, ignore,__row_id_from_${alias})`;
+            }
+            else {
+                return `CROSS JOIN UNNEST(zip_with(${source},array[],(r,ignore) -> (r, ignore))) as ${alias}(value, ignore)`;
+            }
+        }
+        else if (needDistinctKey) {
+            return `CROSS JOIN UNNEST(zip_with(${source},array[],(r,ignore) -> (r, ignore))) WITH ORDINALITY as ${alias}_outer(${alias}, ignore,__row_id_from_${alias})`;
+        }
+        else {
+            return `CROSS JOIN UNNEST(zip_with(${source},array[],(r,ignore) -> (r, ignore)))as ${alias}_outer(${alias},ignore)`;
+        }
+    }
 }
 exports.PrestoDialect = PrestoDialect;
 //# sourceMappingURL=trino.js.map

package/package.json

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