@malloydata/malloy 0.0.142-dev240411154213 → 0.0.142-dev240412191256

package/dist/dialect/dialect.d.ts

@@ -53,6 +53,7 @@ export declare abstract class Dialect {
     orderByClause: OrderByClauseType;
     nullMatchesFunctionSignature: boolean;
     supportsSelectReplace: boolean;
+    supportsComplexFilteredSources: boolean;
     abstract getGlobalFunctionDef(name: string): DialectFunctionOverloadDef[] | undefined;
     abstract quoteTablePath(tablePath: string): string;
     abstract sqlGroupSetTable(groupSetCount: number): string;
@@ -94,6 +95,7 @@ export declare abstract class Dialect {
     sqlOrderBy(orderTerms: string[]): string;
     sqlTzStr(qi: QueryInfo): string;
     sqlMakeUnnestKey(key: string, rowKey: string): string;
+    sqlStringAggDistinct(distinctKey: string, valueSQL: string, separatorSQL: string): string;
     abstract sqlTypeToMalloyType(sqlType: string): FieldAtomicTypeDef | undefined;
     abstract malloyTypeToSQLType(malloyType: FieldAtomicTypeDef): string;
     abstract validateTypeName(sqlType: string): boolean;

package/dist/dialect/dialect.js

@@ -74,6 +74,8 @@ class Dialect {
         this.nullMatchesFunctionSignature = true;
         // support select * replace(...)
         this.supportsSelectReplace = true;
+        // ability to join source with a filter on a joined source.
+        this.supportsComplexFilteredSources = true;
     }
     sqlFinalStage(_lastStageName, _fields) {
         throw new Error('Dialect has no final Stage but called Anyway');
@@ -152,6 +154,17 @@ class Dialect {
     sqlMakeUnnestKey(key, rowKey) {
         return this.concat(key, "'x'", rowKey);
     }
+    // default implementation
+    sqlStringAggDistinct(distinctKey, valueSQL, separatorSQL) {
+        const keyStart = '__STRING_AGG_KS__';
+        const keyEnd = '__STRING_AGG_KE__';
+        const distinctValueSQL = `concat('${keyStart}', ${distinctKey}, '${keyEnd}', ${valueSQL})`;
+        return `REGEXP_REPLACE(
+      STRING_AGG(DISTINCT ${distinctValueSQL}${separatorSQL.length > 0 ? ',' + separatorSQL : ''}),
+      '${keyStart}.*?${keyEnd}',
+      ''
+    )`;
+    }
 }
 exports.Dialect = Dialect;
 //# sourceMappingURL=dialect.js.map

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

@@ -0,0 +1,3 @@
+import { DialectFunctionOverloadDef } from '../../functions/util';
+export declare function fnStringAgg(): DialectFunctionOverloadDef[];
+export declare function fnStringAggDistinct(): DialectFunctionOverloadDef[];

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

@@ -0,0 +1,55 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fnStringAggDistinct = exports.fnStringAgg = void 0;
+const util_1 = require("../../functions/util");
+function fnStringAgg() {
+    const value = (0, util_1.makeParam)('value', (0, util_1.maxScalar)('string'));
+    const separator = (0, util_1.makeParam)('separator', (0, util_1.literal)((0, util_1.maxScalar)('string')));
+    const orderBy = {
+        type: 'aggregate_order_by',
+        prefix: '',
+        suffix: '',
+    };
+    return [
+        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param], (0, util_1.sql) `ARRAY_JOIN(ARRAY_AGG(${value.arg} ${orderBy}), ',')`, { supportsOrderBy: true, supportsLimit: false }),
+        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param, separator.param], (0, util_1.sql) `ARRAY_JOIN(ARRAY_AGG(${value.arg} ${orderBy}), ${separator.arg})`, { supportsOrderBy: true, supportsLimit: false }),
+    ];
+}
+exports.fnStringAgg = fnStringAgg;
+function fnStringAggDistinct() {
+    const value = (0, util_1.makeParam)('value', (0, util_1.maxScalar)('string'));
+    const separator = (0, util_1.makeParam)('separator', (0, util_1.literal)((0, util_1.maxScalar)('string')));
+    const orderBy = {
+        type: 'aggregate_order_by',
+        prefix: '',
+        suffix: '',
+    };
+    return [
+        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param], (0, util_1.sql) `ARRAY_JOIN(ARRAY_AGG(DISTINCT ${value.arg} ${orderBy}), ',')`, { supportsOrderBy: true, supportsLimit: false }),
+        (0, util_1.overload)((0, util_1.minAggregate)('string'), [value.param, separator.param], (0, util_1.sql) `ARRAY_JOIN(ARRAY_AGG(DISTINCT ${value.arg} ${orderBy}), ${separator.arg})`, { supportsOrderBy: true, supportsLimit: false }),
+    ];
+}
+exports.fnStringAggDistinct = fnStringAggDistinct;
+//# sourceMappingURL=string_agg.js.map

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

