@malloydata/malloy 0.0.36-dev230524204158 → 0.0.36-dev230524224445

package/dist/lang/ast/elements/define-query.js

@@ -32,15 +32,18 @@ class DefineQuery extends malloy_element_1.MalloyElement {
         this.elementType = 'defineQuery';
     }
     execute(doc) {
+        const existing = doc.getEntry(this.name);
+        if (existing) {
+            this.log(`Query '${this.name}' is already defined, cannot redefine`);
+            return;
+        }
         const entry = {
             ...this.queryDetails.query(),
             type: 'query',
             name: this.name,
             location: this.location,
         };
-        const exported = true;
-        doc.setEntry(this.name, { entry, exported });
-        return undefined;
+        doc.setEntry(this.name, { entry, exported: true });
     }
 }
 exports.DefineQuery = DefineQuery;

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

@@ -38,15 +38,12 @@ class ExprFilter extends expression_def_1.ExpressionDef {
     getExpression(fs) {
         const testList = this.filter.getFilterList(fs);
         const resultExpr = this.expr.getExpression(fs);
-        for (const cond of testList) {
-            if ((0, malloy_types_1.expressionIsCalculation)(cond.expressionType)) {
-                this.filter.log('Cannot filter a field with an aggregate or analytical computation');
-                return (0, ast_utils_1.errorFor)('no filter on aggregate');
-            }
-        }
         if (resultExpr.expressionType === 'scalar') {
-            // TODO could log a warning, but I have a problem with the
-            // idea of warnings, so for now ...
+            this.expr.log('Filtered expression requires an aggregate computation');
+            return resultExpr;
+        }
+        if (testList.find(cond => (0, malloy_types_1.expressionIsCalculation)(cond.expressionType))) {
+            this.filter.log('Cannot filter an expresion with an aggregate or analytical computation');
             return resultExpr;
         }
         if (this.typeCheck(this.expr, { ...resultExpr, expressionType: 'scalar' })) {

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

@@ -216,6 +216,9 @@ describe('model statements', () => {
         }
       `));
     });
+    test('errors on redefinition of query', () => {
+        expect('query: q1 is a -> { project: * }, q1 is a -> { project: * }').compileToFailWith("Query 'q1' is already defined, cannot redefine");
+    });
 });
 describe('explore properties', () => {
     test('single dimension', modelOK('explore: aa is a { dimension: x is 1 }'));
@@ -682,6 +685,10 @@ describe('expressions', () => {
         });
     });
     test('filtered measure', exprOK("acount {? astr = 'why?' }"));
+    test('correctly flags filtered scalar', () => {
+        const e = new test_translator_1.BetaExpression('ai { where: true }');
+        expect(e).compileToFailWith('Filtered expression requires an aggregate computation');
+    });
     describe('aggregate forms', () => {
         test('count', exprOK('count()'));
         test('count distinct', exprOK('count(distinct astr)'));

package/package.json

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