@rex0220/kintone-sql-tools 3.38.0 → 3.40.0

package/dist-cli/ksql.js

@@ -1175,13 +1175,38 @@ var Parser = class {
   parseDeclareVariable() {
     this.advance();
     const variable = this.expect("VARIABLE" /* VARIABLE */, "DECLARE \u306E\u5F8C\u306B\u306F\u5909\u6570\u540D\uFF08\u4F8B: @name\uFF09\u304C\u5FC5\u8981\u3067\u3059");
+    const relativeDate = this.peek().kind === "IDENT" /* IDENT */ && this.peek().value.toUpperCase() === "RELATIVE_DATE";
+    if (relativeDate) this.advance();
     this.expect("=" /* EQ */);
+    if (relativeDate) {
+      return {
+        type: "DECLARE_VARIABLE",
+        name: variable.value.slice(1).toLowerCase(),
+        annotation: "RELATIVE_DATE",
+        default: this.parseRelativeDateVariableToken()
+      };
+    }
     const expr = this.parseScalarExpr("DECLARE", false);
     if (expr.type === "SCALAR_SUBQUERY") {
       throw new ParseError("DECLARE \u306E\u65E2\u5B9A\u5024\u306B\u30B9\u30AB\u30E9\u30FC\u30B5\u30D6\u30AF\u30A8\u30EA\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093", this.peek());
     }
     return { type: "DECLARE_VARIABLE", name: variable.value.slice(1).toLowerCase(), default: expr };
   }
+  /** RELATIVE_DATE 宣言専用。WHERE と同じ関数パーサーを使い、日付系14個だけを許可する。 */
+  parseRelativeDateVariableToken() {
+    const tok = this.peek();
+    const contextualFunction = PARSER_CONTEXTUAL_FUNCTION_TOKEN_MAP[tok.kind];
+    if (contextualFunction === "TODAY" || contextualFunction === "NOW") {
+      return this.parseSqlValue();
+    }
+    if (tok.kind === "IDENT" /* IDENT */ && this.peekAt(1).kind === "(" /* LPAREN */ && isRelativeDateFunctionName(tok.value.toUpperCase())) {
+      return this.parseRelativeDateFunction();
+    }
+    throw new ParseError(
+      "RELATIVE_DATE \u306E\u65E2\u5B9A\u5024\u306B\u306F\u30B5\u30DD\u30FC\u30C8\u5BFE\u8C61\u306E\u76F8\u5BFE\u65E5\u4ED8\u95A2\u6570\u30C8\u30FC\u30AF\u30F3\u304C\u5FC5\u8981\u3067\u3059",
+      tok
+    );
+  }
   /** SET / DECLARE RHS 専用。既存式パーサーで構文を読み、フィールド参照を明示的に拒否する。 */
   parseScalarExpr(context, allowScalarSubquery) {
     const tok = this.peek();
@@ -6807,9 +6832,10 @@ function collectRefs(node, tempRefs, appIds) {
     for (const v of Object.values(obj)) collectRefs(v, tempRefs, appIds);
   }
 }
-function collectVariableRefs(node, refs) {
+var RELATIVE_DATE_COMPARISON_OPS = /* @__PURE__ */ new Set(["=", "!=", "<>", ">", "<", ">=", "<="]);
+function collectVariableRefs(node, refs, inWhere = false) {
   if (Array.isArray(node)) {
-    for (const v of node) collectVariableRefs(v, refs);
+    for (const v of node) collectVariableRefs(v, refs, inWhere);
     return;
   }
   if (node !== null && typeof node === "object") {
@@ -6818,13 +6844,27 @@ function collectVariableRefs(node, refs) {
     if ((type === "VARIABLE" || type === "VARIABLE_COL" || type === "VARIABLE_IN_LIST") && typeof obj["name"] === "string") {
       refs.push({
         name: obj["name"],
-        kind: type === "VARIABLE" ? "scalar" : type === "VARIABLE_COL" ? "select-column" : "array-in-list"
+        kind: type === "VARIABLE" ? "scalar" : type === "VARIABLE_COL" ? "select-column" : "array-in-list",
+        relativeDateAllowed: inWhere
       });
       return;
     }
-    for (const v of Object.values(obj)) collectVariableRefs(v, refs);
+    const preservesWhereContext = type === "BINARY" || type === "LOGICAL" || type === "NOT" || type === "GROUP" || type === "NULL_CHECK" || type === "BOOLEAN";
+    for (const [key, value] of Object.entries(obj)) {
+      const directVariable = value !== null && typeof value === "object" && value["type"] === "VARIABLE";
+      const directComparisonRight = inWhere && type === "BINARY" && key === "right" && directVariable && RELATIVE_DATE_COMPARISON_OPS.has(String(obj["op"]));
+      collectVariableRefs(
+        value,
+        refs,
+        key === "where" ? true : type === "BINARY" && key === "right" && directVariable ? directComparisonRight : preservesWhereContext ? inWhere : false
+      );
+    }
   }
 }
+function isRelativeDateDmlUse(stmt) {
+  const target = stmt.type === "EXPLAIN" ? stmt.query : stmt;
+  return isDmlType(target.type) || target.type === "VALIDATE";
+}
 function validateGroupingStaticQueries(node) {
   if (Array.isArray(node)) {
     for (const value of node) validateGroupingStaticQueries(value);
@@ -6919,6 +6959,18 @@ function analyzeBatch(statements) {
           index
         );
       }
+      if (def.relativeDate && isRelativeDateDmlUse(stmt)) {
+        throw new BatchAnalysisError(
+          `ArgumentError: RELATIVE_DATE variable @${use.name} cannot be used in DML or VALIDATE statements.`,
+          index
+        );
+      }
+      if (def.relativeDate && !use.relativeDateAllowed) {
+        throw new BatchAnalysisError(
+          `ArgumentError: RELATIVE_DATE variable @${use.name} can only be used as a WHERE comparison right operand or BETWEEN boundary.`,
+          index
+        );
+      }
       if (!referencedThisStatement.has(use.name)) {
         def.referencedBy.push(index);
         referencedThisStatement.add(use.name);
@@ -6931,6 +6983,7 @@ function analyzeBatch(statements) {
       variableDefs.set(stmt.name, {
         index,
         kind: stmt.type === "SET_VARIABLE" && stmt.expr.type === "ARRAY" ? "array" : "scalar",
+        relativeDate: stmt.type === "DECLARE_VARIABLE" && stmt.annotation === "RELATIVE_DATE",
         referencedBy: []
       });
       variableOrder.push(stmt.name);
@@ -16123,6 +16176,7 @@ async function executeBatch(sql, client, options = {}) {
     throw new Error("UnsupportedError: APPLY mutation requires allowApplyMutation=true");
   }
   const injectedVariables = validateDeclaredBatchVariables(statements, options.variables);
+  const relativeDateVariables = prepareRelativeDateVariables(statements, injectedVariables);
   const batchOptions = { ...options, variables: injectedVariables };
   if (options.continueOnError && analysis.containsDml) {
     throw new Error("ArgumentError: continueOnError is not allowed for batches containing DML.");
@@ -16194,7 +16248,16 @@ async function executeBatch(sql, client, options = {}) {
         );
         const cursorScope = wrapClientWithCursorScope(statementClient);
         const outcome = await runWithDeadline(
-          executeBatchStatement(statements[i], info, cursorScope.client, stmtOptions, cacheContext, tempTables, variables),
+          executeBatchStatement(
+            statements[i],
+            info,
+            cursorScope.client,
+            stmtOptions,
+            cacheContext,
+            tempTables,
+            variables,
+            relativeDateVariables
+          ),
           remaining,
           cursorScope.closeActive
         );
@@ -16239,7 +16302,7 @@ function statementHasApplyMutation(statement) {
   }
   return statement.type === "UPSERT" && statement.validateOnly !== true && Boolean(statement.onInsertApplyBlocks?.length || statement.onUpdateApplyBlocks?.length);
 }
-async function executeBatchStatement(stmt, info, client, options, cacheContext, tempTables, variables) {
+async function executeBatchStatement(stmt, info, client, options, cacheContext, tempTables, variables, relativeDateVariables) {
   if (stmt.type === "SET_VARIABLE") {
     const resolvedStmt2 = resolveBatchVariableReferences(stmt, variables);
     validateStatementStatic(resolvedStmt2);
@@ -16284,6 +16347,13 @@ async function executeBatchStatement(stmt, info, client, options, cacheContext,
     return {};
   }
   if (stmt.type === "DECLARE_VARIABLE") {
+    if (stmt.annotation === "RELATIVE_DATE") {
+      variables.set(stmt.name, {
+        type: "relative-date",
+        value: relativeDateVariables.get(stmt.name)
+      });
+      return {};
+    }
     const injected = options.variables ?? {};
     if (Object.prototype.hasOwnProperty.call(injected, stmt.name)) {
       variables.set(stmt.name, { type: "string", value: injected[stmt.name] });
@@ -16507,6 +16577,32 @@ function parseSqlBatch(sql, enableImport = false) {
   const tokens = new Lexer(sql).tokenize();
   return new Parser(tokens, { import: enableImport }).parseStatements();
 }
+function parseRelativeDateVariableValue(name, value) {
+  try {
+    const statements = parseSqlBatch(`DECLARE @__b111 RELATIVE_DATE = ${value}`);
+    const declaration = statements[0];
+    if (statements.length !== 1 || declaration?.type !== "DECLARE_VARIABLE" || declaration.annotation !== "RELATIVE_DATE") {
+      throw new Error("token was not consumed as one RELATIVE_DATE declaration");
+    }
+    return declaration.default;
+  } catch (error) {
+    const detail = error instanceof Error ? ` ${error.message}` : "";
+    throw new Error(
+      `ArgumentError: RELATIVE_DATE variable @${name} requires one supported relative-date function token.${detail}`
+    );
+  }
+}
+function prepareRelativeDateVariables(statements, injectedVariables) {
+  const prepared = /* @__PURE__ */ new Map();
+  for (const stmt of statements) {
+    if (stmt.type !== "DECLARE_VARIABLE" || stmt.annotation !== "RELATIVE_DATE") continue;
+    prepared.set(
+      stmt.name,
+      Object.prototype.hasOwnProperty.call(injectedVariables, stmt.name) ? parseRelativeDateVariableValue(stmt.name, injectedVariables[stmt.name]) : stmt.default
+    );
+  }
+  return prepared;
+}
 function evaluateScalarExpr(expr) {
   switch (expr.type) {
     case "STRING":
@@ -16543,7 +16639,8 @@ function resolveBatchVariableReferencesInternal(node, variables, numericArithmet
       if (value.type === "array") {
         throw new Error(`ParseError: array variable @${obj["name"]} can only be used as IN @${obj["name"]}.`);
       }
-      if (numericArithmeticOperand && value.type !== "number" && value.placeholder !== true) {
+      if (value.type === "relative-date") return value.value;
+      if (numericArithmeticOperand && value.type !== "number" && !(value.type === "string" && value.placeholder === true)) {
         throw new Error(
           `ArgumentError: variable @${obj["name"]} is not numeric and cannot be used in arithmetic.`
         );
@@ -16554,6 +16651,9 @@ function resolveBatchVariableReferencesInternal(node, variables, numericArithmet
       const value = variables.get(obj["name"]);
       if (value === void 0) throw new Error(`ParseError: variable @${obj["name"]} is not defined in this batch.`);
       if (value.type === "array") throw new Error(`ParseError: array variable @${obj["name"]} cannot be used as a SELECT column.`);
+      if (value.type === "relative-date") {
+        throw new Error(`InternalError: RELATIVE_DATE variable @${obj["name"]} reached a SELECT column.`);
+      }
       const aliasDisplay = typeof obj["aliasDisplay"] === "string" ? { aliasDisplay: obj["aliasDisplay"] } : {};
       return value.type === "number" ? { type: "ARITH_COL", expr: { type: "NUMBER", value: value.value, raw: value.raw ?? String(value.value) }, alias: obj["alias"], ...aliasDisplay } : { type: "LITERAL_COL", value: value.value, alias: obj["alias"], ...aliasDisplay };
     }
@@ -22668,14 +22768,20 @@ function serverFunctionClientEvaluationLabel(leaves) {
     (leaf) => leaf.right.type === "KINTONE_FUNC" && isRelativeDateFunctionName(leaf.right.name)
   ) ? "relative date client evaluations" : "kintone function client evaluations";
 }
+var EXPLAIN_FETCH_PLAN = /* @__PURE__ */ Symbol("ksql.explainFetchPlan");
+function setExplainFetchPlan(result, plan) {
+  result[EXPLAIN_FETCH_PLAN] = plan;
+}
 async function buildBatchExplainPlans(sql, client, injectedVariables, cacheContext = "batch-explain", maxRecords = 1e4, cursorMaxActive = 2, enableImport = false, dmlMaxRows = 100, dmlMaxSubtableRows = DEFAULT_APPLY_MAX_SUBTABLE_ROWS) {
   const invocationCacheContext = createInvocationCacheContext(cacheContext);
   try {
     const statements = parseSqlBatch(sql, enableImport);
     const analysis = analyzeBatch(statements);
-    validateDeclaredBatchVariables(statements, injectedVariables);
+    const normalizedInjectedVariables = validateDeclaredBatchVariables(statements, injectedVariables);
+    const relativeDateVariables = prepareRelativeDateVariables(statements, normalizedInjectedVariables);
     const variables = /* @__PURE__ */ new Map();
     const plans = [];
+    const fetchStatements = [];
     for (let i = 0; i < statements.length; i++) {
       const stmt = statements[i];
       const planStmt = stmt.type === "SET_VARIABLE" ? stmt.expr.type === "SCALAR_SUBQUERY" ? { ...stmt, expr: resolveBatchVariableReferences(stmt.expr, variables) } : stmt : resolveBatchVariableReferences(stmt, variables);
@@ -22688,6 +22794,7 @@ async function buildBatchExplainPlans(sql, client, injectedVariables, cacheConte
         maxRecords,
         relativeDatePlan
       );
+      const fetchCollector = { sources: [] };
       const statementPlan = relativeDatePlan.hasServerOnlyWhereFunction && !relativeDatePlan.allowed ? relativeDateExplainLines(relativeDatePlan) : [
         ...relativeDateExplainLines(relativeDatePlan),
         ...addCursorConcurrency(buildBatchStatementPlan(
@@ -22696,7 +22803,8 @@ async function buildBatchExplainPlans(sql, client, injectedVariables, cacheConte
           whereAnalysis.capabilities,
           whereAnalysis.orderPlans,
           dmlMaxRows,
-          dmlMaxSubtableRows
+          dmlMaxSubtableRows,
+          fetchCollector
         ), cursorMaxActive)
       ];
       const metadataPlan = explainMetadataLines(whereAnalysis);
@@ -22705,22 +22813,36 @@ async function buildBatchExplainPlans(sql, client, injectedVariables, cacheConte
         type: analysis.statements[i].statementType,
         plan: statementPlan.length === 0 ? metadataPlan : [statementPlan[0], ...metadataPlan, ...statementPlan.slice(1)]
       });
+      fetchStatements.push({
+        index: i,
+        fetch: worstExplainFetch(fetchCollector.sources),
+        sources: fetchCollector.sources
+      });
       if (stmt.type === "SET_VARIABLE" || stmt.type === "DECLARE_VARIABLE") {
-        variables.set(stmt.name, stmt.type === "SET_VARIABLE" && stmt.expr.type === "ARRAY" ? { type: "array", elements: stmt.expr.elements.map((element) => ({ type: "string", value: element.value })) } : { type: "string", value: `@${stmt.name}`, placeholder: true });
+        variables.set(stmt.name, stmt.type === "DECLARE_VARIABLE" && stmt.annotation === "RELATIVE_DATE" ? { type: "relative-date", value: relativeDateVariables.get(stmt.name) } : stmt.type === "SET_VARIABLE" && stmt.expr.type === "ARRAY" ? { type: "array", elements: stmt.expr.elements.map((element) => ({ type: "string", value: element.value })) } : { type: "string", value: `@${stmt.name}`, placeholder: true });
       }
     }
-    return { statementCount: statements.length, statements: plans };
+    const result = { statementCount: statements.length, statements: plans };
+    setExplainFetchPlan(result, { statements: fetchStatements });
+    return result;
   } finally {
     releaseMetadataCacheScope(invocationCacheContext);
   }
 }
-function buildBatchStatementPlan(stmt, info, capabilities, orderPlans, dmlMaxRows = 100, dmlMaxSubtableRows = DEFAULT_APPLY_MAX_SUBTABLE_ROWS) {
+function buildBatchStatementPlan(stmt, info, capabilities, orderPlans, dmlMaxRows = 100, dmlMaxSubtableRows = DEFAULT_APPLY_MAX_SUBTABLE_ROWS, collector = { sources: [] }) {
   if (stmt.type === "CREATE_TEMP_TABLE") {
     return [
       `CREATE TEMP TABLE ${stmt.name}`,
       `  scope:         batch\uFF08\u30D0\u30C3\u30C1\u7D42\u4E86\u6642\u306B\u81EA\u52D5\u7834\u68C4\uFF09`,
       `  rows:          \u5B9F\u4F53\u5316\u524D\u306E\u305F\u3081\u4E0D\u660E\uFF08\u65E2\u5B9A\u4E0A\u9650 ${TEMP_TABLE_MAX_ROWS} \u884C\u3001tempTableMaxRows \u3067\u5909\u66F4\u53EF\u3001\u8D85\u904E\u306F\u30A8\u30E9\u30FC\uFF09`,
-      ...buildPlanForBatchQuery(stmt.query, info, capabilities, orderPlans).map((l) => `  ${l}`)
+      ...buildPlanForBatchQuery(
+        stmt.query,
+        info,
+        capabilities,
+        orderPlans,
+        collector,
+        "main"
+      ).map((l) => `  ${l}`)
     ];
   }
   if (stmt.type === "DROP_TEMP_TABLE") {
@@ -22736,7 +22858,13 @@ function buildBatchStatementPlan(stmt, info, capabilities, orderPlans, dmlMaxRow
         `SET @${stmt.name} = (SELECT ...)`,
         "  value:         \u30B5\u30D6\u30AF\u30A8\u30EA\u3092\u5B9F\u884C\u6642\u306B1\u56DE\u8A55\u4FA1\uFF081\u884C1\u5217\u30FB\u30D0\u30C3\u30C1\u5185\u5B9A\u6570\u30FB\u7D50\u679C\u30E1\u30BF\u30C7\u30FC\u30BF\u306B\u306F\u975E\u516C\u958B\uFF09",
         "  subquery:",
-        ...buildPlanForBatchQuery(stmt.expr.query, subInfo, capabilities, orderPlans).map((l) => `  ${l}`)
+        ...buildPlanForBatchQuery(
+          stmt.expr.query,
+          subInfo,
+          capabilities,
+          orderPlans,
+          collector
+        ).map((l) => `  ${l}`)
       ];
     }
     return [
@@ -22745,6 +22873,12 @@ function buildBatchStatementPlan(stmt, info, capabilities, orderPlans, dmlMaxRow
     ];
   }
   if (stmt.type === "DECLARE_VARIABLE") {
+    if (stmt.annotation === "RELATIVE_DATE") {
+      return [
+        `DECLARE @${stmt.name} RELATIVE_DATE = <relative-date token>`,
+        "  value:         \u5916\u90E8\u6CE8\u5165\u304C\u3042\u308C\u3070\u63A1\u7528\u3001\u306A\u3051\u308C\u3070\u65E2\u5B9A\u30C8\u30FC\u30AF\u30F3\u3092\u4F7F\u7528\uFF08\u5024\u306F\u975E\u516C\u958B\uFF09"
+      ];
+    }
     return [
       `DECLARE @${stmt.name} = <default scalar expression>`,
       "  value:         \u5916\u90E8\u6CE8\u5165\u304C\u3042\u308C\u3070\u63A1\u7528\u3001\u306A\u3051\u308C\u3070\u65E2\u5B9A\u5024\u3092\u5B9F\u884C\u6642\u306B1\u56DE\u8A55\u4FA1\uFF08\u5024\u306F\u975E\u516C\u958B\uFF09"
@@ -22752,7 +22886,15 @@ function buildBatchStatementPlan(stmt, info, capabilities, orderPlans, dmlMaxRow
   }
   if (stmt.type === "SHOW_APPS") return ["SHOW APPS\uFF08\u30A2\u30D7\u30EA\u4E00\u89A7\u306E\u53D6\u5F97\uFF09"];
   if (stmt.type === "DESCRIBE") return [`DESCRIBE APP${stmt.appId}\uFF08\u30D5\u30A3\u30FC\u30EB\u30C9\u5B9A\u7FA9\u306E\u53D6\u5F97\uFF09`];
-  if (stmt.type === "EXPLAIN") return buildPlanForBatchQuery(stmt.query, info, capabilities, orderPlans);
+  if (stmt.type === "EXPLAIN") {
+    return buildPlanForBatchQuery(
+      stmt.query,
+      info,
+      capabilities,
+      orderPlans,
+      collector
+    );
+  }
   if (stmt.type === "ASSERT") {
     const lines = [
       `ASSERT ${stmt.text}`,
@@ -22764,14 +22906,20 @@ function buildBatchStatementPlan(stmt, info, capabilities, orderPlans, dmlMaxRow
     subqueries.forEach((sq, i) => {
       lines.push(subqueries.length > 1 ? `  subquery[${i + 1}]:` : "  subquery:");
       const subInfo = hasTempTableRef(sq.query) ? info : { ...info, tempTablesReferenced: [] };
-      lines.push(...buildPlanForBatchQuery(sq.query, subInfo, capabilities, orderPlans).map((l) => `  ${l}`));
+      lines.push(...buildPlanForBatchQuery(
+        sq.query,
+        subInfo,
+        capabilities,
+        orderPlans,
+        collector
+      ).map((l) => `  ${l}`));
     });
     return lines;
   }
   if (stmt.type === "UPDATE" && (stmt.applyBlocks?.length ?? 0) > 0) {
     return buildExplainPlan(stmt, void 0, capabilities, orderPlans, dmlMaxRows, dmlMaxSubtableRows);
   }
-  return buildPlanForBatchQuery(stmt, info, capabilities, orderPlans);
+  return buildPlanForBatchQuery(stmt, info, capabilities, orderPlans, collector);
 }
 function hasTempTableRef(node) {
   if (Array.isArray(node)) return node.some(hasTempTableRef);
@@ -22783,9 +22931,21 @@ function hasTempTableRef(node) {
   }
   return false;
 }
-function buildPlanForBatchQuery(query, info, capabilities, orderPlans) {
+function buildPlanForBatchQuery(query, info, capabilities, orderPlans, collector = { sources: [] }, sourceRole = "main") {
   if (info.tempTablesReferenced.length === 0) {
-    return buildExplainPlan(query, void 0, capabilities, orderPlans);
+    return buildExplainPlan(
+      query,
+      void 0,
+      capabilities,
+      orderPlans,
+      100,
+      DEFAULT_APPLY_MAX_SUBTABLE_ROWS,
+      1e4,
+      void 0,
+      true,
+      collector,
+      sourceRole
+    );
   }
   const lines = [];
   if (query.type === "INSERT_SELECT") {
@@ -22819,8 +22979,9 @@ async function executeExplain(stmt, client, cacheContext, maxRecords, cursorMaxA
     maxRecords,
     sharedPlan
   );
+  const fetchCollector = { sources: [] };
   const relativeLines = relativeDateExplainLines(sharedPlan);
-  const lines = sharedPlan.hasServerOnlyWhereFunction && !sharedPlan.allowed ? [...explainMetadataLines(analysis), ...relativeLines] : [
+  const planLines = sharedPlan.hasServerOnlyWhereFunction && !sharedPlan.allowed ? [...explainMetadataLines(analysis), ...relativeLines] : [
     ...explainMetadataLines(analysis),
     ...relativeLines,
     ...addCursorConcurrency(
@@ -22832,17 +22993,28 @@ async function executeExplain(stmt, client, cacheContext, maxRecords, cursorMaxA
         dmlMaxRows,
         dmlMaxSubtableRows,
         maxRecords,
-        analysis.plainGroupByPlans
+        analysis.plainGroupByPlans,
+        true,
+        fetchCollector
       ),
       cursorMaxActive
     )
   ];
-  return {
+  const lines = addFetchSummary(planLines, fetchCollector.sources);
+  const result = {
     type: "SELECT",
     columns: ["plan"],
     rows: lines.map((line) => ({ plan: line })),
     rowCount: lines.length
   };
+  setExplainFetchPlan(result, {
+    statements: [{
+      index: 0,
+      fetch: worstExplainFetch(fetchCollector.sources),
+      sources: fetchCollector.sources
+    }]
+  });
+  return result;
 }
 function addCursorConcurrency(lines, cursorMaxActive) {
   const result = [];
@@ -22855,9 +23027,28 @@ function addCursorConcurrency(lines, cursorMaxActive) {
   }
   return result;
 }
-function buildExplainPlan(query, label, capabilities, orderPlans, dmlMaxRows = 100, dmlMaxSubtableRows = DEFAULT_APPLY_MAX_SUBTABLE_ROWS, maxRecords = 1e4, plainGroupByPlans) {
-  if (query.type === "UNION") return buildUnionPlan(query, capabilities, orderPlans, plainGroupByPlans);
-  if (query.type === "WITH") return buildWithPlan(query, capabilities, orderPlans, plainGroupByPlans);
+function buildExplainPlan(query, label, capabilities, orderPlans, dmlMaxRows = 100, dmlMaxSubtableRows = DEFAULT_APPLY_MAX_SUBTABLE_ROWS, maxRecords = 1e4, plainGroupByPlans, includeFetchSummary = true, collector, sourceRole = "main") {
+  const fetchCollector = collector ?? { sources: [] };
+  if (query.type === "UNION") {
+    const lines2 = buildUnionPlan(
+      query,
+      capabilities,
+      orderPlans,
+      plainGroupByPlans,
+      fetchCollector
+    );
+    return includeFetchSummary ? addFetchSummary(lines2, fetchCollector.sources) : lines2;
+  }
+  if (query.type === "WITH") {
+    const lines2 = buildWithPlan(
+      query,
+      capabilities,
+      orderPlans,
+      plainGroupByPlans,
+      fetchCollector
+    );
+    return includeFetchSummary ? addFetchSummary(lines2, fetchCollector.sources) : lines2;
+  }
   if (query.type === "INSERT") return buildInsertPlan(query, label, dmlMaxRows, dmlMaxSubtableRows);
   if (query.type === "INSERT_SELECT") return buildInsertSelectPlan(query, label, capabilities, orderPlans, plainGroupByPlans);
   if (query.type === "UPSERT") return buildUpsertPlan(query, label, dmlMaxRows, dmlMaxSubtableRows);
@@ -22947,7 +23138,62 @@ function buildExplainPlan(query, label, capabilities, orderPlans, dmlMaxRows = 1
       `  duplicateKey:  preflight before lookup/write (requires load)`
     ];
   }
-  return buildSelectPlan(query, label, capabilities, orderPlans, plainGroupByPlans);
+  const lines = buildSelectPlan(
+    query,
+    label,
+    capabilities,
+    orderPlans,
+    plainGroupByPlans,
+    true,
+    true,
+    fetchCollector,
+    sourceRole
+  );
+  return includeFetchSummary ? addFetchSummary(lines, fetchCollector.sources) : lines;
+}
+var EXPLAIN_FETCH_VALUE_RANK = {
+  none: 0,
+  exact: 1,
+  prefiltered: 2,
+  all: 3
+};
+function worstExplainFetch(sources) {
+  return sources.reduce(
+    (worst, source) => EXPLAIN_FETCH_VALUE_RANK[worst] >= EXPLAIN_FETCH_VALUE_RANK[source.fetch] ? worst : source.fetch,
+    "none"
+  );
+}
+function addFetchSummary(lines, sources) {
+  const detailLines = lines.filter((line) => !line.startsWith("fetch summary:"));
+  if (sources.length === 0) return detailLines;
+  return [`fetch summary: ${worstExplainFetch(sources).toUpperCase()}`, ...detailLines];
+}
+function pushedQueryLimit(query) {
+  const match = /(?:^|\s)limit\s+(\d+)(?:\s|$)/i.exec(query);
+  return match ? Number(match[1]) : null;
+}
+function createExplainFetchSource(collector, app, alias, role, scope, query, pending = false) {
+  const source = {
+    app,
+    alias,
+    role,
+    fetch: scope.toLowerCase(),
+    pending,
+    kintoneQuery: query === "(\u5168\u4EF6\u53D6\u5F97)" || query === "(\u306A\u3057)" || query === "" ? null : query,
+    limit: pushedQueryLimit(query)
+  };
+  collector.sources.push(source);
+  return source;
+}
+function formatFetchScope(source) {
+  return [
+    source.fetch.toUpperCase(),
+    ...source.limit === null ? [] : [`(limit ${source.limit})`],
+    ...source.pending ? ["(\u672A\u78BA\u5B9A)"] : []
+  ].join(" ");
+}
+function renderFetchScope(source) {
+  return `  fetch:         ${formatFetchScope(source)}`;
 }
 function buildValidatePlan(stmt, label) {
   const info = validateExplainInfo.get(stmt);
@@ -22974,7 +23220,7 @@ function buildValidatePlan(stmt, label) {
   lines.push("  records/mutation API during EXPLAIN: none; violation count unavailable");
   return lines;
 }
-function buildSelectPlan(stmt, label, capabilities, orderPlans, plainGroupByPlans, allowTotalCountPlan = true) {
+function buildSelectPlan(stmt, label, capabilities, orderPlans, plainGroupByPlans, allowTotalCountPlan = true, emitFetch = true, collector = { sources: [] }, sourceRole = "main") {
   const whereCapability = capabilities?.get(stmt) ?? (capabilities ? [...capabilities].find(([candidate]) => JSON.stringify(candidate) === JSON.stringify(stmt))?.[1] : void 0);
   const orderPlan = orderPlans?.get(stmt) ?? (orderPlans ? [...orderPlans].find(([candidate]) => JSON.stringify(candidate) === JSON.stringify(stmt))?.[1] : void 0);
   const plainGroupByPlan = plainGroupByPlans?.get(stmt) ?? (plainGroupByPlans ? [...plainGroupByPlans].find(([candidate]) => JSON.stringify(candidate) === JSON.stringify(stmt))?.[1] : void 0);
@@ -23032,6 +23278,17 @@ function buildSelectPlan(stmt, label, capabilities, orderPlans, plainGroupByPlan
     lines.push(
       `  kintone query: ${baseQuery}${baseQuery ? " " : ""}limit 1`
     );
+    if (emitFetch) {
+      const source = createExplainFetchSource(
+        collector,
+        stmt.from.appId,
+        stmt.from.alias,
+        sourceRole,
+        "NONE",
+        `${baseQuery}${baseQuery ? " " : ""}limit 1`
+      );
+      lines.push(renderFetchScope(source));
+    }
     lines.push("  fields:        $id");
     lines.push("  fetch API:     GET records.json (totalCount=true)");
     lines.push("  REST execution: single GET");
@@ -23078,6 +23335,17 @@ function buildSelectPlan(stmt, label, capabilities, orderPlans, plainGroupByPlan
     lines.push(`  app:           APP${stmt.from.appId} (${stmt.from.appId})`);
     const displayedQuery = orderPlan?.kind === "KORDER_CURSOR" ? buildKorderCursorQuery(stmt) : params.query;
     lines.push(`  kintone query: ${displayedQuery || "(\u306A\u3057)"}`);
+    if (emitFetch && stmt.from.cteName === null) {
+      const fetchScope = displayedQuery ? "EXACT" : "ALL";
+      lines.push(renderFetchScope(createExplainFetchSource(
+        collector,
+        stmt.from.appId,
+        stmt.from.alias,
+        sourceRole,
+        fetchScope,
+        displayedQuery
+      )));
+    }
     lines.push(`  fields:        ${params.fields.length === 0 ? "(\u5168\u30D5\u30A3\u30FC\u30EB\u30C9)" : params.fields.join(", ")}`);
   } else {
     const runtimeJoinPlan = explainJoinPushdownPlans.get(stmt);
@@ -23127,6 +23395,19 @@ function buildSelectPlan(stmt, label, capabilities, orderPlans, plainGroupByPlan
     const mainFunctionConsumption = runtimeJoinPlan?.joinPlan.serverFunctionConsumptions.find(
       (consumption) => consumption.targetAlias === stmt.from.alias
     );
+    if (emitFetch && stmt.from.cteName === null) {
+      const mainPending = !runtimeJoinPlan && mainCandidate !== null;
+      const mainFetchScope = mainQ === "(\u5168\u4EF6\u53D6\u5F97)" ? "ALL" : mainPending ? "PREFILTERED" : mainJoinItem?.relation === "exact" || mainFunctionConsumption || exactOriginalWhere !== "" ? "EXACT" : "PREFILTERED";
+      lines.push(renderFetchScope(createExplainFetchSource(
+        collector,
+        stmt.from.appId,
+        stmt.from.alias,
+        sourceRole,
+        mainFetchScope,
+        mainQ,
+        mainPending
+      )));
+    }
     if (mainJoinItem || mainFunctionConsumption) {
       lines.push(`  pushdown applied: ${mainBoundQuery}`);
       lines.push(`  relation: ${mainJoinItem?.relation ?? "exact"}`);
@@ -23150,6 +23431,19 @@ function buildSelectPlan(stmt, label, capabilities, orderPlans, plainGroupByPlan
       const joinFunctionConsumption = runtimeJoinPlan?.joinPlan.serverFunctionConsumptions.find(
         (consumption) => consumption.targetAlias === join2.table.alias
       );
+      if (emitFetch && join2.table.cteName === null) {
+        const joinPending = !runtimeJoinPlan && joinCandidate !== null;
+        const joinFetchScope = joinQ === "(\u5168\u4EF6\u53D6\u5F97)" ? "ALL" : joinPending ? "PREFILTERED" : joinPlanItem?.relation === "exact" || joinFunctionConsumption ? "EXACT" : "PREFILTERED";
+        lines.push(renderFetchScope(createExplainFetchSource(
+          collector,
+          join2.table.appId,
+          join2.table.alias,
+          "join",
+          joinFetchScope,
+          joinQ,
+          joinPending
+        )));
+      }
       if (joinPlanItem || joinFunctionConsumption) {
         lines.push(`  pushdown applied: ${joinBoundQuery}`);
         lines.push(`  relation: ${joinPlanItem?.relation ?? "exact"}`);
@@ -23159,10 +23453,16 @@ function buildSelectPlan(stmt, label, capabilities, orderPlans, plainGroupByPlan
       lines.push(`  fields:        ${joinFields.length === 0 ? "(\u5168\u30D5\u30A3\u30FC\u30EB\u30C9)" : joinFields.join(", ")}`);
     }
   }
-  lines.push(...collectSubqueryPlans(stmt, capabilities, orderPlans, plainGroupByPlans));
+  lines.push(...collectSubqueryPlans(
+    stmt,
+    capabilities,
+    orderPlans,
+    plainGroupByPlans,
+    collector
+  ));
   return lines;
 }
-function buildUnionPlan(stmt, capabilities, orderPlans, plainGroupByPlans) {
+function buildUnionPlan(stmt, capabilities, orderPlans, plainGroupByPlans, collector = { sources: [] }) {
   const selects = [];
   const collect = (u) => {
     if (u.type === "SELECT") {
@@ -23176,15 +23476,35 @@ function buildUnionPlan(stmt, capabilities, orderPlans, plainGroupByPlans) {
   const lines = [];
   selects.forEach((sel, i) => {
     if (i > 0) lines.push("");
-    lines.push(...buildSelectPlan(sel, `[union:${i + 1}]`, capabilities, orderPlans, plainGroupByPlans, true));
+    lines.push(...buildSelectPlan(
+      sel,
+      `[union:${i + 1}]`,
+      capabilities,
+      orderPlans,
+      plainGroupByPlans,
+      true,
+      true,
+      collector,
+      "union"
+    ));
   });
   return lines;
 }
-function buildWithPlan(stmt, capabilities, orderPlans, plainGroupByPlans) {
+function buildWithPlan(stmt, capabilities, orderPlans, plainGroupByPlans, collector = { sources: [] }) {
   const lines = [];
   for (const cte of stmt.ctes) {
     if (cte.query.type === "SELECT") {
-      lines.push(...buildSelectPlan(cte.query, `[cte: ${cte.name}]`, capabilities, orderPlans, plainGroupByPlans, false));
+      lines.push(...buildSelectPlan(
+        cte.query,
+        `[cte: ${cte.name}]`,
+        capabilities,
+        orderPlans,
+        plainGroupByPlans,
+        false,
+        true,
+        collector,
+        "cte"
+      ));
       lines.push("");
     }
   }
@@ -23197,13 +23517,25 @@ function buildWithPlan(stmt, capabilities, orderPlans, plainGroupByPlans) {
       100,
       DEFAULT_APPLY_MAX_SUBTABLE_ROWS,
       1e4,
-      plainGroupByPlans
+      plainGroupByPlans,
+      false,
+      collector
     ));
   }
   if (canInlineSingleCte(stmt)) {
     lines.push("");
     const inlined = buildInlinedQuery(stmt);
-    lines.push(...buildSelectPlan(inlined, "[effective: inlined CTE]", capabilities, orderPlans, plainGroupByPlans, false));
+    lines.push(...buildSelectPlan(
+      inlined,
+      "[effective: inlined CTE]",
+      capabilities,
+      orderPlans,
+      plainGroupByPlans,
+      false,
+      true,
+      collector,
+      "cte"
+    ));
   }
   return lines;
 }
@@ -23236,7 +23568,7 @@ function collectFullScanReasons(stmt) {
     r.push("ORDER BY \u306B\u5F0F");
   return r;
 }
-function collectSubqueryPlans(stmt, capabilities, orderPlans, plainGroupByPlans) {
+function collectSubqueryPlans(stmt, capabilities, orderPlans, plainGroupByPlans, collector = { sources: [] }) {
   const lines = [];
   let idx = 1;
   const visitWhere = (w) => {
@@ -23245,16 +23577,16 @@ function collectSubqueryPlans(stmt, capabilities, orderPlans, plainGroupByPlans)
       case "BINARY":
         if (w.right.type === "SCALAR_SUBQUERY") {
           lines.push("");
-          lines.push(...buildSelectPlan(w.right.query, `[subquery:${idx++}]`, capabilities, orderPlans, plainGroupByPlans, false));
+          lines.push(...buildSelectPlan(w.right.query, `[subquery:${idx++}]`, capabilities, orderPlans, plainGroupByPlans, false, true, collector, "subquery"));
         }
         if (w.right.type === "SUBQUERY_IN_LIST") {
           lines.push("");
-          lines.push(...buildSelectPlan(w.right.query, `[subquery:${idx++}]`, capabilities, orderPlans, plainGroupByPlans, false));
+          lines.push(...buildSelectPlan(w.right.query, `[subquery:${idx++}]`, capabilities, orderPlans, plainGroupByPlans, false, true, collector, "subquery"));
         }
         break;
       case "EXISTS":
         lines.push("");
-        lines.push(...buildSelectPlan(w.query, `[subquery:${idx++}]`, capabilities, orderPlans, plainGroupByPlans, false));
+        lines.push(...buildSelectPlan(w.query, `[subquery:${idx++}]`, capabilities, orderPlans, plainGroupByPlans, false, true, collector, "subquery"));
         break;
       case "LOGICAL":
         visitWhere(w.left);
@@ -23274,7 +23606,7 @@ function collectSubqueryPlans(stmt, capabilities, orderPlans, plainGroupByPlans)
   for (const col of stmt.columns) {
     if (col.type === "SCALAR_SUBQUERY_COL") {
       lines.push("");
-      lines.push(...buildSelectPlan(col.query, `[subquery:${idx++}]`, capabilities, orderPlans, plainGroupByPlans, false));
+      lines.push(...buildSelectPlan(col.query, `[subquery:${idx++}]`, capabilities, orderPlans, plainGroupByPlans, false, true, collector, "subquery"));
     }
   }
   if (stmt.having) visitWhere(stmt.having);
@@ -23300,7 +23632,15 @@ function buildInsertSelectPlan(stmt, label, capabilities, orderPlans, plainGroup
   lines.push(`  fields:  ${stmt.fields.join(", ")}`);
   lines.push(`  api:     POST /k/v1/records.json\uFF08\u4EF6\u6570\u306F SELECT \u7D50\u679C\u306B\u4F9D\u5B58\u3001100 \u4EF6\u3054\u3068\u306B\u30D0\u30C3\u30C1\uFF09`);
   lines.push("");
-  lines.push(...buildSelectPlan(stmt.select, "[source SELECT]", capabilities, orderPlans, plainGroupByPlans, false));
+  lines.push(...buildSelectPlan(
+    stmt.select,
+    "[source SELECT]",
+    capabilities,
+    orderPlans,
+    plainGroupByPlans,
+    false,
+    false
+  ));
   return lines;
 }
 function buildUpdatePlan(stmt, label, capabilities, orderPlans, dmlMaxRows = 100, dmlMaxSubtableRows = DEFAULT_APPLY_MAX_SUBTABLE_ROWS, maxRecords = 1e4) {
@@ -23347,7 +23687,15 @@ function buildUpdatePlan(stmt, label, capabilities, orderPlans, dmlMaxRows = 100
   for (const a of stmt.assignments) {
     if (a.value.type === "SCALAR_SUBQUERY") {
       lines.push("");
-      lines.push(...buildSelectPlan(a.value.query, `[subquery: ${a.field}]`, capabilities, orderPlans, void 0, false));
+      lines.push(...buildSelectPlan(
+        a.value.query,
+        `[subquery: ${a.field}]`,
+        capabilities,
+        orderPlans,
+        void 0,
+        false,
+        false
+      ));
     }
   }
   return lines;
@@ -23464,7 +23812,15 @@ function buildUpsertSelectPlan(stmt, label, capabilities, orderPlans, plainGroup
     `  api:        GET /k/v1/records.json\uFF08\u91CD\u8907\u5224\u5B9A\uFF09\u2192 POST \u307E\u305F\u306F PUT /k/v1/records.json\uFF08100 \u4EF6\u3054\u3068\u306B\u30D0\u30C3\u30C1\uFF09`,
     ``
   ];
-  lines.push(...buildSelectPlan(stmt.select, "[source SELECT]", capabilities, orderPlans, plainGroupByPlans, false));
+  lines.push(...buildSelectPlan(
+    stmt.select,
+    "[source SELECT]",
+    capabilities,
+    orderPlans,
+    plainGroupByPlans,
+    false,
+    false
+  ));
   return lines;
 }
 function buildReorderPlan(stmt, label) {
@@ -25374,13 +25730,17 @@ function restoreSqlDiagnosticValue(value, bindings, options = {}) {
         return `${dmlTarget[1]}${target}`;
       }
     }
-    let restored = value;
-    for (const binding of bindings.values()) {
-      const internal = `APP${binding.mappedAppId}`;
+    if (bindings.size === 0) return value;
+    const mappedIds = [...bindings.keys()].sort((a, b) => String(b).length - String(a).length);
+    const internalApp = new RegExp(
+      `APP(${mappedIds.join("|")})(?!\\d)(\\s+AS\\s+[^\\s()]+)?(?:\\s+\\(\\1\\))?`,
+      "g"
+    );
+    return value.replace(internalApp, (_match, mappedIdText, alias) => {
+      const binding = bindings.get(Number(mappedIdText));
       const display = binding.source === "logical" ? displayMode === "physical" ? `LAPP_${binding.logicalName} -> APP${binding.appId}` : `LAPP_${binding.logicalName}@${binding.profile}` : displayMode === "physical" ? `APP${binding.appId}` : `APP${binding.appId}@${binding.profile}`;
-      restored = restored.split(`${internal} (${binding.mappedAppId})`).join(display).split(internal).join(display);
-    }
-    return restored;
+      return `${display}${alias ?? ""}`;
+    });
   }
   if (Array.isArray(value)) {
     return value.map((item) => restoreSqlDiagnosticValue(item, bindings, options));