@malloydata/malloy 0.0.144-dev240426151705 → 0.0.144-dev240503150037

package/dist/model/malloy_query.js

@@ -696,7 +696,11 @@ class QueryField extends QueryNode {
             between = `ROWS BETWEEN ${preceding} PRECEDING AND ${following} FOLLOWING`;
         }
         const funcSQL = this.generateExpressionFromExpr(resultStruct, context, expr, state);
-        return `${funcSQL} OVER(${partitionBy} ${orderBy} ${between})`;
+        let retExpr = `${funcSQL} OVER(${partitionBy} ${orderBy} ${between})`;
+        if (isComplex) {
+            retExpr = `CASE WHEN group_set=${resultStruct.groupSet} THEN ${retExpr} END`;
+        }
+        return retExpr;
     }
     generateExpressionFromExpr(resultSet, context, e, state = new GenerateState()) {
         let s = '';
@@ -3016,12 +3020,7 @@ class QueryStruct extends QueryNode {
     getIdentifier() {
         // if it is the root table, use provided alias if we have one.
         if (this.fieldDef.structRelationship.type === 'basetable') {
-            if (this.fieldDef.as === undefined) {
-                return 'base';
-            }
-            else {
-                return identifierNormalize(super.getIdentifier());
-            }
+            return 'base';
         }
         // if this is an inline object, include the parents alias.
         if (this.fieldDef.structRelationship.type === 'inline' && this.parent) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.144-dev240426151705",
+  "version": "0.0.144-dev240503150037",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",