@rex0220/kintone-sql-tools 3.45.0 → 3.46.0

package/dist-cli/ksql.js

@@ -752,7 +752,7 @@ function caseLabel(expr) {
 }
 function stringFuncArgLabel(arg) {
   if (arg.type === "AGG_REF") return aggregateSyntheticName(arg.func, arg.distinct, arg.arg);
-  if (arg.type === "AGG_ARITH") return aggregateOperandLabel(arg);
+  if (arg.type === "AGG_ARITH" || arg.type === "AGG_GROUP_KEY" || arg.type === "VARIABLE") return aggregateOperandLabel(arg);
   return scalarValueLabel(arg);
 }
 function stringFuncLabel(expr) {
@@ -790,6 +790,8 @@ function aggregateSyntheticName(func, distinct, arg) {
 function aggregateOperandLabel(node) {
   if (node.type === "NUMBER") return numberLiteralText(node);
   if (node.type === "AGG_REF") return aggregateSyntheticName(node.func, node.distinct, node.arg);
+  if (node.type === "AGG_GROUP_KEY") return node.tableAlias ? `${node.tableAlias}.${node.field}` : node.field;
+  if (node.type === "VARIABLE") return `@${node.name}`;
   return `${aggregateOperandLabel(node.left)}${node.op}${aggregateOperandLabel(node.right)}`;
 }
 
@@ -1068,6 +1070,8 @@ var Parser = class {
     this.cteNames = /* @__PURE__ */ new Set();
     /** パース中に出現した一時テーブル参照（#name）のトークン。単文 API での拒否に使う */
     this.tempTableRefs = [];
+    /** GROUP BY を読む前に作る B124 候補 leaf の診断位置。AST 公開型へ位置情報を足さない。 */
+    this.aggregateGroupKeyTokens = /* @__PURE__ */ new WeakMap();
     this.allowSelectArithVariable = false;
   }
   // ----------------------------------------------------------
@@ -1879,6 +1883,7 @@ var Parser = class {
     if (grouping && orderMode === "KINTONE_NATIVE") {
       throw new ParseError("B65: KORDER BY cannot be combined with grouping sets in Phase1.", this.peek());
     }
+    this.validateAggregateGroupKeyRefs(columns, having, groupBy, grouping);
     return {
       type: "SELECT",
       distinct,
@@ -1971,6 +1976,12 @@ var Parser = class {
         this.peek()
       );
     }
+    if (this.isNonAggregateArithmeticStartWithAggregate()) {
+      throw new ParseError(
+        `\u96C6\u8A08\u7B97\u8853\u5F0F\u306F\u96C6\u8A08\u95A2\u6570\u304B\u3089\u59CB\u307E\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\uFF08${this.peek().value}\uFF09\u3002`,
+        this.peek()
+      );
+    }
     if (this.tryAggregateFunc() === null && this.hasTopLevelTokenBeforeValueEnd("||" /* CONCAT_OP */)) {
       const expr = this.parseScalarValueExpr({ allowAggregateArgs: true });
       const parsedAlias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
@@ -2194,6 +2205,7 @@ var Parser = class {
   }
   stringFuncArgHasAggregate(arg) {
     if (arg.type === "AGG_REF" || arg.type === "AGG_ARITH") return true;
+    if (arg.type === "AGG_GROUP_KEY" || arg.type === "VARIABLE") return false;
     return this.scalarValueHasAggregate(arg);
   }
   scalarValueHasAggregate(expr) {
@@ -2236,7 +2248,7 @@ var Parser = class {
   parseAggArithMulDiv() {
     return this.continueAggArithMulDiv(this.parseAggPrimary());
   }
-  /** 集計算術式の一次式: 集計関数 / 数値リテラル / 括弧 */
+  /** 集計算術式の一次式: 集計関数 / 数値 / 変数 / GROUP BY キー候補 / 括弧 */
   parseAggPrimary() {
     if (this.consume("(" /* LPAREN */)) {
       const inner = this.continueAggArith(this.parseAggPrimary());
@@ -2253,14 +2265,99 @@ var Parser = class {
       const tok = this.advance();
       return makeNumberLiteral(tok.value);
     }
+    if (this.peek().kind === "VARIABLE" /* VARIABLE */) {
+      const tok = this.advance();
+      return { type: "VARIABLE", name: tok.value.slice(1).toLowerCase() };
+    }
     const aggFunc = this.tryAggregateFunc();
     if (aggFunc !== null) {
       const ref = this.parseAggregateRef(aggFunc);
       this.rejectAggregateWindowOutsideSelect();
       return ref;
     }
+    if (this.peek().kind === "IDENT" /* IDENT */ || this.peek().kind === "BIDENT" /* BIDENT */) {
+      const tok = this.peek();
+      const parsed = this.parseQualifiedIdent();
+      const ref = {
+        type: "AGG_GROUP_KEY",
+        field: parsed.field,
+        ...parsed.tableAlias ? { tableAlias: parsed.tableAlias } : {}
+      };
+      this.aggregateGroupKeyTokens.set(ref, tok);
+      return ref;
+    }
     throw new ParseError("\u96C6\u8A08\u7B97\u8853\u5F0F\u306B\u306F\u96C6\u8A08\u95A2\u6570\u307E\u305F\u306F\u6570\u5024\u304C\u5FC5\u8981\u3067\u3059", this.peek());
   }
+  /** B124 Phase 1 はトップレベルの非集計オペランド開始形を明示拒否する。 */
+  isNonAggregateArithmeticStartWithAggregate() {
+    const first = this.peek();
+    if (this.tryAggregateFunc() !== null || first.kind === "CASE" /* CASE */ || first.kind === "IF" /* IF */) return false;
+    if (this.isGroupingFunctionStart()) return false;
+    if (this.tryStringFuncName() !== null) return false;
+    if (!["IDENT" /* IDENT */, "BIDENT" /* BIDENT */, "VARIABLE" /* VARIABLE */, "(" /* LPAREN */].includes(first.kind)) return false;
+    let depth = 0;
+    let sawArithmetic = false;
+    for (let index = this.pos; index < this.tokens.length; index++) {
+      const token = this.tokens[index];
+      if (depth === 0 && index > this.pos && (token.kind === "," /* COMMA */ || token.kind === "AS" /* AS */ || token.kind === "FROM" /* FROM */ || token.kind === ";" /* SEMICOLON */ || token.kind === "EOF" /* EOF */ || token.kind === "=" /* EQ */ || token.kind === "!=" /* NEQ */ || token.kind === "<>" /* LT_GT */ || token.kind === ">" /* GT */ || token.kind === "<" /* LT */ || token.kind === ">=" /* GTE */ || token.kind === "<=" /* LTE */ || token.kind === "AND" /* AND */ || token.kind === "OR" /* OR */)) break;
+      if (this.isArithOp(token.kind)) sawArithmetic = true;
+      if (PARSER_AGGREGATE_FUNCTION_TOKEN_MAP[token.kind] !== void 0 && this.tokens[index + 1]?.kind === "(" /* LPAREN */) return sawArithmetic;
+      if (token.kind === "(" /* LPAREN */) depth++;
+      else if (token.kind === ")" /* RPAREN */) {
+        depth--;
+        if (depth < 0) break;
+      }
+    }
+    return false;
+  }
+  /** SELECT ローカルの B124 leaf だけを ordinary GROUP BY の表記と照合する。 */
+  validateAggregateGroupKeyRefs(columns, having, groupBy, grouping) {
+    const refs = [];
+    const visit = (node) => {
+      if (Array.isArray(node)) {
+        node.forEach(visit);
+        return;
+      }
+      if (node === null || typeof node !== "object") return;
+      const value = node;
+      if (value["type"] === "SELECT" || value["type"] === "SCALAR_SUBQUERY") return;
+      if (value["type"] === "AGG_GROUP_KEY") {
+        refs.push(node);
+        return;
+      }
+      Object.values(value).forEach(visit);
+    };
+    visit(columns);
+    visit(having);
+    if (refs.length === 0) return;
+    const first = refs[0];
+    const firstToken = this.aggregateGroupKeyTokens.get(first) ?? this.peek();
+    if (grouping !== void 0) {
+      throw new ParseError(
+        "ROLLUP / CUBE / GROUPING SETS \u3067\u306F\u96C6\u8A08\u7B97\u8853\u5F0F\u306B\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u66F8\u3051\u307E\u305B\u3093\uFF08\u5C0F\u8A08\u30FB\u7DCF\u8A08\u884C\u3067\u5024\u304C\u5B9A\u307E\u3089\u306A\u3044\u305F\u3081\u3067\u3059\uFF09\u3002",
+        firstToken
+      );
+    }
+    if (groupBy.length === 0) {
+      throw new ParseError(
+        `\u96C6\u8A08\u7B97\u8853\u5F0F\u306B\u30D5\u30A3\u30FC\u30EB\u30C9\u3092\u66F8\u304F\u306B\u306F GROUP BY \u304C\u5FC5\u8981\u3067\u3059\uFF08${this.aggregateGroupKeyDisplay(first)}\uFF09\u3002`,
+        firstToken
+      );
+    }
+    const ordinaryNames = new Set(groupBy.filter((key) => key.type === "FIELD_NAME").map((key) => key.name));
+    for (const ref of refs) {
+      const display = this.aggregateGroupKeyDisplay(ref);
+      if (!ordinaryNames.has(display)) {
+        throw new ParseError(
+          `\u96C6\u8A08\u7B97\u8853\u5F0F\u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u53C2\u7167\u306F GROUP BY \u306B\u66F8\u3044\u305F\u8868\u8A18\u3068\u4E00\u81F4\u3059\u308B\u5217\u3060\u3051\u3067\u3059\uFF08${display}\uFF09\u3002\u30B0\u30EB\u30FC\u30D7\u5185\u3067\u5024\u304C\u5B9A\u307E\u3089\u306A\u3044\u305F\u3081\u3067\u3059\u3002`,
+          this.aggregateGroupKeyTokens.get(ref) ?? firstToken
+        );
+      }
+    }
+  }
+  aggregateGroupKeyDisplay(ref) {
+    return ref.tableAlias ? `${ref.tableAlias}.${ref.field}` : ref.field;
+  }
   // ──────────────────────────────────────────────────
   // 汎用スカラー値式パーサー（B38）
   // ──────────────────────────────────────────────────
@@ -3008,6 +3105,12 @@ var Parser = class {
   // - 集計関数（HAVING のみ）: COUNT(*) / SUM(f) ...
   // - 通常フィールド参照: [alias.]field
   parseFieldValue() {
+    if (this.groupingFieldContext === "HAVING" && this.isNonAggregateArithmeticStartWithAggregate()) {
+      throw new ParseError(
+        `\u96C6\u8A08\u7B97\u8853\u5F0F\u306F\u96C6\u8A08\u95A2\u6570\u304B\u3089\u59CB\u307E\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\uFF08${this.peek().value}\uFF09\u3002`,
+        this.peek()
+      );
+    }
     if (this.isUnsupportedGroupingIdStart()) {
       throw new ParseError("B65: GROUPING_ID is not supported in Phase1.", this.peek());
     }
@@ -5811,7 +5914,7 @@ function collectStringFuncFields(expr, out) {
   }
 }
 function collectStringFuncArgFields(arg, out) {
-  if (arg.type === "AGG_REF" || arg.type === "AGG_ARITH") {
+  if (arg.type === "AGG_REF" || arg.type === "AGG_ARITH" || arg.type === "AGG_GROUP_KEY" || arg.type === "VARIABLE") {
     collectAggOperandFields(arg, out);
     return;
   }
@@ -5857,6 +5960,9 @@ function collectAggOperandFields(node, out) {
     collectAggOperandFields(node.left, out);
     collectAggOperandFields(node.right, out);
   }
+  if (node.type === "AGG_GROUP_KEY") {
+    out.push(normalizeSimpleFieldRef(node.tableAlias ? `${node.tableAlias}.${node.field}` : node.field));
+  }
 }
 function collectAggregateArgFields(node, out) {
   if (node.type === "FIELD_REF" || node.type === "ARITH") collectArithNode(node, out);
@@ -5865,6 +5971,7 @@ function collectAggregateArgFields(node, out) {
 function hasAggregateInStringFuncExpr(expr) {
   return expr.args.some((arg) => {
     if (arg.type === "AGG_REF" || arg.type === "AGG_ARITH") return true;
+    if (arg.type === "AGG_GROUP_KEY" || arg.type === "VARIABLE") return false;
     return scalarValueHasAggregate(arg);
   });
 }
@@ -6052,9 +6159,12 @@ function collectRequiredFieldsByTable(stmt, plainGroupByPlan, sourceAware) {
       walkAgg(node.left, phase);
       walkAgg(node.right, phase);
     }
+    if (node.type === "AGG_GROUP_KEY") {
+      addFieldRef(node.field, node.tableAlias ?? null, phase);
+    }
   };
   const walkStringArg = (arg, phase = "select") => {
-    if (arg.type === "AGG_REF" || arg.type === "AGG_ARITH") {
+    if (arg.type === "AGG_REF" || arg.type === "AGG_ARITH" || arg.type === "AGG_GROUP_KEY" || arg.type === "VARIABLE") {
       walkAgg(arg, phase);
       return;
     }
@@ -8155,7 +8265,7 @@ function formatWithComma(num, digits) {
   return decStr ? `${intFmt}.${decStr}` : intFmt;
 }
 function evalStringFuncArg(arg, row, resolveFieldType, resolveFieldSemantics2) {
-  if (arg.type === "AGG_REF" || arg.type === "AGG_ARITH") {
+  if (arg.type === "AGG_REF" || arg.type === "AGG_ARITH" || arg.type === "AGG_GROUP_KEY") {
     return String(evalMaterializedAggregateOperand(arg, row));
   }
   if (arg.type === "NUMBER") return numberLiteralText(arg);
@@ -8166,6 +8276,13 @@ function evalMaterializedAggregateOperand(node, row) {
   if (node.type === "AGG_REF") {
     return row[aggregateSyntheticName(node.func, node.distinct, node.arg)] ?? "";
   }
+  if (node.type === "AGG_GROUP_KEY") {
+    const field = node.tableAlias ? `${node.tableAlias}.${node.field}` : node.field;
+    return Number(resolveFieldRef(row, field));
+  }
+  if (node.type === "VARIABLE") {
+    throw new Error(`InternalError: unresolved aggregate arithmetic variable @${node.name}.`);
+  }
   const left = Number(evalMaterializedAggregateOperand(node.left, row));
   const right = Number(evalMaterializedAggregateOperand(node.right, row));
   switch (node.op) {
@@ -8667,7 +8784,7 @@ function collectStringFuncFields2(expr, out) {
   for (const arg of expr.args) collectStringFuncArgFields2(arg, out);
 }
 function collectStringFuncArgFields2(arg, out) {
-  if (arg.type === "AGG_REF" || arg.type === "AGG_ARITH") {
+  if (arg.type === "AGG_REF" || arg.type === "AGG_ARITH" || arg.type === "AGG_GROUP_KEY" || arg.type === "VARIABLE") {
     collectAggOperandFields2(arg, out);
     return;
   }
@@ -8698,6 +8815,7 @@ function collectAggOperandFields2(node, out) {
     collectAggOperandFields2(node.left, out);
     collectAggOperandFields2(node.right, out);
   }
+  if (node.type === "AGG_GROUP_KEY") out.add(node.tableAlias ? `${node.tableAlias}.${node.field}` : node.field);
 }
 function collectAggregateArgFields2(node, out) {
   if (node.type === "FIELD_REF" || node.type === "ARITH") collectArithNode2(node, out);
@@ -13431,6 +13549,13 @@ function toAggregateFieldRef(field) {
 function evalAggArithExpr(node, rows, resolveAggSortKind) {
   if (node.type === "NUMBER") return node.value;
   if (node.type === "AGG_REF") return Number(evalAggregate(node.func, node.distinct, node.arg, node.separator, rows, resolveAggSortKind));
+  if (node.type === "AGG_GROUP_KEY") {
+    const field = node.tableAlias ? `${node.tableAlias}.${node.field}` : node.field;
+    return Number(resolveFieldRef(rows[0] ?? {}, field));
+  }
+  if (node.type === "VARIABLE") {
+    throw new Error(`InternalError: unresolved aggregate arithmetic variable @${node.name}.`);
+  }
   const l = evalAggArithExpr(node.left, rows, resolveAggSortKind);
   const r = evalAggArithExpr(node.right, rows, resolveAggSortKind);
   switch (node.op) {
@@ -14069,7 +14194,8 @@ function arithColDefaultKey(expr) {
 }
 function stringFuncDefaultKey(expr) {
   const argStrs = expr.args.map((a) => {
-    if (a.type === "AGG_REF" || a.type === "AGG_ARITH") return aggArithDefaultKey(a);
+    if (a.type === "AGG_REF" || a.type === "AGG_ARITH" || a.type === "AGG_GROUP_KEY") return aggArithDefaultKey(a);
+    if (a.type === "VARIABLE") return `@${a.name}`;
     return scalarValueDefaultKey(a);
   });
   return `${expr.func}(${argStrs.join(",")})`;
@@ -14096,6 +14222,7 @@ function scalarValueDefaultKey(expr) {
 }
 function hasAggregateInStringFuncArg(arg) {
   if (arg.type === "AGG_REF" || arg.type === "AGG_ARITH") return true;
+  if (arg.type === "AGG_GROUP_KEY" || arg.type === "VARIABLE") return false;
   return scalarValueHasAggregate2(arg);
 }
 function scalarValueHasAggregate2(expr) {
@@ -14125,6 +14252,13 @@ function resolveAggInStringFuncArg(arg, rows, resolveAggSortKind) {
     const value = evalAggArithExpr(arg, rows, resolveAggSortKind);
     return { type: "NUMBER", value, raw: String(value) };
   }
+  if (arg.type === "AGG_GROUP_KEY") {
+    const field = arg.tableAlias ? `${arg.tableAlias}.${arg.field}` : arg.field;
+    return { type: "NUMBER", value: Number(resolveFieldRef(rows[0] ?? {}, field)), raw: resolveFieldRef(rows[0] ?? {}, field) };
+  }
+  if (arg.type === "VARIABLE") {
+    throw new Error(`InternalError: unresolved aggregate arithmetic variable @${arg.name}.`);
+  }
   if (arg.type === "STRING_FUNC") {
     return resolveAggInStringFuncExpr(arg, rows, resolveAggSortKind);
   }
@@ -17117,7 +17251,15 @@ function resolveBatchVariableReferencesInternal(node, variables, numericArithmet
           `ArgumentError: variable @${obj["name"]} is not numeric and cannot be used in arithmetic.`
         );
       }
-      return numericArithmeticOperand && value.type === "string" && value.placeholder === true ? { type: "NUMBER", value: 0, raw: value.value } : value.type === "number" ? { type: "NUMBER", value: value.value, raw: value.raw ?? String(value.value) } : { type: "STRING", value: value.value };
+      return numericArithmeticOperand && value.type === "string" && value.placeholder === true ? {
+        type: "NUMBER",
+        value: 0,
+        raw: numericArithmeticOperand === "AGG_ARITH" ? `@${obj["name"]}` : value.value
+      } : value.type === "number" ? {
+        type: "NUMBER",
+        value: value.value,
+        raw: numericArithmeticOperand === "AGG_ARITH" ? `@${obj["name"]}` : value.raw ?? String(value.value)
+      } : { type: "STRING", value: value.value };
     }
     if (obj["type"] === "VARIABLE_COL" && typeof obj["name"] === "string" && typeof obj["alias"] === "string") {
       const value = variables.get(obj["name"]);
@@ -17136,7 +17278,7 @@ function resolveBatchVariableReferencesInternal(node, variables, numericArithmet
         resolveBatchVariableReferencesInternal(
           value,
           variables,
-          (obj["type"] === "ARITH" || obj["type"] === "SCALAR_ARITH" || obj["type"] === "AGG_ARITH") && (key === "left" || key === "right")
+          key === "left" || key === "right" ? obj["type"] === "AGG_ARITH" ? "AGG_ARITH" : obj["type"] === "ARITH" || obj["type"] === "SCALAR_ARITH" ? "ARITH" : false : false
         )
       ])
     );
@@ -17853,6 +17995,8 @@ function arithHasFieldRef(node) {
   return false;
 }
 function stringFuncArgHasFieldRef(arg) {
+  if (arg.type === "AGG_GROUP_KEY") return true;
+  if (arg.type === "VARIABLE") return false;
   if (arg.type === "AGG_REF" || arg.type === "AGG_ARITH") return true;
   return scalarValueHasFieldRef(arg);
 }
@@ -18410,7 +18554,11 @@ function collectAggregateArgFieldRefs(arg, out) {
   }
   if (arg.type === "STRING_FUNC") {
     for (const child of arg.args) {
-      if (child.type !== "AGG_REF" && child.type !== "AGG_ARITH") collectAggregateArgFieldRefs(child, out);
+      if (child.type === "AGG_GROUP_KEY") {
+        out.push({ type: "FIELD", tableAlias: child.tableAlias ?? null, field: child.field });
+      } else if (child.type !== "AGG_REF" && child.type !== "AGG_ARITH" && child.type !== "VARIABLE") {
+        collectAggregateArgFieldRefs(child, out);
+      }
     }
     return;
   }
@@ -18430,11 +18578,16 @@ function collectAggregateOperandRefs(node, out) {
     collectAggregateOperandRefs(node.left, out);
     collectAggregateOperandRefs(node.right, out);
   }
+  if (node.type === "AGG_GROUP_KEY") out.push({ type: "FIELD", tableAlias: node.tableAlias ?? null, field: node.field });
 }
 function collectStringFuncAggregateRefs(expr, out) {
   for (const arg of expr.args) {
     if (arg.type === "AGG_REF" || arg.type === "AGG_ARITH") {
       collectAggregateOperandRefs(arg, out);
+    } else if (arg.type === "AGG_GROUP_KEY") {
+      out.push({ type: "FIELD", tableAlias: arg.tableAlias ?? null, field: arg.field });
+    } else if (arg.type === "VARIABLE") {
+      continue;
     } else {
       collectScalarAggregateRefs(arg, out);
     }
@@ -24416,7 +24569,8 @@ function collectArithNodeRefs(node, out) {
   }
   if (node.type === "STRING_FUNC") {
     for (const arg of node.args) {
-      if (arg.type !== "AGG_REF" && arg.type !== "AGG_ARITH") collectScalarNodeRefs(arg, out);
+      if (arg.type === "AGG_GROUP_KEY") out.add(arg.tableAlias ? `${arg.tableAlias}.${arg.field}` : arg.field);
+      else if (arg.type !== "AGG_REF" && arg.type !== "AGG_ARITH" && arg.type !== "VARIABLE") collectScalarNodeRefs(arg, out);
     }
   }
 }
@@ -24478,7 +24632,10 @@ function collectScalarNodeRefs(node, out) {
     return;
   }
   if (node.type === "STRING_FUNC") {
-    for (const arg of node.args) if (arg.type !== "AGG_REF" && arg.type !== "AGG_ARITH") collectScalarNodeRefs(arg, out);
+    for (const arg of node.args) {
+      if (arg.type === "AGG_GROUP_KEY") out.add(arg.tableAlias ? `${arg.tableAlias}.${arg.field}` : arg.field);
+      else if (arg.type !== "AGG_REF" && arg.type !== "AGG_ARITH" && arg.type !== "VARIABLE") collectScalarNodeRefs(arg, out);
+    }
     return;
   }
   if (node.type === "SCALAR_ARITH" || node.type === "CONCAT_OP") {