@malloydata/malloy 0.0.261-dev250410224545 → 0.0.261-dev250411181206

package/dist/lang/malloy-to-stable-query.d.ts

@@ -68,8 +68,9 @@ export declare class MalloyToQuery extends AbstractParseTreeVisitor<Node> implem
     getFieldExpression(cx: parse.FieldExprContext): Malloy.Expression | null;
     stripQuote(s: string, q: string): string;
     getFilterString(cx: parse.FilterStringContext): string | null;
-    getWhereExpr(cx: parse.FieldExprContext): Malloy.Where | null;
-    getWhere(whereCx: parse.WhereStatementContext): Malloy.Where[] | null;
+    getFilterExpr(cx: parse.FieldExprContext): Malloy.FilterOperation | null;
+    getWhere(whereCx: parse.WhereStatementContext): Malloy.FilterOperation[] | null;
+    getHaving(havingCx: parse.HavingStatementContext): Malloy.FilterOperation[] | null;
     protected combineAnnotations(...a: (Malloy.Annotation[] | undefined)[]): Malloy.Annotation[] | undefined;
 }
 export declare function malloyToQuery(code: string): {

package/dist/lang/malloy-to-stable-query.js

@@ -466,7 +466,14 @@ class MalloyToQuery extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor
             }));
         }
         else if (cx.havingStatement()) {
-            this.notAllowed(cx, 'Having statements');
+            const hvcx = cx.havingStatement();
+            const having = this.getHaving(hvcx);
+            if (having === null)
+                return null;
+            return having.map(h => ({
+                kind: 'having',
+                ...h,
+            }));
         }
         else if (cx.nestStatement()) {
             const obcx = cx.nestStatement();
@@ -662,7 +669,7 @@ class MalloyToQuery extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor
         }
         return null;
     }
-    getWhereExpr(cx) {
+    getFilterExpr(cx) {
         if (cx instanceof parse.ExprCompareContext) {
             if (cx.compareOp().MATCH()) {
                 const lhs = cx.fieldExpr()[0];
@@ -694,12 +701,20 @@ class MalloyToQuery extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor
     }
     getWhere(whereCx) {
         const exprs = whereCx.filterClauseList().fieldExpr();
-        const where = exprs.map(exprCx => this.getWhereExpr(exprCx));
+        const where = exprs.map(exprCx => this.getFilterExpr(exprCx));
         if (where.some(w => w === null)) {
             return null;
         }
         return where;
     }
+    getHaving(havingCx) {
+        const exprs = havingCx.filterClauseList().fieldExpr();
+        const having = exprs.map(exprCx => this.getFilterExpr(exprCx));
+        if (having.some(h => h === null)) {
+            return null;
+        }
+        return having;
+    }
     combineAnnotations(...a) {
         const annotations = a.flatMap(a => a !== null && a !== void 0 ? a : []);
         return annotations.length > 0 ? annotations : undefined;

package/dist/model/malloy_query.js

@@ -2842,11 +2842,12 @@ class QueryQuery extends QueryField {
         this.prepare(stageWriter);
         let lastStageName = this.generateSQL(stageWriter);
         let outputStruct = this.getResultStructDef();
-        if (this.fieldDef.pipeline.length > 1) {
+        const pipeline = [...this.fieldDef.pipeline];
+        if (pipeline.length > 1) {
             // console.log(pretty(outputStruct));
-            const pipeline = [...this.fieldDef.pipeline];
             let structDef = {
                 ...outputStruct,
+                name: lastStageName,
                 type: 'finalize',
             };
             pipeline.shift();
@@ -2861,6 +2862,7 @@ class QueryQuery extends QueryField {
                 outputStruct = q.getResultStructDef();
                 structDef = {
                     ...outputStruct,
+                    name: lastStageName,
                     type: 'finalize',
                 };
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.261-dev250410224545",
+  "version": "0.0.261-dev250411181206",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -41,9 +41,9 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-filter": "^0.0.261-dev250410224545",
-    "@malloydata/malloy-interfaces": "^0.0.261-dev250410224545",
-    "@malloydata/malloy-tag": "^0.0.261-dev250410224545",
+    "@malloydata/malloy-filter": "^0.0.261-dev250411181206",
+    "@malloydata/malloy-interfaces": "^0.0.261-dev250411181206",
+    "@malloydata/malloy-tag": "^0.0.261-dev250411181206",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",