@rex0220/kintone-sql-tools 3.79.0 → 3.80.0

package/dist-cli/ksql.js

@@ -31748,7 +31748,7 @@ function hasAggregateColumns(columns) {
     (c) => c.type === "AGGREGATE" || c.type === "ARITH_AGG_COL" || c.type === "ARITH_COL" && containsAggregate2(c.expr) || c.type === "CASE_COL" && containsAggregate2(c.expr) || c.type === "STRFUNC_COL" && hasAggregateInStringFuncExpr2(c.expr) || c.type === "SCALAR_VALUE_COL" && scalarValueHasAggregate2(c.expr)
   );
 }
-function applyGroupBy(rows, groupByKeys, columns, resolveAggSortKind, resolutionPlan, aliasEvaluationContext = {}) {
+function applyGroupBy(rows, groupByKeys, columns, resolveAggSortKind, resolutionPlan, aliasEvaluationContext = {}, having = null) {
   if (resolutionPlan && resolutionPlan.items.length !== groupByKeys.length) {
     throw new Error("InternalError: plain GROUP BY resolution plan length does not match group keys.");
   }
@@ -31797,11 +31797,18 @@ function applyGroupBy(rows, groupByKeys, columns, resolveAggSortKind, resolution
       resolveAggSortKind,
       aliasEvaluationContext.evaluationContext
     );
+    materializeAggregateDependencies(
+      outRow,
+      groupRows,
+      having,
+      resolveAggSortKind,
+      aliasEvaluationContext.evaluationContext
+    );
     result.push(outRow);
   }
   return result;
 }
-function applyGroupingSets(rows, spec, columns, resolveAggSortKind, limits = {}) {
+function applyGroupingSets(rows, spec, columns, resolveAggSortKind, limits = {}, having = null) {
   const result = [];
   let generatedRows = 0;
   const countBucket = () => {
@@ -31861,6 +31868,13 @@ function applyGroupingSets(rows, spec, columns, resolveAggSortKind, limits = {})
         resolveAggSortKind,
         limits.evaluationContext
       );
+      materializeAggregateDependencies(
+        outRow,
+        groupRows,
+        having,
+        resolveAggSortKind,
+        limits.evaluationContext
+      );
       attachGroupingRowMeta(outRow, includedCanonicalIds);
       result.push(outRow);
     }
@@ -33121,7 +33135,8 @@ function runFullScan(input) {
       resolvedGroupingSpec,
       stmt.columns,
       aggregateSortKindResolver,
-      { maxGeneratedRows: B65_MAX_GENERATED_ROWS, evaluationContext }
+      { maxGeneratedRows: B65_MAX_GENERATED_ROWS, evaluationContext },
+      stmt.having
     );
   } else if (grouping.type === "PLAIN" || hasAggregateColumns(stmt.columns)) {
     rows = applyGroupBy(
@@ -33135,7 +33150,8 @@ function runFullScan(input) {
         resolveFieldType: fieldTypeResolver,
         resolveFieldSemantics: fieldSemanticsResolver,
         evaluationContext
-      }
+      },
+      stmt.having
     );
   }
   warnOnUnresolvedAggregateComparisons(stmt.columns, rows, warnings);