@rex0220/kintone-sql-tools 3.32.0 → 3.33.0

package/dist-cli/ksql.js

@@ -4260,6 +4260,15 @@ function containsStatisticalAggregate(value, seen = /* @__PURE__ */ new Set()) {
   if (record.type === "FIELD" && typeof record.field === "string" && /^(STDDEV_POP|STDDEV_SAMP|VAR_POP|VAR_SAMP|MEDIAN|MODE)\(/i.test(record.field)) return true;
   return Object.values(record).some((child) => Array.isArray(child) ? child.some((entry) => containsStatisticalAggregate(entry, seen)) : containsStatisticalAggregate(child, seen));
 }
+function containsAggregate(value, seen = /* @__PURE__ */ new Set()) {
+  if (value === null || typeof value !== "object") return false;
+  if (seen.has(value)) return false;
+  seen.add(value);
+  const record = value;
+  if ((record.type === "AGGREGATE" || record.type === "AGG_REF") && typeof record.func === "string" && !STATISTICAL_AGGREGATES.has(record.func)) return true;
+  if (record.type === "FIELD" && typeof record.field === "string" && /^(COUNT|SUM|AVG|MIN|MAX|GROUP_CONCAT)\(/i.test(record.field)) return true;
+  return Object.values(record).some((child) => Array.isArray(child) ? child.some((entry) => containsAggregate(entry, seen)) : containsAggregate(child, seen));
+}
 function completeInputReasons(stmt) {
   const reasons = /* @__PURE__ */ new Set();
   if (isDmlType(stmt.type)) {
@@ -4289,6 +4298,7 @@ function completeInputReasons(stmt) {
       break;
   }
   if (containsStatisticalAggregate(stmt)) reasons.add("STATISTICAL_AGGREGATE");
+  if (containsAggregate(stmt)) reasons.add("AGGREGATE");
   return reasons;
 }
 function requiresCompleteInput(stmt) {
@@ -4297,11 +4307,15 @@ function requiresCompleteInput(stmt) {
 function unionCompleteInputReasons(stmt) {
   const reasons = stmt.left.type === "SELECT" ? selectCompleteInputReasons(stmt.left) : unionCompleteInputReasons(stmt.left);
   addReasons(reasons, selectCompleteInputReasons(stmt.right));
+  if (!stmt.all) reasons.add("DISTINCT");
   return reasons;
 }
 function selectCompleteInputReasons(stmt) {
   const reasons = /* @__PURE__ */ new Set();
-  if (normalizeGroupingSpec(stmt).type === "GROUPING_SETS") reasons.add("GROUPING_SETS");
+  const grouping = normalizeGroupingSpec(stmt);
+  if (grouping.type === "GROUPING_SETS") reasons.add("GROUPING_SETS");
+  if (grouping.type === "PLAIN") reasons.add("GROUP_BY");
+  if (stmt.distinct) reasons.add("DISTINCT");
   if (stmt.orderBy.length > 0) reasons.add("LOCAL_ORDER");
   for (const column of stmt.columns) {
     if (column.type === "WINDOW_COL" && column.orderBy.length > 0) reasons.add("WINDOW_ORDER");
@@ -4313,6 +4327,7 @@ function selectCompleteInputReasons(stmt) {
   addReasons(reasons, whereCompleteInputReasons(stmt.where));
   addReasons(reasons, whereCompleteInputReasons(stmt.having));
   if (containsStatisticalAggregate(stmt)) reasons.add("STATISTICAL_AGGREGATE");
+  if (containsAggregate(stmt)) reasons.add("AGGREGATE");
   return reasons;
 }
 function whereCompleteInputReasons(where) {
@@ -6505,19 +6520,19 @@ function collectNonAggregateFieldRefs(node, out) {
   }
   Object.values(value).forEach((item) => collectNonAggregateFieldRefs(item, out));
 }
-function containsAggregate(node) {
+function containsAggregate2(node) {
   if (node === null || typeof node !== "object") return false;
-  if (Array.isArray(node)) return node.some(containsAggregate);
+  if (Array.isArray(node)) return node.some(containsAggregate2);
   const value = node;
   if (value["type"] === "AGG_REF" || value["type"] === "AGG_ARITH") return true;
   if (value["type"] === "SELECT" || value["type"] === "SCALAR_SUBQUERY") return false;
-  return Object.values(value).some(containsAggregate);
+  return Object.values(value).some(containsAggregate2);
 }
 function isAggregateMaterializedAlias(column) {
   if (!("alias" in column) || column.alias === null) return false;
   if (column.type === "AGGREGATE" || column.type === "ARITH_AGG_COL") return true;
   if (column.type === "STRFUNC_COL" || column.type === "SCALAR_VALUE_COL") {
-    return containsAggregate(column);
+    return containsAggregate2(column);
   }
   return false;
 }
@@ -10893,8 +10908,9 @@ function getLastId(records) {
   return Number.isFinite(id) ? id : 0;
 }
 var FetchAllLimitError = class extends Error {
-  constructor(message) {
+  constructor(message, completeInputWrapped = false) {
     super(message);
+    this.completeInputWrapped = completeInputWrapped;
     this.name = "FetchAllLimitError";
   }
 };
@@ -12405,7 +12421,7 @@ function classifyPreGroupAlias(column) {
     case "STRFUNC_COL":
     case "SCALAR_VALUE_COL":
     case "SCALAR_SUBQUERY_COL":
-      return containsAggregate(column) || containsAggregateColumnNode(column) ? "AGGREGATE_DEPENDENT" : "SAFE";
+      return containsAggregate2(column) || containsAggregateColumnNode(column) ? "AGGREGATE_DEPENDENT" : "SAFE";
   }
 }
 var SUBTABLE_SYSTEM_COLUMNS = ["_pid", "_rid", "_idx"];
@@ -17064,11 +17080,21 @@ async function validateSelectGroupingPlanning(stmt, client, cacheContext, materi
 }
 function completeInputErrorPrefix(reasons) {
   const reasonList = [...reasons].join(", ");
-  const subject = reasons.size === 1 && reasons.has("STATISTICAL_AGGREGATE") ? "\u7D71\u8A08\u96C6\u7D04\u306E\u6B63\u3057\u3044\u7D50\u679C" : reasons.size === 1 && reasons.has("GROUPING_SETS") ? "\u5C0F\u8A08\u30FB\u7DCF\u8A08\u306E\u6B63\u3057\u3044\u7D50\u679C" : reasons.has("GROUPING_SETS") ? "\u30AF\u30A8\u30EA\u306E\u6B63\u3057\u3044\u7D50\u679C" : "ORDER BY\u306E\u6B63\u3057\u3044\u7D50\u679C";
+  const aggregateSubjects = [
+    ["GROUPING_SETS", "\u5C0F\u8A08\u30FB\u7DCF\u8A08\u306E\u6B63\u3057\u3044\u7D50\u679C"],
+    ["STATISTICAL_AGGREGATE", "\u7D71\u8A08\u96C6\u7D04\u306E\u6B63\u3057\u3044\u7D50\u679C"],
+    ["AGGREGATE", "\u96C6\u8A08\u306E\u6B63\u3057\u3044\u7D50\u679C"],
+    ["GROUP_BY", "\u30B0\u30EB\u30FC\u30D7\u96C6\u8A08\u306E\u6B63\u3057\u3044\u7D50\u679C"],
+    ["DISTINCT", "DISTINCT \u306E\u6B63\u3057\u3044\u7D50\u679C"]
+  ];
+  const hasAggregateReason = aggregateSubjects.some(([reason]) => reasons.has(reason));
+  const hasOrderReason = reasons.has("LOCAL_ORDER") || reasons.has("WINDOW_ORDER");
+  const legacySubject = reasons.size === 1 && reasons.has("STATISTICAL_AGGREGATE") ? "\u7D71\u8A08\u96C6\u7D04\u306E\u6B63\u3057\u3044\u7D50\u679C" : reasons.size === 1 && reasons.has("GROUPING_SETS") ? "\u5C0F\u8A08\u30FB\u7DCF\u8A08\u306E\u6B63\u3057\u3044\u7D50\u679C" : reasons.size === 1 && reasons.has("AGGREGATE") ? "\u96C6\u8A08\u306E\u6B63\u3057\u3044\u7D50\u679C" : reasons.size === 1 && reasons.has("GROUP_BY") ? "\u30B0\u30EB\u30FC\u30D7\u96C6\u8A08\u306E\u6B63\u3057\u3044\u7D50\u679C" : reasons.size === 1 && reasons.has("DISTINCT") ? "DISTINCT \u306E\u6B63\u3057\u3044\u7D50\u679C" : reasons.has("GROUPING_SETS") ? "\u30AF\u30A8\u30EA\u306E\u6B63\u3057\u3044\u7D50\u679C" : "ORDER BY\u306E\u6B63\u3057\u3044\u7D50\u679C";
+  const subject = reasons.has("DML") || reasons.has("VALIDATE") ? legacySubject : hasAggregateReason && hasOrderReason ? "\u30AF\u30A8\u30EA\u306E\u6B63\u3057\u3044\u7D50\u679C" : hasAggregateReason ? aggregateSubjects.find(([reason]) => reasons.has(reason))[1] : "ORDER BY\u306E\u6B63\u3057\u3044\u7D50\u679C";
   return `${subject}\u306B\u306F\u5B8C\u5168\u306A\u5019\u88DC\u96C6\u5408\u304C\u5FC5\u8981\u3067\u3059\u3002complete input reason: ${reasonList}\u3002`;
 }
 function buildCompleteInputPolicy(stmt, options, orderPlan) {
-  const reasons = orderPlan?.kind === "CANONICAL_REST_TOP_N" || orderPlan?.kind === "KORDER_NATIVE" || orderPlan?.kind === "KORDER_CURSOR" ? completeInputReasons({ ...stmt, orderBy: [] }) : completeInputReasons(stmt);
+  const reasons = stmt.type === "SELECT" && (orderPlan?.kind === "CANONICAL_REST_TOP_N" || orderPlan?.kind === "KORDER_NATIVE" || orderPlan?.kind === "KORDER_CURSOR") ? completeInputReasons({ ...stmt, orderBy: [] }) : completeInputReasons(stmt);
   const truncateWasDisabled = reasons.size > 0 && options.onLimitReached === "truncate";
   return {
     reasons,
@@ -17077,9 +17103,10 @@ function buildCompleteInputPolicy(stmt, options, orderPlan) {
   };
 }
 function throwCompleteInputError(policy, error) {
-  if (policy.reasons.size > 0 && error instanceof FetchAllLimitError) {
+  if (policy.reasons.size > 0 && error instanceof FetchAllLimitError && !error.completeInputWrapped) {
     throw new FetchAllLimitError(
-      completeInputErrorPrefix(policy.reasons) + (policy.truncateWasDisabled ? "onLimit=truncate\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002" : "") + error.message
+      completeInputErrorPrefix(policy.reasons) + (policy.truncateWasDisabled ? "onLimit=truncate\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002" : "") + error.message,
+      true
     );
   }
   throw error;
@@ -18312,26 +18339,53 @@ async function executeFullScanSelect(stmt, client, options, cacheContext, cteCac
   return { type: "SELECT", rows, columns, rowCount: rows.length, warnings: [...warnings] };
 }
 async function executeUnion(stmt, client, options, cacheContext, captureColumnMeta = false, forLibraryCapture = false) {
-  const [leftResult, rightResult] = await Promise.all([
-    stmt.left.type === "UNION" ? executeUnion(stmt.left, client, options, cacheContext, captureColumnMeta, forLibraryCapture) : executeSelect(stmt.left, client, options, cacheContext, void 0, captureColumnMeta, forLibraryCapture),
-    executeSelect(stmt.right, client, options, cacheContext, void 0, captureColumnMeta, forLibraryCapture)
-  ]);
-  const leftCols = leftResult.columns;
-  const rightCols = rightResult.columns;
-  const remappedRight = rightResult.rows.map((row) => {
-    const mapped = {};
-    leftCols.forEach((col, i) => {
-      mapped[col] = row[rightCols[i] ?? col] ?? "";
+  const completePolicy = buildCompleteInputPolicy(stmt, options, null);
+  return withCompleteInputPolicy(completePolicy, async () => {
+    const effectiveOptions = completePolicy.effectiveOptions;
+    const [leftResult, rightResult] = await Promise.all([
+      stmt.left.type === "UNION" ? executeUnion(
+        stmt.left,
+        client,
+        effectiveOptions,
+        cacheContext,
+        captureColumnMeta,
+        forLibraryCapture
+      ) : executeSelect(
+        stmt.left,
+        client,
+        effectiveOptions,
+        cacheContext,
+        void 0,
+        captureColumnMeta,
+        forLibraryCapture
+      ),
+      executeSelect(
+        stmt.right,
+        client,
+        effectiveOptions,
+        cacheContext,
+        void 0,
+        captureColumnMeta,
+        forLibraryCapture
+      )
+    ]);
+    const leftCols = leftResult.columns;
+    const rightCols = rightResult.columns;
+    const remappedRight = rightResult.rows.map((row) => {
+      const mapped = {};
+      leftCols.forEach((col, i) => {
+        mapped[col] = row[rightCols[i] ?? col] ?? "";
+      });
+      return mapped;
     });
-    return mapped;
+    const combined = [...leftResult.rows, ...remappedRight];
+    const rows = stmt.all ? combined : deduplicateRows(combined, leftCols);
+    const result = { type: "SELECT", rows, columns: leftCols, rowCount: rows.length };
+    if (captureColumnMeta) {
+      materializedMetaBySelectResult.set(result, mergeUnionColumnMeta(leftResult, rightResult));
+    }
+    return result;
   });
-  const combined = [...leftResult.rows, ...remappedRight];
-  const rows = stmt.all ? combined : deduplicateRows(combined, leftCols);
-  const result = { type: "SELECT", rows, columns: leftCols, rowCount: rows.length };
-  if (captureColumnMeta) {
-    materializedMetaBySelectResult.set(result, mergeUnionColumnMeta(leftResult, rightResult));
-  }
-  return result;
 }
 function deduplicateRows(rows, columns) {
   const seen = /* @__PURE__ */ new Set();