@malloydata/malloy 0.0.81-dev230910215631 → 0.0.81

package/dist/lang/ast/query-properties/filters.js

@@ -76,18 +76,22 @@ class Filter extends malloy_element_1.ListOf {
             // Aggregates are ALSO checked at SQL generation time, but checking
             // here allows better reflection of errors back to user.
             if (this.havingClause !== undefined) {
-                const needHaving = (0, malloy_types_1.expressionIsCalculation)(fExpr.expressionType);
+                const isAggregate = (0, malloy_types_1.expressionIsAggregate)(fExpr.expressionType);
+                const isAnalytic = (0, malloy_types_1.expressionIsAnalytic)(fExpr.expressionType);
                 if (this.havingClause) {
-                    if (!needHaving) {
-                        oneElement.log('Aggregate or analytic expression expected in HAVING filter');
+                    if (isAnalytic) {
+                        oneElement.log('Analytic expressions are not allowed in `having:`');
                         continue;
                     }
                 }
                 else {
-                    if (needHaving) {
-                        oneElement.log('Aggregate or analytic expressions not allowed in WHERE');
+                    if (isAnalytic) {
+                        oneElement.log('Analytic expressions are not allowed in `where:`');
                         continue;
                     }
+                    else if (isAggregate) {
+                        oneElement.log('Aggregate expressions are not allowed in `where:`; use `having:`');
+                    }
                 }
             }
             checked.push(fExpr);

package/dist/lang/test/query.spec.js

@@ -805,6 +805,15 @@ describe('query:', () => {
         }
       `).toTranslate();
         });
+        test('agg cannot be used in where', () => {
+            expect('query:ab->{ aggregate: acount; group_by: astr; where: acount > 10 }').translationToFailWith('Aggregate expressions are not allowed in `where:`; use `having:`');
+        });
+        test('analytic cannot be used in where', () => {
+            expect('query:ab->{ calculate: prevc is lag(count()); group_by: astr; where: prevc > 10 }').translationToFailWith("'prevc' is not defined");
+        });
+        test('analytic cannot be used in having', () => {
+            expect('query:ab->{ calculate: prevc is lag(count()); group_by: astr; having: prevc > 10 }').translationToFailWith('Analytic expressions are not allowed in `having:`');
+        });
         test('where single', () => {
             expect('query:a->{ group_by: astr; where: af > 10 }').toTranslate();
         });

package/package.json

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