@malloydata/malloy 0.0.119-dev240116200529 → 0.0.119-dev240118215411

package/dist/dialect/functions/all_functions.js

@@ -60,6 +60,7 @@ const simple_numeric_functions_1 = require("./simple_numeric_functions");
 const avg_moving_1 = require("./avg_moving");
 const function_map_1 = require("./function_map");
 const coalesce_1 = require("./coalesce");
+const sql_1 = require("./sql");
 /**
  * This is a function map containing default implementations of all Malloy
  * built-in functions. These don't work in all dialects, but are a good starting
@@ -131,5 +132,10 @@ exports.FUNCTIONS.add('min_window', sum_min_max_window_1.fnMinWindow);
 exports.FUNCTIONS.add('max_window', sum_min_max_window_1.fnMaxWindow);
 exports.FUNCTIONS.add('sum_window', sum_min_max_window_1.fnSumWindow);
 exports.FUNCTIONS.add('avg_moving', avg_moving_1.fnAvgRolling);
+exports.FUNCTIONS.add('sql_number', sql_1.fnSqlNumber);
+exports.FUNCTIONS.add('sql_string', sql_1.fnSqlString);
+exports.FUNCTIONS.add('sql_date', sql_1.fnSqlDate);
+exports.FUNCTIONS.add('sql_timestamp', sql_1.fnSqlTimestamp);
+exports.FUNCTIONS.add('sql_boolean', sql_1.fnSqlBoolean);
 exports.FUNCTIONS.seal();
 //# sourceMappingURL=all_functions.js.map

package/dist/dialect/functions/sql.d.ts

@@ -0,0 +1,6 @@
+import { DialectFunctionOverloadDef } from './util';
+export declare function fnSqlNumber(): DialectFunctionOverloadDef[];
+export declare function fnSqlString(): DialectFunctionOverloadDef[];
+export declare function fnSqlDate(): DialectFunctionOverloadDef[];
+export declare function fnSqlTimestamp(): DialectFunctionOverloadDef[];
+export declare function fnSqlBoolean(): DialectFunctionOverloadDef[];

package/dist/dialect/functions/sql.js

@@ -0,0 +1,62 @@
+"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.fnSqlBoolean = exports.fnSqlTimestamp = exports.fnSqlDate = exports.fnSqlString = exports.fnSqlNumber = void 0;
+const util_1 = require("./util");
+function fnSqlNumber() {
+    const value = (0, util_1.makeParam)('value', (0, util_1.literal)((0, util_1.maxScalar)('string')));
+    return [
+        (0, util_1.overload)((0, util_1.minScalar)('number'), [value.param], [{ type: 'sql-string', e: [value.arg] }]),
+    ];
+}
+exports.fnSqlNumber = fnSqlNumber;
+function fnSqlString() {
+    const value = (0, util_1.makeParam)('value', (0, util_1.literal)((0, util_1.maxScalar)('string')));
+    return [
+        (0, util_1.overload)((0, util_1.minScalar)('string'), [value.param], [{ type: 'sql-string', e: [value.arg] }]),
+    ];
+}
+exports.fnSqlString = fnSqlString;
+function fnSqlDate() {
+    const value = (0, util_1.makeParam)('value', (0, util_1.literal)((0, util_1.maxScalar)('string')));
+    return [
+        (0, util_1.overload)((0, util_1.minScalar)('date'), [value.param], [{ type: 'sql-string', e: [value.arg] }]),
+    ];
+}
+exports.fnSqlDate = fnSqlDate;
+function fnSqlTimestamp() {
+    const value = (0, util_1.makeParam)('value', (0, util_1.literal)((0, util_1.maxScalar)('string')));
+    return [
+        (0, util_1.overload)((0, util_1.minScalar)('timestamp'), [value.param], [{ type: 'sql-string', e: [value.arg] }]),
+    ];
+}
+exports.fnSqlTimestamp = fnSqlTimestamp;
+function fnSqlBoolean() {
+    const value = (0, util_1.makeParam)('value', (0, util_1.literal)((0, util_1.maxScalar)('string')));
+    return [
+        (0, util_1.overload)((0, util_1.minScalar)('boolean'), [value.param], [{ type: 'sql-string', e: [value.arg] }]),
+    ];
+}
+exports.fnSqlBoolean = fnSqlBoolean;
+//# sourceMappingURL=sql.js.map

package/dist/dialect/postgres/postgres.js

@@ -193,16 +193,16 @@ class PostgresDialect extends dialect_1.Dialect {
         return 'GEN_RANDOM_UUID()';
     }
     sqlFieldReference(alias, fieldName, fieldType, isNested, _isArray) {
-        let ret = `${alias}->>'${fieldName}'`;
+        let ret = `(${alias}->>'${fieldName}')`;
         if (isNested) {
             switch (fieldType) {
                 case 'string':
                     break;
                 case 'number':
-                    ret = `(${ret})::double precision`;
+                    ret = `${ret}::double precision`;
                     break;
                 case 'struct':
-                    ret = `(${ret})::jsonb`;
+                    ret = `${ret}::jsonb`;
                     break;
             }
             return ret;

package/dist/lang/ast/expressions/expr-aggregate-function.d.ts

@@ -1,16 +1,16 @@
-import { FieldValueType, StructRelationship } from '../../../model/malloy_types';
+import { AggregateFunctionType, FieldValueType, StructRelationship } from '../../../model/malloy_types';
 import { FieldReference } from '../query-items/field-references';
 import { ExprValue } from '../types/expr-value';
 import { ExpressionDef } from '../types/expression-def';
 import { FieldSpace } from '../types/field-space';
 export declare abstract class ExprAggregateFunction extends ExpressionDef {
-    readonly func: string;
+    readonly func: AggregateFunctionType;
     elementType: string;
     source?: FieldReference;
     expr?: ExpressionDef;
     explicitSource?: boolean;
     legalChildTypes: import("../../../model/malloy_types").TypeDesc[];
-    constructor(func: string, expr?: ExpressionDef, explicitSource?: boolean);
+    constructor(func: AggregateFunctionType, expr?: ExpressionDef, explicitSource?: boolean);
     returns(_forExpression: ExprValue): FieldValueType;
     getExpression(fs: FieldSpace): ExprValue;
     isSymmetricFunction(): boolean;

package/dist/lang/ast/expressions/expr-aggregate-function.js

@@ -216,6 +216,7 @@ function getJoinUsage(fs, expr) {
     };
     (0, utils_1.exprWalk)(expr, frag => {
         if (typeof frag !== 'string') {
+            // TODO make this work for field references inside sql_* functions
             if (frag.type === 'field') {
                 const def = lookup(fs, frag.path);
                 if (def.def.type !== 'struct' && def.def.type !== 'turtle') {

package/dist/lang/ast/expressions/expr-func.js

@@ -161,7 +161,7 @@ class ExprFunc extends expression_def_1.ExpressionDef {
                 .join(', ')}) with source`);
             return (0, ast_utils_1.errorFor)('cannot call with source');
         }
-        const funcCall = [
+        let funcCall = [
             {
                 type: 'function_call',
                 overload,
@@ -170,6 +170,50 @@ class ExprFunc extends expression_def_1.ExpressionDef {
                 structPath,
             },
         ];
+        if ([
+            'sql_number',
+            'sql_string',
+            'sql_date',
+            'sql_timestamp',
+            'sql_boolean',
+        ].includes(func.name)) {
+            if (!this.inExperiment('sql_functions', true)) {
+                return (0, ast_utils_1.errorFor)(`Cannot use sql_function \`${func.name}\`; use \`sql_functions\` experiment to enable this behavior`);
+            }
+            const str = argExprs[0].value;
+            if (str.length !== 1 ||
+                typeof str[0] === 'string' ||
+                str[0].type !== 'dialect' ||
+                str[0].function !== 'stringLiteral') {
+                this.log(`Invalid string literal for \`${func.name}\``);
+            }
+            else {
+                const literal = str[0].literal;
+                const parts = parseSQLInterpolation(literal);
+                const unsupportedInterpolations = parts
+                    .filter(part => part.type === 'interpolation' && part.name.includes('.'))
+                    .map(unsupportedPart => unsupportedPart.type === 'interpolation'
+                    ? `\${${unsupportedPart.name}}`
+                    : `\${${unsupportedPart.value}}`);
+                if (unsupportedInterpolations.length > 0) {
+                    const unsupportedInterpolationMsg = unsupportedInterpolations.length === 1
+                        ? `'.' paths are not yet supported in sql interpolations, found ${unsupportedInterpolations.at(0)}`
+                        : `'.' paths are not yet supported in sql interpolations, found [${unsupportedInterpolations.join(', ')}]`;
+                    this.log(unsupportedInterpolationMsg);
+                    return (0, ast_utils_1.errorFor)(`${unsupportedInterpolationMsg}. See LookML \${...} documentation at https://cloud.google.com/looker/docs/reference/param-field-sql#sql_for_dimensions`);
+                }
+                funcCall = [
+                    {
+                        type: 'sql-string',
+                        e: parts.map(part => part.type === 'string'
+                            ? part.value
+                            : part.name === 'TABLE'
+                                ? { type: 'source-reference' }
+                                : { type: 'field-reference', path: part.name }),
+                    },
+                ];
+            }
+        }
         if (type.dataType === 'any') {
             this.log(`Invalid return type ${type.dataType} for function '${this.name}'`);
             return (0, ast_utils_1.errorFor)('invalid return type');
@@ -285,4 +329,31 @@ function findOverload(func, args) {
         }
     }
 }
+function parseSQLInterpolation(template) {
+    const parts = [];
+    let remaining = template;
+    while (remaining.length) {
+        const nextInterp = remaining.indexOf('${');
+        if (nextInterp === -1) {
+            parts.push({ type: 'string', value: remaining });
+            break;
+        }
+        else {
+            const interpEnd = remaining.slice(nextInterp).indexOf('}');
+            if (interpEnd === -1) {
+                parts.push({ type: 'string', value: remaining });
+                break;
+            }
+            if (nextInterp > 0) {
+                parts.push({ type: 'string', value: remaining.slice(0, nextInterp) });
+            }
+            parts.push({
+                type: 'interpolation',
+                name: remaining.slice(nextInterp + 2, interpEnd + nextInterp),
+            });
+            remaining = remaining.slice(interpEnd + nextInterp + 1);
+        }
+    }
+    return parts;
+}
 //# sourceMappingURL=expr-func.js.map

package/dist/model/malloy_query.d.ts

@@ -1,5 +1,5 @@
 import { Dialect, DialectFieldList } from '../dialect';
-import { AggregateFragment, CompiledQuery, DialectFragment, Expr, FieldDef, FieldFragment, FieldRef, Filtered, FilterExpression, FilterFragment, FunctionCallFragment, FunctionOverloadDef, JoinRelationship, ModelDef, OrderBy, OutputFieldFragment, Parameter, ParameterFragment, PipeSegment, Query, QueryFieldDef, QuerySegment, ResultMetadataDef, ResultStructMetadataDef, SearchIndexResult, SpreadFragment, SQLExpressionFragment, StructDef, StructRef, TurtleDef, UngroupFragment } from './malloy_types';
+import { AggregateFragment, AggregateFunctionType, CompiledQuery, DialectFragment, Expr, FieldDef, FieldFragment, FieldRef, FieldReferenceFragment, Filtered, FilterExpression, FilterFragment, FunctionCallFragment, FunctionOverloadDef, JoinRelationship, ModelDef, OrderBy, OutputFieldFragment, Parameter, ParameterFragment, PipeSegment, Query, QueryFieldDef, QuerySegment, ResultMetadataDef, ResultStructMetadataDef, SearchIndexResult, SourceReferenceFragment, SpreadFragment, SQLExpressionFragment, SqlStringFragment, StructDef, StructRef, TurtleDef, UngroupFragment } from './malloy_types';
 import { Connection } from '../runtime_types';
 import { AndChain } from './utils';
 import { QueryInfo } from '../dialect/dialect';
@@ -17,6 +17,11 @@ interface OutputPipelinedSQL {
     sqlFieldName: string;
     pipelineSQL: string;
 }
+type UniqueKeyPossibleUse = AggregateFunctionType | 'generic_aggregate';
+declare class UniqueKeyUse extends Set<UniqueKeyPossibleUse> {
+    add_use(k: UniqueKeyPossibleUse | undefined): this | undefined;
+    hasAsymetricFunctions(): boolean;
+}
 declare class StageWriter {
     parent: StageWriter | undefined;
     withs: string[];
@@ -57,7 +62,7 @@ declare class QueryField extends QueryNode {
     fieldDef: FieldDef;
     parent: QueryStruct;
     constructor(fieldDef: FieldDef, parent: QueryStruct);
-    mayNeedUniqueKey(): boolean;
+    uniqueKeyPossibleUse(): UniqueKeyPossibleUse | undefined;
     getJoinableParent(): QueryStruct;
     caseGroup(groupSets: number[], s: string): string;
     getFullOutputName(): string;
@@ -78,6 +83,9 @@ declare class QueryField extends QueryNode {
     generateAvgFragment(resultSet: FieldInstanceResult, context: QueryStruct, expr: AggregateFragment, state: GenerateState): string;
     generateCountFragment(resultSet: FieldInstanceResult, context: QueryStruct, expr: AggregateFragment, state: GenerateState): string;
     generateDialect(resultSet: FieldInstanceResult, context: QueryStruct, expr: DialectFragment, state: GenerateState): string;
+    generateFieldReference(resultSet: FieldInstanceResult, context: QueryStruct, expr: FieldReferenceFragment, state: GenerateState): string;
+    generateSqlString(resultSet: FieldInstanceResult, context: QueryStruct, expr: SqlStringFragment, state: GenerateState): string;
+    generateSourceReference(resultSet: FieldInstanceResult, context: QueryStruct, expr: SourceReferenceFragment): string;
     getAnalyticPartitions(resultStruct: FieldInstanceResult): string;
     generateAnalyticFragment(resultStruct: FieldInstanceResult, context: QueryStruct, expr: Expr, overload: FunctionOverloadDef, state: GenerateState, args: Expr[]): string;
     generateExpressionFromExpr(resultSet: FieldInstanceResult, context: QueryStruct, e: Expr, state?: GenerateState): string;
@@ -166,7 +174,7 @@ declare class FieldInstanceResult implements FieldInstance {
     structs(): FieldInstanceResult[];
     selectStructs(result: FieldInstanceResult[], fn: (result: FieldInstanceResult) => boolean): FieldInstanceResult[];
     calculateDefaultOrderBy(): OrderBy[];
-    addStructToJoin(qs: QueryStruct, query: QueryQuery, mayNeedUniqueKey: boolean, joinStack: string[]): void;
+    addStructToJoin(qs: QueryStruct, query: QueryQuery, uniqueKeyPossibleUse: UniqueKeyPossibleUse | undefined, joinStack: string[]): void;
     findJoins(query: QueryQuery): void;
     root(): FieldInstanceResultRoot;
     getUngroupPartitions(ungroupSet: UngroupSet | undefined): FieldInstanceField[];
@@ -188,7 +196,7 @@ declare class JoinInstance {
     queryStruct: QueryStruct;
     alias: string;
     parent: JoinInstance | undefined;
-    mayNeedUniqueKey: boolean;
+    uniqueKeyPossibleUses: UniqueKeyUse;
     makeUniqueKey: boolean;
     leafiest: boolean;
     joinFilterConditions?: QueryFieldBoolean[];
@@ -243,7 +251,7 @@ declare class QueryQuery extends QueryField {
     expandDependantField(resultStruct: FieldInstanceResult, fieldRef: FieldRef): void;
     expandWildCardStruct(struct: QueryStruct, expandChildren: boolean, filter?: ((qf: QueryNode) => boolean) | undefined): string[];
     expandWildCards(fields: QueryFieldDef[], filter?: ((qf: QueryNode) => boolean) | undefined): QueryFieldDef[];
-    addDependantPath(resultStruct: FieldInstanceResult, context: QueryStruct, path: string, mayNeedUniqueKey: boolean, joinStack: string[]): void;
+    addDependantPath(resultStruct: FieldInstanceResult, context: QueryStruct, path: string, uniqueKeyPossibleUse: UniqueKeyPossibleUse | undefined, joinStack: string[]): void;
     addDependantExpr(resultStruct: FieldInstanceResult, context: QueryStruct, e: Expr, joinStack: string[]): void;
     addDependancies(resultStruct: FieldInstanceResult, field: QueryField): void;
     expandFields(resultStruct: FieldInstanceResult): void;

package/dist/model/malloy_query.js

@@ -34,6 +34,16 @@ function generateSQLStringLiteral(sourceString) {
 function identifierNormalize(s) {
     return s.replace(/[^a-zA-Z0-9_]/g, '_o_');
 }
+class UniqueKeyUse extends Set {
+    add_use(k) {
+        if (k !== undefined) {
+            return this.add(k);
+        }
+    }
+    hasAsymetricFunctions() {
+        return this.has('sum') || this.has('avg') || this.has('count');
+    }
+}
 class StageWriter {
     constructor(useCTE = true, parent) {
         this.parent = parent;
@@ -173,8 +183,8 @@ class QueryField extends QueryNode {
         this.parent = parent;
         this.fieldDef = fieldDef;
     }
-    mayNeedUniqueKey() {
-        return false;
+    uniqueKeyPossibleUse() {
+        return undefined;
     }
     getJoinableParent() {
         // if it is inline it should always have a parent
@@ -436,11 +446,28 @@ class QueryField extends QueryNode {
     generateCountFragment(resultSet, context, expr, state) {
         let func = 'COUNT(';
         let thing = '1';
-        const distinctKeySQL = this.generateDistinctKeyIfNecessary(resultSet, context, expr.structPath);
-        if (distinctKeySQL) {
-            func = 'COUNT(DISTINCT';
-            thing = distinctKeySQL;
+        let struct = context;
+        if (expr.structPath) {
+            struct = this.parent.root().getStructByName(expr.structPath);
+        }
+        const joinName = struct.getJoinableParent().getIdentifier();
+        const join = resultSet.root().joins.get(joinName);
+        if (!join) {
+            throw new Error(`Join ${joinName} not found in result set`);
         }
+        if (!join.leafiest || join.makeUniqueKey) {
+            func = 'COUNT(DISTINCT';
+            thing = struct.getDistinctKey().generateExpression(resultSet);
+        }
+        // const distinctKeySQL = this.generateDistinctKeyIfNecessary(
+        //   resultSet,
+        //   context,
+        //   expr.structPath
+        // );
+        // if (distinctKeySQL) {
+        //   func = 'COUNT(DISTINCT';
+        //   thing = distinctKeySQL;
+        // }
         // find the structDef and return the path to the field...
         if (state.whereSQL) {
             return `${func} CASE WHEN ${state.whereSQL} THEN ${thing} END)`;
@@ -452,6 +479,24 @@ class QueryField extends QueryNode {
     generateDialect(resultSet, context, expr, state) {
         return this.generateExpressionFromExpr(resultSet, context, context.dialect.dialectExpr(resultSet.getQueryInfo(), expr), state);
     }
+    generateFieldReference(resultSet, context, expr, state) {
+        return this.generateFieldFragment(resultSet, context, { type: 'field', path: expr.path }, state);
+    }
+    generateSqlString(resultSet, context, expr, state) {
+        return expr.e
+            .map(part => typeof part === 'string'
+            ? part
+            : this.generateExpressionFromExpr(resultSet, context, [part], state))
+            .join('');
+    }
+    generateSourceReference(resultSet, context, expr) {
+        if (expr.path === undefined) {
+            return context.getSQLIdentifier();
+        }
+        else {
+            return context.getFieldByName(expr.path).getIdentifier();
+        }
+    }
     getAnalyticPartitions(resultStruct) {
         const ret = [];
         let p = resultStruct.parent;
@@ -616,6 +661,15 @@ class QueryField extends QueryNode {
             else if (expr.type === 'dialect') {
                 s += this.generateDialect(resultSet, context, expr, state);
             }
+            else if (expr.type === 'sql-string') {
+                s += this.generateSqlString(resultSet, context, expr, state);
+            }
+            else if (expr.type === 'source-reference') {
+                s += this.generateSourceReference(resultSet, context, expr);
+            }
+            else if (expr.type === 'field-reference') {
+                s += this.generateFieldReference(resultSet, context, expr, state);
+            }
             else {
                 throw new Error(`Internal Error: Unknown expression fragment ${JSON.stringify(expr, undefined, 2)}`);
             }
@@ -746,7 +800,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 `CONCAT(${parentKey}, 'x', ${this.parent.dialect.sqlFieldReference(this.parent.getIdentifier(), '__row_id', 'string', true, false)})`;
+            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));
         }
         else {
             // return this.parent.getIdentifier() + "." + "__distinct_key";
@@ -1003,7 +1058,7 @@ class FieldInstanceResult {
         }
         return [];
     }
-    addStructToJoin(qs, query, mayNeedUniqueKey, joinStack) {
+    addStructToJoin(qs, query, uniqueKeyPossibleUse, joinStack) {
         var _a;
         const name = qs.getIdentifier();
         // we're already chasing the dependency for this join.
@@ -1012,7 +1067,7 @@ class FieldInstanceResult {
         }
         let join;
         if ((join = this.root().joins.get(name))) {
-            join.mayNeedUniqueKey || (join.mayNeedUniqueKey = mayNeedUniqueKey);
+            join.uniqueKeyPossibleUses.add_use(uniqueKeyPossibleUse);
             return;
         }
         // if we have a parent, join it first.
@@ -1020,7 +1075,7 @@ class FieldInstanceResult {
         const parentStruct = (_a = qs.parent) === null || _a === void 0 ? void 0 : _a.getJoinableParent();
         if (parentStruct) {
             // add dependant expressions first...
-            this.addStructToJoin(parentStruct, query, false, joinStack);
+            this.addStructToJoin(parentStruct, query, undefined, joinStack);
             parent = this.root().joins.get(parentStruct.getIdentifier());
         }
         // add any dependant joins based on the ON
@@ -1038,11 +1093,11 @@ class FieldInstanceResult {
             join = new JoinInstance(qs, name, parent);
             this.root().joins.set(name, join);
         }
-        join.mayNeedUniqueKey || (join.mayNeedUniqueKey = mayNeedUniqueKey);
+        join.uniqueKeyPossibleUses.add_use(uniqueKeyPossibleUse);
     }
     findJoins(query) {
         for (const dim of this.fields()) {
-            this.addStructToJoin(dim.f.getJoinableParent(), query, dim.f.mayNeedUniqueKey(), []);
+            this.addStructToJoin(dim.f.getJoinableParent(), query, dim.f.uniqueKeyPossibleUse(), []);
         }
         for (const s of this.structs()) {
             s.findJoins(query);
@@ -1167,8 +1222,20 @@ class FieldInstanceResultRoot extends FieldInstanceResult {
         //  Nested Unique keys are dependant on the primary key of the parent
         //  and the table.
         for (const [_name, join] of this.joins) {
-            // don't need keys on leafiest
-            if (!join.leafiest && join.mayNeedUniqueKey) {
+            // in a one_to_many join we need a key to count there may be a failed
+            //  match in a left join.
+            // users -> {
+            //   group_by: user_id
+            //   aggregate: order_count is orders.count()
+            if (join.leafiest) {
+                if (join.parent !== null &&
+                    join.uniqueKeyPossibleUses.has('count') &&
+                    !join.queryStruct.primaryKey()) {
+                    join.makeUniqueKey = true;
+                }
+            }
+            else if (!join.leafiest &&
+                join.uniqueKeyPossibleUses.hasAsymetricFunctions()) {
                 let j = join;
                 while (j) {
                     if (!j.queryStruct.primaryKey()) {
@@ -1190,7 +1257,7 @@ class JoinInstance {
         this.queryStruct = queryStruct;
         this.alias = alias;
         this.parent = parent;
-        this.mayNeedUniqueKey = false;
+        this.uniqueKeyPossibleUses = new UniqueKeyUse();
         this.makeUniqueKey = false;
         this.leafiest = false;
         this.children = [];
@@ -1474,7 +1541,7 @@ class QueryQuery extends QueryField {
         }
         return ret;
     }
-    addDependantPath(resultStruct, context, path, mayNeedUniqueKey, joinStack) {
+    addDependantPath(resultStruct, context, path, uniqueKeyPossibleUse, joinStack) {
         const node = context.getFieldByName(path);
         let struct;
         if (node instanceof QueryField) {
@@ -1488,7 +1555,7 @@ class QueryQuery extends QueryField {
         }
         resultStruct
             .root()
-            .addStructToJoin(struct.getJoinableParent(), this, mayNeedUniqueKey, joinStack);
+            .addStructToJoin(struct.getJoinableParent(), this, uniqueKeyPossibleUse, joinStack);
     }
     addDependantExpr(resultStruct, context, e, joinStack) {
         for (const expr of e) {
@@ -1523,7 +1590,7 @@ class QueryQuery extends QueryField {
                 else {
                     resultStruct
                         .root()
-                        .addStructToJoin(field.parent.getJoinableParent(), this, false, joinStack);
+                        .addStructToJoin(field.parent.getJoinableParent(), this, undefined, joinStack);
                     // this.addDependantPath(resultStruct, field.parent, expr.path, false);
                 }
             }
@@ -1572,18 +1639,18 @@ class QueryQuery extends QueryField {
             else if ((0, malloy_types_1.isAggregateFragment)(expr)) {
                 if ((0, malloy_types_1.isAsymmetricFragment)(expr)) {
                     if (expr.structPath) {
-                        this.addDependantPath(resultStruct, context, expr.structPath, true, joinStack);
+                        this.addDependantPath(resultStruct, context, expr.structPath, expr.function, joinStack);
                     }
                     else {
                         // we are doing a sum in the root.  It may need symetric aggregates
-                        resultStruct.addStructToJoin(context, this, true, joinStack);
+                        resultStruct.addStructToJoin(context, this, expr.function, joinStack);
                     }
                 }
                 this.addDependantExpr(resultStruct, context, expr.e, joinStack);
             }
             else if ((0, malloy_types_1.isFunctionCallFragment)(expr)) {
                 if (expr.structPath) {
-                    this.addDependantPath(resultStruct, context, expr.structPath, true, joinStack);
+                    this.addDependantPath(resultStruct, context, expr.structPath, 'generic_aggregate', joinStack);
                 }
                 // TODO Do we need to call `addStructToJoin` here in the case when there is no `structPath`
                 // and the function is an aggregate function?
@@ -1688,7 +1755,7 @@ class QueryQuery extends QueryField {
     prepare(_stageWriter) {
         if (!this.prepared) {
             this.expandFields(this.rootResult);
-            this.rootResult.addStructToJoin(this.parent, this, false, []);
+            this.rootResult.addStructToJoin(this.parent, this, undefined, []);
             this.rootResult.findJoins(this);
             this.rootResult.calculateSymmetricAggregates();
             this.prepared = true;

package/dist/model/malloy_types.d.ts

@@ -108,9 +108,10 @@ export interface FilterFragment {
 }
 export declare function isFilterFragment(f: Fragment): f is FilterFragment;
 export declare function isDialectFragment(f: Fragment): f is DialectFragment;
+export type AggregateFunctionType = 'sum' | 'avg' | 'count' | 'count_distinct' | 'max' | 'min';
 export interface AggregateFragment {
     type: 'aggregate';
-    function: string;
+    function: AggregateFunctionType;
     e: Expr;
     structPath?: string;
 }
@@ -150,6 +151,21 @@ export interface FieldFragment {
     path: string;
 }
 export declare function isFieldFragment(f: Fragment): f is FieldFragment;
+export interface FieldReferenceFragment {
+    type: 'field-reference';
+    path: string;
+}
+export declare function isFieldReferenceFragment(f: Fragment): f is FieldReferenceFragment;
+export interface SqlStringFragment {
+    type: 'sql-string';
+    e: Expr;
+}
+export declare function isSqlStringFragment(f: Fragment): f is SqlStringFragment;
+export interface SourceReferenceFragment {
+    type: 'source-reference';
+    path?: string;
+}
+export declare function isSourceReferenceFragment(f: Fragment): f is SourceReferenceFragment;
 export interface ParameterFragment {
     type: 'parameter';
     path: string;
@@ -233,7 +249,7 @@ export interface NumberLiteralFragment extends DialectFragmentBase {
     literal: string;
 }
 export type DialectFragment = DivFragment | TimeLiteralFragment | NowFragment | TimeDeltaFragment | TimeDiffFragment | TimeTruncFragment | TypecastFragment | TimeExtractFragment | StringLiteralFragment | RegexpLiteralFragment | NumberLiteralFragment | RegexpMatchFragment;
-export type Fragment = string | ApplyFragment | ApplyValueFragment | FieldFragment | ParameterFragment | FilterFragment | OutputFieldFragment | AggregateFragment | UngroupFragment | DialectFragment | FunctionParameterFragment | FunctionCallFragment | SQLExpressionFragment | SpreadFragment;
+export type Fragment = string | ApplyFragment | ApplyValueFragment | FieldFragment | FieldReferenceFragment | SourceReferenceFragment | SqlStringFragment | ParameterFragment | FilterFragment | OutputFieldFragment | AggregateFragment | UngroupFragment | DialectFragment | FunctionParameterFragment | FunctionCallFragment | SQLExpressionFragment | SpreadFragment;
 export type Expr = Fragment[];
 export interface TypedValue {
     value: Expr;

package/dist/model/malloy_types.js

@@ -22,8 +22,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMatrixOperation = exports.isIndexSegment = exports.isRawSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isPartialSegment = exports.isReduceSegment = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.FieldIsIntrinsic = exports.isCastType = exports.isAtomicFieldType = exports.isTimeFieldType = exports.hasExpression = exports.maxOfExpressionTypes = exports.maxExpressionType = exports.isExpressionTypeLEQ = exports.expressionIsAnalytic = exports.expressionIsCalculation = exports.expressionInvolvesAggregate = exports.expressionIsUngroupedAggregate = exports.expressionIsAggregate = exports.expressionIsScalar = exports.mkExpr = exports.isApplyFragment = exports.isApplyValue = exports.isParameterFragment = exports.isFieldFragment = exports.isSpreadFragment = exports.isSQLExpressionFragment = exports.isFunctionCallFragment = exports.isFunctionParameterFragment = exports.isUngroupFragment = exports.isAsymmetricFragment = exports.isAggregateFragment = exports.isDialectFragment = exports.isFilterFragment = exports.isOutputFieldFragment = exports.isFilteredAliasedName = exports.paramHasValue = exports.isConditionParameter = exports.isValueParameter = void 0;
-exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = exports.isMeasureLike = exports.getPhysicalFields = exports.getDimensions = exports.isPhysical = exports.isDimensional = exports.isAtomicField = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = exports.isSQLBlockStruct = exports.mergeEvalSpaces = exports.isSQLFragment = exports.isJoinOn = void 0;
+exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isPartialSegment = exports.isReduceSegment = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.FieldIsIntrinsic = exports.isCastType = exports.isAtomicFieldType = exports.isTimeFieldType = exports.hasExpression = exports.maxOfExpressionTypes = exports.maxExpressionType = exports.isExpressionTypeLEQ = exports.expressionIsAnalytic = exports.expressionIsCalculation = exports.expressionInvolvesAggregate = exports.expressionIsUngroupedAggregate = exports.expressionIsAggregate = exports.expressionIsScalar = exports.mkExpr = exports.isApplyFragment = exports.isApplyValue = exports.isParameterFragment = exports.isSourceReferenceFragment = exports.isSqlStringFragment = exports.isFieldReferenceFragment = exports.isFieldFragment = exports.isSpreadFragment = exports.isSQLExpressionFragment = exports.isFunctionCallFragment = exports.isFunctionParameterFragment = exports.isUngroupFragment = exports.isAsymmetricFragment = exports.isAggregateFragment = exports.isDialectFragment = exports.isFilterFragment = exports.isOutputFieldFragment = exports.isFilteredAliasedName = exports.paramHasValue = exports.isConditionParameter = exports.isValueParameter = void 0;
+exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = exports.isMeasureLike = exports.getPhysicalFields = exports.getDimensions = exports.isPhysical = exports.isDimensional = exports.isAtomicField = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = exports.isSQLBlockStruct = exports.mergeEvalSpaces = exports.isSQLFragment = exports.isJoinOn = exports.isMatrixOperation = exports.isIndexSegment = exports.isRawSegment = void 0;
 function isValueParameter(p) {
     return p.value !== undefined;
 }
@@ -90,6 +90,18 @@ function isFieldFragment(f) {
     return (f === null || f === void 0 ? void 0 : f.type) === 'field';
 }
 exports.isFieldFragment = isFieldFragment;
+function isFieldReferenceFragment(f) {
+    return (f === null || f === void 0 ? void 0 : f.type) === 'field-reference';
+}
+exports.isFieldReferenceFragment = isFieldReferenceFragment;
+function isSqlStringFragment(f) {
+    return (f === null || f === void 0 ? void 0 : f.type) === 'sql-string';
+}
+exports.isSqlStringFragment = isSqlStringFragment;
+function isSourceReferenceFragment(f) {
+    return (f === null || f === void 0 ? void 0 : f.type) === 'source-reference';
+}
+exports.isSourceReferenceFragment = isSourceReferenceFragment;
 function isParameterFragment(f) {
     return (f === null || f === void 0 ? void 0 : f.type) === 'parameter';
 }

package/dist/model/utils.js

@@ -126,6 +126,11 @@ function exprMap(expr, func) {
                 case 'parameter':
                 case 'outputField':
                     return fragment;
+                case 'sql-string':
+                    return {
+                        ...fragment,
+                        e: exprMap(fragment.e, func),
+                    };
                 case 'function_call':
                     return {
                         ...fragment,
@@ -232,6 +237,11 @@ function exprWalk(expr, func) {
                     ...fragment,
                     args: fragment.args.map(arg => exprWalk(arg, func)),
                 };
+            case 'sql-string':
+                return {
+                    ...fragment,
+                    e: exprWalk(fragment.e, func),
+                };
             case 'filterExpression':
                 return {
                     ...fragment,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.119-dev240116200529",
+  "version": "0.0.119-dev240118215411",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",