@@ -29,11 +29,14 @@ const log_1 = require("./log");
 const ifnull_1 = require("./ifnull");
 const concat_1 = require("./concat");
 const byte_length_1 = require("./byte_length");
+const string_agg_1 = require("./string_agg");
 exports.TRINO_FUNCTIONS = functions_1.FUNCTIONS.clone();
 exports.TRINO_FUNCTIONS.add('trunc', trunc_1.fnTrunc);
 exports.TRINO_FUNCTIONS.add('log', log_1.fnLog);
 exports.TRINO_FUNCTIONS.add('ifnull', ifnull_1.fnIfnull);
 exports.TRINO_FUNCTIONS.add('byte_length', byte_length_1.fnByteLength);
 exports.TRINO_FUNCTIONS.add('concat', concat_1.fnConcat);
+exports.TRINO_FUNCTIONS.add('string_agg', string_agg_1.fnStringAgg);
+exports.TRINO_FUNCTIONS.add('string_agg_distinct', string_agg_1.fnStringAggDistinct);
 exports.TRINO_FUNCTIONS.seal();
 //# sourceMappingURL=trino_functions.js.map

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

@@ -24,6 +24,7 @@ export declare class TrinoDialect extends Dialect {
     orderByClause: OrderByClauseType;
     nullMatchesFunctionSignature: boolean;
     supportsSelectReplace: boolean;
+    supportsComplexFilteredSources: boolean;
     quoteTablePath(tablePath: string): string;
     sqlGroupSetTable(groupSetCount: number): string;
     dialectExpr(qi: QueryInfo, df: DialectFragment): Expr;
@@ -61,5 +62,6 @@ export declare class TrinoDialect extends Dialect {
     castToString(expression: string): string;
     concat(...values: string[]): string;
     sqlMakeUnnestKey(key: string, rowKey: string): string;
+    sqlStringAggDistinct(distinctKey: string, valueSQL: string, separatorSQL: string): string;
     validateTypeName(sqlType: string): boolean;
 }

package/dist/dialect/trino/trino.js

@@ -78,6 +78,7 @@ class TrinoDialect extends dialect_1.Dialect {
         this.orderByClause = 'output_name';
         this.nullMatchesFunctionSignature = false;
         this.supportsSelectReplace = false;
+        this.supportsComplexFilteredSources = false;
         // TODO(figutierrez): update.
         this.keywords = `
   ALL
@@ -275,7 +276,7 @@ class TrinoDialect extends dialect_1.Dialect {
         if (fieldName === '__row_id') {
             return `__row_id_from_${alias}`;
         }
-        return `${alias}.${fieldName}`;
+        return `${alias}.${this.sqlMaybeQuoteIdentifier(fieldName)}`;
     }
     sqlUnnestPipelineHead(isSingleton, sourceSQLExpression) {
         let p = sourceSQLExpression;
@@ -347,7 +348,7 @@ ${(0, utils_1.indent)(sql)}
             }
         }
         const extracted = (0, malloy_types_1.mkExpr) `EXTRACT(${pgUnits} FROM ${extractFrom})`;
-        return units === 'day_of_week' ? (0, malloy_types_1.mkExpr) `(${extracted}+1)` : extracted;
+        return units === 'day_of_week' ? (0, malloy_types_1.mkExpr) `mod(${extracted}+1,7)` : extracted;
     }
     sqlAlterTime(op, expr, n, timeframe) {
         if (timeframe === 'quarter') {
@@ -433,10 +434,10 @@ ${(0, utils_1.indent)(sql)}
                 sample = this.defaultSampling;
             }
             if ((0, malloy_types_1.isSamplingRows)(sample)) {
-                throw new Error("StandardSQL doesn't support sampling by rows only percent");
+                throw new Error("Trino doesn't support sampling by rows only percent");
             }
             else if ((0, malloy_types_1.isSamplingPercent)(sample)) {
-                return `(SELECT * FROM ${tableSQL}  TABLESAMPLE SYSTEM (${sample.percent} PERCENT))`;
+                return `(SELECT * FROM ${tableSQL}  TABLESAMPLE SYSTEM (${sample.percent}))`;
             }
         }
         return tableSQL;
@@ -478,6 +479,10 @@ ${(0, utils_1.indent)(sql)}
     sqlMakeUnnestKey(key, rowKey) {
         return `CAST(${key} as VARCHAR) || 'x' || CAST(${rowKey} as VARCHAR)`;
     }
+    sqlStringAggDistinct(distinctKey, valueSQL, separatorSQL) {
+        return `
+    ARRAY_JOIN(TRANSFORM(ARRAY_AGG(DISTINCT ARRAY[CAST(${valueSQL} AS VARCHAR),CAST(${distinctKey} as VARCHAR)]), x -> x[1]),${separatorSQL.length > 0 ? separatorSQL : "','"})`;
+    }
     validateTypeName(sqlType) {
         // Letters:              BIGINT
         // Numbers:              INT8

package/dist/model/malloy_query.js

@@ -334,16 +334,9 @@ class QueryField extends QueryNode {
         }
         const valueSQL = this.generateDimFragment(resultSet, context, value, state);
         const separatorSQL = separator
-            ? ' ,' + this.generateDimFragment(resultSet, context, separator, state)
+            ? this.generateDimFragment(resultSet, context, separator, state)
             : '';
-        const keyStart = '__STRING_AGG_KS__';
-        const keyEnd = '__STRING_AGG_KE__';
-        const distinctValueSQL = `concat('${keyStart}', ${distinctKey}, '${keyEnd}', ${valueSQL})`;
-        return `REGEXP_REPLACE(
-      STRING_AGG(DISTINCT ${distinctValueSQL}${separatorSQL}),
-      '${keyStart}.*?${keyEnd}',
-      ''
-    )`;
+        return this.parent.dialect.sqlStringAggDistinct(distinctKey, valueSQL, separatorSQL);
     }
     getParamForArgIndex(params, argIndex) {
         const prevVariadic = params.slice(0, argIndex).find(p => p.isVariadic);
@@ -1995,6 +1988,9 @@ class QueryQuery extends QueryField {
                 s += ` ${matrixOperation} JOIN ${structSQL} AS ${ji.alias}\n  ON ${onCondition}${filters}\n`;
             }
             else {
+                if (!this.parent.dialect.supportsComplexFilteredSources) {
+                    throw new Error('Cannot join a source with a filter on a joined source');
+                }
                 let select = `SELECT ${ji.alias}.*`;
                 let joins = '';
                 for (const childJoin of ji.children) {
@@ -2503,7 +2499,7 @@ class QueryQuery extends QueryField {
                 field instanceof FieldInstanceField &&
                 field.fieldUsage.type === 'result') {
                 dialectFieldList.push({
-                    type: field.type,
+                    type: field.f.fieldDef.type,
                     sqlExpression: field.f.generateExpression(resultStruct),
                     rawName: name,
                     sqlOutputName: sqlName,

package/package.json

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