Fix issue where filtered aggregates did not have composite usage of t…

…he filter expressions involved (#2062)
malloydata · Dec 20, 2024 · 74801a0 · 74801a0
1 parent eba240c
commit 74801a0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/packages/malloy/src/lang/ast/expressions/expr-props.ts b/packages/malloy/src/lang/ast/expressions/expr-props.ts
@@ -36,6 +36,7 @@ import {ExpressionDef} from '../types/expression-def';
 import {FieldPropStatement} from '../types/field-prop-statement';
 import {FieldSpace} from '../types/field-space';
 import {ExprFunc} from './expr-func';
+import {mergeCompositeFieldUsage} from '../../../model/composite_source_utils';
 
 export class ExprProps extends ExpressionDef {
   elementType = 'expression with props';
@@ -77,6 +78,10 @@ export class ExprProps extends ExpressionDef {
       if (this.typeCheck(this.expr, {...expr, expressionType: 'scalar'})) {
         return {
           ...expr,
+          compositeFieldUsage: mergeCompositeFieldUsage(
+            expr.compositeFieldUsage,
+            ...filterList.map(f => f.compositeFieldUsage)
+          ),
           value: {
             node: 'filteredExpr',
             kids: {e: expr.value, filterList},

diff --git a/packages/malloy/src/lang/test/composite-field-usage.spec.ts b/packages/malloy/src/lang/test/composite-field-usage.spec.ts
@@ -49,6 +49,7 @@ describe('composite sources', () => {
       source: x is compose(ab, ab) extend {
         dimension: aif is ai + af
         measure: ss is ai.sum()
+        measure: saiaf is ai.sum() { where: af > 1 }
       }
 
       source: y is compose(ab, ab) extend {
@@ -94,6 +95,11 @@ describe('composite sources', () => {
       const mexpr = makeExprFunc(m.translator.modelDef, 'x');
       expect(mexpr`ss`).hasCompositeUsage(paths([['ai']]));
     });
+
+    test('measure with filter defined in composite source', () => {
+      const mexpr = makeExprFunc(m.translator.modelDef, 'x');
+      expect(mexpr`saiaf`).hasCompositeUsage(paths([['ai'], ['af']]));
+    });
   });
 
   describe('composite source resolution and validation', () => {