@rex0220/kintone-sql-tools 3.83.0 → 3.85.0

package/dist-cli/ksql.js

@@ -23465,6 +23465,11 @@ function walkDependency(node, context) {
     if (context.clause !== "SELECT" && ref.tableAlias === null) {
       const alias = resolveProjectedName(ref.field, context.aliases.keys());
       const targets = alias === void 0 ? [] : context.aliases.get(alias) ?? [];
+      if (context.clause === "HAVING" && alias !== void 0 && targets.some((target) => target.type === "WINDOW_COL")) {
+        throw new Error(
+          `ArgumentError: HAVING \u304B\u3089\u306F\u540C\u3058 SELECT \u306E\u30A6\u30A3\u30F3\u30C9\u30A6\u95A2\u6570\u306E\u7D50\u679C\uFF08\u5225\u540D ${alias}\uFF09\u3092\u53C2\u7167\u3067\u304D\u307E\u305B\u3093\u3002HAVING \u306F\u30A6\u30A3\u30F3\u30C9\u30A6\u3088\u308A\u5148\u306B\u8A55\u4FA1\u3055\u308C\u307E\u3059\u3002WITH \u3067\u6BB5\u3092\u5206\u3051\u3001\u6B21\u306E\u6BB5\u306E WHERE \u3067\u7D5E\u3063\u3066\u304F\u3060\u3055\u3044 (reason=HAVING_WINDOW_ALIAS)`
+        );
+      }
       if (targets.length === 1 && alias !== void 0 && !context.resolvingAliases.has(alias)) {
         const resolvingAliases = new Set(context.resolvingAliases);
         resolvingAliases.add(alias);
@@ -23693,8 +23698,9 @@ function validateGroupingRefMembership(ref, resolve3, canonicalItems) {
 }
 function validateGroupingStatic(stmt) {
   const normalized = normalizeGroupingSpec(stmt);
+  const projectedColumns = [...stmt.columns, ...stmt.hiddenWindows ?? []];
   const groupingRefs = [];
-  for (const column of stmt.columns) {
+  for (const column of projectedColumns) {
     collectGroupingRefs(column, groupingRefs);
   }
   collectGroupingRefs(stmt.having, groupingRefs);
@@ -23702,7 +23708,7 @@ function validateGroupingStatic(stmt) {
   const forbiddenGroupingRefs = [];
   collectGroupingRefs(stmt.where, forbiddenGroupingRefs);
   collectGroupingRefs(stmt.joins, forbiddenGroupingRefs);
-  collectAggregateArgumentGroupingRefs(stmt.columns, forbiddenGroupingRefs);
+  collectAggregateArgumentGroupingRefs(projectedColumns, forbiddenGroupingRefs);
   collectAggregateArgumentGroupingRefs(stmt.having, forbiddenGroupingRefs);
   if (forbiddenGroupingRefs.length > 0) {
     throw new Error(
@@ -23731,7 +23737,7 @@ function validateGroupingPlanning(stmt, resolve3, planningGuardHook = () => void
   validateGroupingStatic(stmt);
   const normalized = normalizeGroupingSpec(stmt);
   const groupingRefs = [];
-  for (const column of stmt.columns) {
+  for (const column of [...stmt.columns, ...stmt.hiddenWindows ?? []]) {
     collectGroupingRefs(column, groupingRefs);
   }
   collectGroupingRefs(stmt.having, groupingRefs);
@@ -37734,7 +37740,7 @@ async function buildGroupingFieldResolver(stmt, client, cacheContext, materializ
 async function validateSelectGroupingPlanning(stmt, client, cacheContext, materializedTables) {
   resolvedGroupingSpecs.delete(stmt);
   const normalized = normalizeGroupingSpec(stmt);
-  const hasGroupingNodes = JSON.stringify(stmt.columns).includes('"GROUPING_') || JSON.stringify(stmt.orderBy).includes('"GROUPING_');
+  const hasGroupingNodes = JSON.stringify(stmt.columns).includes('"GROUPING_') || JSON.stringify(stmt.hiddenWindows ?? []).includes('"GROUPING_') || JSON.stringify(stmt.orderBy).includes('"GROUPING_');
   if (normalized.type === "GROUPING_SETS" || hasGroupingNodes) {
     const resolver = await buildGroupingFieldResolver(stmt, client, cacheContext, materializedTables);
     const resolvedSpec = validateGroupingPlanning(