@malloydata/malloy 0.0.333 → 0.0.334

package/dist/lang/ast/source-elements/refined-source.js

@@ -138,7 +138,8 @@ class RefinedSource extends source_1.Source {
         fs.addAccessModifiers(thisIncludeState.modifiers);
         fs.addNotes(thisIncludeState.notes);
         const retStruct = fs.structDef();
-        const filterList = retStruct.filterList || [];
+        // Clone the filterList to avoid mutating the original source's filters
+        const filterList = retStruct.filterList ? [...retStruct.filterList] : [];
         let moreFilters = false;
         for (const filter of filters) {
             for (const el of filter.list) {

package/dist/model/query_query.js

@@ -1052,6 +1052,7 @@ class QueryQuery extends query_node_1.QueryField {
                     let orderingField;
                     const orderByDef = result.firstSegment.orderBy ||
                         result.calculateDefaultOrderBy();
+                    // Build up the ORDER BY clause from all ordering fields
                     for (const ordering of orderByDef) {
                         if (typeof ordering.field === 'string') {
                             orderingField = {
@@ -1065,31 +1066,32 @@ class QueryQuery extends query_node_1.QueryField {
                         obSQL.push(' ' +
                             this.parent.dialect.sqlMaybeQuoteIdentifier(`${orderingField.name}__${result.groupSet}`) +
                             ` ${ordering.dir || 'ASC'}`);
-                        // partition for a row number is the parent if it exists.
-                        let p = '';
-                        if (result.parent && partitionSQL[result.parent.groupSet]) {
-                            p = partitionSQL[result.parent.groupSet] + ', group_set';
-                        }
-                        else {
-                            p = 'PARTITION BY group_set';
-                        }
-                        // if this has nested data and a having, we want to partion by the 'having' so we don't count
-                        // deleted rows.
-                        if (result.hasHaving) {
-                            p = p + `, __delete__${result.groupSet}`;
-                        }
-                        limitExpressions.push(`CASE WHEN GROUP_SET=${result.groupSet} THEN
-                 ROW_NUMBER() OVER (${p} ORDER BY ${obSQL.join(',')}) END  as __row_number__${result.groupSet}`);
-                        // if the group set is a leaf, we can write a simple where clause.
-                        const filterClause = `(GROUP_SET = ${result.groupSet} AND __row_number__${result.groupSet} > ${limitValues[result.groupSet]})`;
-                        if (result.childGroups.length === 1) {
-                            limitSimpleFilters.push(filterClause);
-                        }
-                        else {
-                            // its a complex
-                            limitComplexClauses[result.groupSet] =
-                                `CASE WHEN ${filterClause} THEN 1 ELSE 0 END`;
-                        }
+                    }
+                    // partition for a row number is the parent if it exists.
+                    let p = '';
+                    if (result.parent && partitionSQL[result.parent.groupSet]) {
+                        p = partitionSQL[result.parent.groupSet] + ', group_set';
+                    }
+                    else {
+                        p = 'PARTITION BY group_set';
+                    }
+                    // if this has nested data and a having, we want to partition by the 'having' so we don't count
+                    // deleted rows.
+                    if (result.hasHaving) {
+                        p = p + `, __delete__${result.groupSet}`;
+                    }
+                    // Generate a single ROW_NUMBER() with all ORDER BY fields
+                    limitExpressions.push(`CASE WHEN GROUP_SET=${result.groupSet} THEN
+               ROW_NUMBER() OVER (${p} ORDER BY ${obSQL.join(',')}) END  as __row_number__${result.groupSet}`);
+                    // if the group set is a leaf, we can write a simple where clause.
+                    const filterClause = `(GROUP_SET = ${result.groupSet} AND __row_number__${result.groupSet} > ${limitValues[result.groupSet]})`;
+                    if (result.childGroups.length === 1) {
+                        limitSimpleFilters.push(filterClause);
+                    }
+                    else {
+                        // its a complex
+                        limitComplexClauses[result.groupSet] =
+                            `CASE WHEN ${filterClause} THEN 1 ELSE 0 END`;
                     }
                 }
             }

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.333";
+export declare const MALLOY_VERSION = "0.0.334";

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MALLOY_VERSION = void 0;
 // generated with 'generate-version-file' script; do not edit manually
-exports.MALLOY_VERSION = '0.0.333';
+exports.MALLOY_VERSION = '0.0.334';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.333",
+  "version": "0.0.334",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -45,9 +45,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.333",
-    "@malloydata/malloy-interfaces": "0.0.333",
-    "@malloydata/malloy-tag": "0.0.333",
+    "@malloydata/malloy-filter": "0.0.334",
+    "@malloydata/malloy-interfaces": "0.0.334",
+    "@malloydata/malloy-tag": "0.0.334",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jaro-winkler": "^0.2.8",