@rex0220/kintone-sql-tools 3.35.0 → 3.37.0

package/dist-cli/ksql.js

@@ -18252,18 +18252,20 @@ function rememberSelectWhereCapability(stmt, capability) {
 }
 function isCountStarTotalCountEligible(stmt, whereCapability) {
   if (whereCapability.capability !== "EXACT_PUSHDOWN") return false;
-  if (stmt.columns.length !== 1) return false;
-  const column = stmt.columns[0];
-  if (column?.type !== "AGGREGATE" || column.func !== "COUNT" || column.distinct || column.arg.type !== "WILDCARD") {
-    return false;
-  }
+  const countColumns = stmt.columns.filter(
+    (column) => column.type === "AGGREGATE" && column.func === "COUNT" && !column.distinct && column.arg.type === "WILDCARD"
+  );
+  if (countColumns.length !== 1) return false;
+  if (stmt.columns.some(
+    (column) => column !== countColumns[0] && column.type !== "LITERAL_COL"
+  )) return false;
   return !stmt.distinct && normalizeGroupingSpec(stmt).type === "NONE" && stmt.having === null && stmt.joins.length === 0 && stmt.from.cteName === null && !stmt.from.subtableCode && stmt.limit === null && stmt.offset === null;
 }
 function isValidTotalCount(value) {
   return typeof value === "string" && /^(?:0|[1-9]\d*)$/.test(value);
 }
 async function tryCountStarWithTotalCount(stmt, client) {
-  const countColumn = stmt.columns[0];
+  const countColumn = stmt.columns.find((column) => column.type === "AGGREGATE");
   if (countColumn?.type !== "AGGREGATE") return null;
   const baseQuery = stmt.where === null ? "" : whereToKintone(stmt.where);
   const response = await client.getRecords({
@@ -18274,11 +18276,15 @@ async function tryCountStarWithTotalCount(stmt, client) {
   });
   if (response.searchAborted) throw new SearchAbortedError();
   if (!isValidTotalCount(response.totalCount)) return null;
-  const column = countColumn.alias ?? "COUNT(*)";
+  const countKey = countColumn.alias ?? "COUNT(*)";
+  const projected = project(
+    [{ [countKey]: response.totalCount }],
+    stmt.columns
+  );
   return {
     type: "SELECT",
-    rows: [{ [column]: response.totalCount }],
-    columns: [column],
+    rows: projected.rows,
+    columns: projected.columns,
     rowCount: 1,
     warnings: []
   };
@@ -18454,7 +18460,7 @@ async function executeUnion(stmt, client, options, cacheContext, captureColumnMe
         captureColumnMeta,
         forLibraryCapture
       ) : executeSelect(
-        stmt.left,
+        markCountTotalCountRoot(stmt.left),
         client,
         effectiveOptions,
         cacheContext,
@@ -18463,7 +18469,7 @@ async function executeUnion(stmt, client, options, cacheContext, captureColumnMe
         forLibraryCapture
       ),
       executeSelect(
-        stmt.right,
+        markCountTotalCountRoot(stmt.right),
         client,
         effectiveOptions,
         cacheContext,
@@ -23140,7 +23146,7 @@ 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, false));
+    lines.push(...buildSelectPlan(sel, `[union:${i + 1}]`, capabilities, orderPlans, plainGroupByPlans, true));
   });
   return lines;
 }
@@ -23807,8 +23813,256 @@ function buildBatchEnvelope(batch, options = {}) {
   };
 }
 
+// src/core/logicalApps.ts
+var LOGICAL_APP_NAME_MAX_UTF16_UNITS = 64;
+var LOGICAL_APP_ASCII_LETTERS = "A-Za-z";
+var LOGICAL_APP_JAPANESE_RANGES = "\\u3040-\\u30FF\\u3400-\\u9FFF\\uF900-\\uFAFF\\uFF01-\\uFF60";
+var LOGICAL_APP_START_CLASS = `${LOGICAL_APP_ASCII_LETTERS}${LOGICAL_APP_JAPANESE_RANGES}`;
+var LOGICAL_APP_CONTINUE_CLASS = `${LOGICAL_APP_START_CLASS}0-9_`;
+var LOGICAL_APP_NAME_START_RE = new RegExp(`^[${LOGICAL_APP_START_CLASS}]$`, "u");
+var LOGICAL_APP_NAME_CONTINUE_RE = new RegExp(`^[${LOGICAL_APP_CONTINUE_CLASS}]$`, "u");
+var LOGICAL_APP_NAME_RE = new RegExp(
+  `^[${LOGICAL_APP_START_CLASS}][${LOGICAL_APP_CONTINUE_CLASS}]{0,63}$`,
+  "u"
+);
+function isLogicalAppNameStart(ch) {
+  return LOGICAL_APP_NAME_START_RE.test(ch);
+}
+function isLogicalAppNameContinue(ch) {
+  return LOGICAL_APP_NAME_CONTINUE_RE.test(ch);
+}
+function canonicalizeLogicalAppName(name) {
+  const canonical = name.normalize("NFC").toUpperCase();
+  if (!LOGICAL_APP_NAME_RE.test(canonical)) {
+    throw new Error(
+      `ArgumentError: logical app name "${name}" is invalid; expected 1-${LOGICAL_APP_NAME_MAX_UTF16_UNITS} UTF-16 units starting with an ASCII letter or supported Japanese character.`
+    );
+  }
+  return canonical;
+}
+function isSqlIdentContinue(ch) {
+  if (!ch) return false;
+  const cp = ch.codePointAt(0);
+  return cp >= 65 && cp <= 90 || cp >= 97 && cp <= 122 || cp >= 48 && cp <= 57 || cp === 95 || cp === 36 || cp >= 12352 && cp <= 12543 || cp >= 13312 && cp <= 40959 || cp >= 63744 && cp <= 64255 || cp >= 65281 && cp <= 65376;
+}
+function isProfileNameChar(ch) {
+  if (!ch) return false;
+  const cp = ch.codePointAt(0);
+  return cp >= 65 && cp <= 90 || cp >= 97 && cp <= 122 || cp >= 48 && cp <= 57 || ch === "_" || ch === "-" || ch === "." || ch === "$";
+}
+function tryParseAppProfileToken(sql, start) {
+  const prev = start > 0 ? sql[start - 1] : "";
+  if (isSqlIdentContinue(prev)) return null;
+  let source;
+  let appId;
+  let logicalName;
+  let referenceValueStart;
+  let referenceValueEnd;
+  let i;
+  if (sql.slice(start, start + 5).toUpperCase() === "LAPP_") {
+    source = "logical";
+    i = start + 5;
+    referenceValueStart = i;
+    if (!isLogicalAppNameStart(sql[i] ?? "")) return null;
+    i++;
+    while (i < sql.length && isLogicalAppNameContinue(sql[i])) i++;
+    referenceValueEnd = i;
+    try {
+      logicalName = canonicalizeLogicalAppName(sql.slice(referenceValueStart, referenceValueEnd));
+    } catch {
+      return null;
+    }
+  } else if (sql.slice(start, start + 3).toUpperCase() === "APP") {
+    source = "physical";
+    i = start + 3;
+    referenceValueStart = i;
+    while (i < sql.length && /[0-9]/.test(sql[i])) i++;
+    referenceValueEnd = i;
+    if (referenceValueEnd === referenceValueStart) return null;
+    appId = Number(sql.slice(referenceValueStart, referenceValueEnd));
+  } else {
+    return null;
+  }
+  if (sql[i] === "$") {
+    i++;
+    const subStart = i;
+    while (i < sql.length && isSqlIdentContinue(sql[i])) i++;
+    if (i === subStart) return null;
+  }
+  const appEnd = i;
+  let profile = null;
+  if (sql[i] === "@") {
+    i++;
+    const pStart = i;
+    while (i < sql.length && isProfileNameChar(sql[i])) i++;
+    if (i === pStart) return null;
+    profile = sql.slice(pStart, i);
+  }
+  const next = i < sql.length ? sql[i] : "";
+  if (isSqlIdentContinue(next)) return null;
+  const common = {
+    profile,
+    start,
+    referenceValueStart,
+    referenceValueEnd,
+    appEnd,
+    fullEnd: i
+  };
+  return source === "physical" ? { ...common, source, appId } : { ...common, source, logicalName };
+}
+function collectAppProfileTokens(sql) {
+  const tokens = [];
+  let i = 0;
+  while (i < sql.length) {
+    const ch = sql[i];
+    if (ch === "'") {
+      i++;
+      while (i < sql.length) {
+        if (sql[i] === "'") {
+          i++;
+          if (i < sql.length && sql[i] === "'") {
+            i++;
+            continue;
+          }
+          break;
+        }
+        i++;
+      }
+      continue;
+    }
+    if (ch === "`") {
+      i++;
+      while (i < sql.length && sql[i] !== "`") i++;
+      if (i < sql.length) i++;
+      continue;
+    }
+    if (ch === "-" && sql[i + 1] === "-") {
+      i += 2;
+      while (i < sql.length && sql[i] !== "\n") i++;
+      continue;
+    }
+    if (ch === "/" && sql[i + 1] === "*") {
+      i += 2;
+      while (i < sql.length) {
+        if (sql[i] === "*" && sql[i + 1] === "/") {
+          i += 2;
+          break;
+        }
+        i++;
+      }
+      continue;
+    }
+    const parsed = tryParseAppProfileToken(sql, i);
+    if (!parsed) {
+      i++;
+      continue;
+    }
+    tokens.push(parsed);
+    i = parsed.fullEnd;
+  }
+  return tokens;
+}
+function nextVirtualAppId(used) {
+  let id = 9e8;
+  while (used.has(id)) id++;
+  used.add(id);
+  return id;
+}
+function normalizeSqlAppProfiles(sql, defaultProfile = "dev", resolutionContext) {
+  const tokens = collectAppProfileTokens(sql);
+  const hasProfileSyntax = tokens.some((t) => t.profile !== null);
+  const profilesByApp = /* @__PURE__ */ new Map();
+  const normalizedProfile = (profile) => profile ?? defaultProfile;
+  for (const t of tokens) {
+    if (t.source !== "physical") continue;
+    const p = normalizedProfile(t.profile);
+    let set = profilesByApp.get(t.appId);
+    if (!set) {
+      set = /* @__PURE__ */ new Set();
+      profilesByApp.set(t.appId, set);
+    }
+    set.add(p.toLowerCase());
+  }
+  const usedAppIds = new Set(tokens.filter((t) => t.source === "physical").map((t) => t.appId));
+  const resolvedLogicalApps = /* @__PURE__ */ new Map();
+  for (const t of tokens) {
+    if (t.source !== "logical") continue;
+    const pLower = normalizedProfile(t.profile).toLowerCase();
+    const logicalKey = `logical:${t.logicalName}@${pLower}`;
+    if (resolvedLogicalApps.has(logicalKey)) continue;
+    if (!resolutionContext) {
+      throw new Error(`ArgumentError: logical app LAPP_${t.logicalName}@${pLower} requires logicalApps configuration.`);
+    }
+    const resolvedAppId = resolutionContext.resolveLogicalApp(t.logicalName, pLower);
+    resolvedLogicalApps.set(logicalKey, resolvedAppId);
+    usedAppIds.add(resolvedAppId);
+  }
+  const pairToMapped = /* @__PURE__ */ new Map();
+  const appBindingByMappedApp = /* @__PURE__ */ new Map();
+  for (const [appId, pSet] of profilesByApp.entries()) {
+    const profiles = [...pSet].sort();
+    if (profiles.length <= 1) continue;
+    for (const pLower of profiles) {
+      const mapped = nextVirtualAppId(usedAppIds);
+      pairToMapped.set(`physical:${appId}@${pLower}`, mapped);
+      appBindingByMappedApp.set(mapped, {
+        source: "physical",
+        mappedAppId: mapped,
+        appId,
+        profile: pLower
+      });
+    }
+  }
+  const out = [];
+  const rewriteSegments = [];
+  let normalizedLength = 0;
+  let cursor = 0;
+  const appendSegment = (text, sourceStart, sourceEnd, bindingMappedAppId) => {
+    if (!text && sourceStart === sourceEnd) return;
+    const normalizedStart = normalizedLength;
+    out.push(text);
+    normalizedLength += text.length;
+    rewriteSegments.push({
+      normalizedStart,
+      normalizedEnd: normalizedLength,
+      sourceStart,
+      sourceEnd,
+      ...bindingMappedAppId === void 0 ? {} : { bindingMappedAppId }
+    });
+  };
+  for (const t of tokens) {
+    const pLower = normalizedProfile(t.profile).toLowerCase();
+    let binding;
+    if (t.source === "physical") {
+      const mapped = pairToMapped.get(`physical:${t.appId}@${pLower}`) ?? t.appId;
+      binding = { source: "physical", mappedAppId: mapped, appId: t.appId, profile: pLower };
+    } else {
+      const logicalKey = `logical:${t.logicalName}@${pLower}`;
+      let mapped = pairToMapped.get(logicalKey);
+      if (mapped === void 0) {
+        mapped = nextVirtualAppId(usedAppIds);
+        pairToMapped.set(logicalKey, mapped);
+      }
+      binding = {
+        source: "logical",
+        logicalName: t.logicalName,
+        mappedAppId: mapped,
+        appId: resolvedLogicalApps.get(logicalKey),
+        profile: pLower
+      };
+    }
+    appBindingByMappedApp.set(binding.mappedAppId, binding);
+    appendSegment(sql.slice(cursor, t.start), cursor, t.start);
+    const subtableSuffix = sql.slice(t.referenceValueEnd, t.appEnd);
+    const normalizedReference = t.source === "physical" ? `${sql.slice(t.start, t.referenceValueStart)}${binding.mappedAppId}${subtableSuffix}` : `APP${binding.mappedAppId}${subtableSuffix}`;
+    appendSegment(normalizedReference, t.start, t.fullEnd, binding.mappedAppId);
+    cursor = t.fullEnd;
+  }
+  appendSegment(sql.slice(cursor), cursor, sql.length);
+  return { normalizedSql: out.join(""), hasProfileSyntax, appBindingByMappedApp, rewriteSegments };
+}
+
 // src/node/config.ts
-var LOGICAL_APP_NAME_RE = /^[A-Za-z][A-Za-z0-9_]{0,63}$/;
 var PHYSICAL_APP_KEY_RE = /^APP\d+$/i;
 var NUMERIC_APP_KEY_RE = /^\d+$/;
 var LOGICAL_SQL_KEY_RE = /^LAPP_/i;
@@ -23828,12 +24082,14 @@ function normalizeLogicalApps(profileName, value) {
         `logical app key "${rawName}" in profile "${profileName}" must be a logical name without APP, numeric, or LAPP_ syntax.`
       );
     }
-    if (!LOGICAL_APP_NAME_RE.test(rawName)) {
+    let logicalName;
+    try {
+      logicalName = canonicalizeLogicalAppName(rawName);
+    } catch {
       throw argumentError(
-        `logical app key "${rawName}" in profile "${profileName}" must match [A-Z][A-Z0-9_]{0,63}.`
+        `logical app key "${rawName}" in profile "${profileName}" must match the logical app name rules.`
       );
     }
-    const logicalName = rawName.toUpperCase();
     if (Object.prototype.hasOwnProperty.call(normalized, logicalName)) {
       throw argumentError(
         `logical app name "${logicalName}" is duplicated after case normalization in profile "${profileName}".`
@@ -23906,11 +24162,13 @@ function createAppResolutionContext(config, defaultProfile) {
   }
   return {
     resolveLogicalApp(name, profile) {
-      if (!LOGICAL_APP_NAME_RE.test(name)) {
-        throw argumentError(`logical app name "${name}" must match [A-Z][A-Z0-9_]{0,63}.`);
-      }
       const profileName = profile || defaultProfile;
-      const logicalName = name.toUpperCase();
+      let logicalName;
+      try {
+        logicalName = canonicalizeLogicalAppName(name);
+      } catch {
+        throw argumentError(`logical app name "${name}" must match the logical app name rules.`);
+      }
       const appId = requireProfile(profileName).logicalApps?.[logicalName];
       if (appId === void 0) {
         throw argumentError(`logical app LAPP_${logicalName}@${profileName} is not defined.`);
@@ -24967,250 +25225,6 @@ function extractAppIds(sql) {
   }
   return [...out];
 }
-function isSqlIdentContinue(ch) {
-  if (!ch) return false;
-  const cp = ch.codePointAt(0);
-  return cp >= 65 && cp <= 90 || cp >= 97 && cp <= 122 || cp >= 48 && cp <= 57 || cp === 95 || cp === 36 || cp >= 12352 && cp <= 12543 || cp >= 13312 && cp <= 40959 || cp >= 63744 && cp <= 64255 || cp >= 65281 && cp <= 65376;
-}
-function isProfileNameChar(ch) {
-  if (!ch) return false;
-  const cp = ch.codePointAt(0);
-  return cp >= 65 && cp <= 90 || cp >= 97 && cp <= 122 || cp >= 48 && cp <= 57 || ch === "_" || ch === "-" || ch === "." || ch === "$";
-}
-function isAsciiLogicalNameStart(ch) {
-  return /^[A-Za-z]$/.test(ch);
-}
-function isAsciiLogicalNameContinue(ch) {
-  return /^[A-Za-z0-9_]$/.test(ch);
-}
-function tryParseAppProfileToken(sql, start) {
-  const prev = start > 0 ? sql[start - 1] : "";
-  if (isSqlIdentContinue(prev)) return null;
-  let source;
-  let appId;
-  let logicalName;
-  let referenceValueStart;
-  let referenceValueEnd;
-  let i;
-  if (sql.slice(start, start + 5).toUpperCase() === "LAPP_") {
-    source = "logical";
-    i = start + 5;
-    referenceValueStart = i;
-    if (!isAsciiLogicalNameStart(sql[i] ?? "")) return null;
-    i++;
-    while (i < sql.length && isAsciiLogicalNameContinue(sql[i])) i++;
-    referenceValueEnd = i;
-    if (referenceValueEnd - referenceValueStart > 64) return null;
-    logicalName = sql.slice(referenceValueStart, referenceValueEnd).toUpperCase();
-  } else if (sql.slice(start, start + 3).toUpperCase() === "APP") {
-    source = "physical";
-    i = start + 3;
-    referenceValueStart = i;
-    while (i < sql.length && /[0-9]/.test(sql[i])) i++;
-    referenceValueEnd = i;
-    if (referenceValueEnd === referenceValueStart) return null;
-    appId = Number(sql.slice(referenceValueStart, referenceValueEnd));
-  } else {
-    return null;
-  }
-  if (sql[i] === "$") {
-    i++;
-    const subStart = i;
-    while (i < sql.length && isSqlIdentContinue(sql[i])) i++;
-    if (i === subStart) return null;
-  }
-  const appEnd = i;
-  let profile = null;
-  if (sql[i] === "@") {
-    i++;
-    const pStart = i;
-    while (i < sql.length && isProfileNameChar(sql[i])) i++;
-    if (i === pStart) return null;
-    profile = sql.slice(pStart, i);
-  }
-  const next = i < sql.length ? sql[i] : "";
-  if (isSqlIdentContinue(next)) return null;
-  const common = {
-    profile,
-    start,
-    referenceValueStart,
-    referenceValueEnd,
-    appEnd,
-    fullEnd: i
-  };
-  return source === "physical" ? { ...common, source, appId } : { ...common, source, logicalName };
-}
-function collectAppProfileTokens(sql) {
-  const tokens = [];
-  let i = 0;
-  while (i < sql.length) {
-    const ch = sql[i];
-    if (ch === "'") {
-      i++;
-      while (i < sql.length) {
-        if (sql[i] === "'") {
-          i++;
-          if (i < sql.length && sql[i] === "'") {
-            i++;
-            continue;
-          }
-          break;
-        }
-        i++;
-      }
-      continue;
-    }
-    if (ch === "`") {
-      i++;
-      while (i < sql.length && sql[i] !== "`") i++;
-      if (i < sql.length) i++;
-      continue;
-    }
-    if (ch === "-" && sql[i + 1] === "-") {
-      i += 2;
-      while (i < sql.length && sql[i] !== "\n") i++;
-      continue;
-    }
-    if (ch === "/" && sql[i + 1] === "*") {
-      i += 2;
-      while (i < sql.length) {
-        if (sql[i] === "*" && sql[i + 1] === "/") {
-          i += 2;
-          break;
-        }
-        i++;
-      }
-      continue;
-    }
-    const parsed = tryParseAppProfileToken(sql, i);
-    if (!parsed) {
-      i++;
-      continue;
-    }
-    tokens.push(parsed);
-    i = parsed.fullEnd;
-  }
-  return tokens;
-}
-function nextVirtualAppId(used) {
-  let id = 9e8;
-  while (used.has(id)) id++;
-  used.add(id);
-  return id;
-}
-function normalizeSqlAppProfiles(sql, defaultProfile = "dev", resolutionContext) {
-  const tokens = collectAppProfileTokens(sql);
-  const hasProfileSyntax = tokens.some((t) => t.profile !== null);
-  const profilesByApp = /* @__PURE__ */ new Map();
-  const normalizedProfile = (profile) => profile ?? defaultProfile;
-  for (const t of tokens) {
-    if (t.source !== "physical") continue;
-    const p = normalizedProfile(t.profile);
-    let set = profilesByApp.get(t.appId);
-    if (!set) {
-      set = /* @__PURE__ */ new Set();
-      profilesByApp.set(t.appId, set);
-    }
-    set.add(p.toLowerCase());
-  }
-  const usedAppIds = new Set(
-    tokens.filter((t) => t.source === "physical").map((t) => t.appId)
-  );
-  const resolvedLogicalApps = /* @__PURE__ */ new Map();
-  for (const t of tokens) {
-    if (t.source !== "logical") continue;
-    const pLower = normalizedProfile(t.profile).toLowerCase();
-    const logicalKey = `logical:${t.logicalName}@${pLower}`;
-    if (resolvedLogicalApps.has(logicalKey)) continue;
-    if (!resolutionContext) {
-      throw new Error(
-        `ArgumentError: logical app LAPP_${t.logicalName}@${pLower} requires logicalApps configuration.`
-      );
-    }
-    const resolvedAppId = resolutionContext.resolveLogicalApp(t.logicalName, pLower);
-    resolvedLogicalApps.set(logicalKey, resolvedAppId);
-    usedAppIds.add(resolvedAppId);
-  }
-  const pairToMapped = /* @__PURE__ */ new Map();
-  const appBindingByMappedApp = /* @__PURE__ */ new Map();
-  for (const [appId, pSet] of profilesByApp.entries()) {
-    const profiles = [...pSet].sort();
-    if (profiles.length <= 1) continue;
-    for (const pLower of profiles) {
-      const mapped = nextVirtualAppId(usedAppIds);
-      pairToMapped.set(`physical:${appId}@${pLower}`, mapped);
-      appBindingByMappedApp.set(mapped, {
-        source: "physical",
-        mappedAppId: mapped,
-        appId,
-        profile: pLower
-      });
-    }
-  }
-  const out = [];
-  const rewriteSegments = [];
-  let normalizedLength = 0;
-  let cursor = 0;
-  const appendSegment = (text, sourceStart, sourceEnd, bindingMappedAppId) => {
-    if (!text && sourceStart === sourceEnd) return;
-    const normalizedStart = normalizedLength;
-    out.push(text);
-    normalizedLength += text.length;
-    rewriteSegments.push({
-      normalizedStart,
-      normalizedEnd: normalizedLength,
-      sourceStart,
-      sourceEnd,
-      ...bindingMappedAppId === void 0 ? {} : { bindingMappedAppId }
-    });
-  };
-  for (const t of tokens) {
-    const p = normalizedProfile(t.profile);
-    const pLower = p.toLowerCase();
-    let binding;
-    if (t.source === "physical") {
-      const mapped = pairToMapped.get(`physical:${t.appId}@${pLower}`) ?? t.appId;
-      binding = {
-        source: "physical",
-        mappedAppId: mapped,
-        appId: t.appId,
-        profile: pLower
-      };
-    } else {
-      const logicalKey = `logical:${t.logicalName}@${pLower}`;
-      let mapped = pairToMapped.get(logicalKey);
-      if (mapped === void 0) {
-        mapped = nextVirtualAppId(usedAppIds);
-        pairToMapped.set(logicalKey, mapped);
-      }
-      binding = {
-        source: "logical",
-        logicalName: t.logicalName,
-        mappedAppId: mapped,
-        appId: resolvedLogicalApps.get(logicalKey),
-        profile: pLower
-      };
-    }
-    appBindingByMappedApp.set(binding.mappedAppId, binding);
-    appendSegment(sql.slice(cursor, t.start), cursor, t.start);
-    const subtableSuffix = sql.slice(t.referenceValueEnd, t.appEnd);
-    const normalizedReference = t.source === "physical" ? `${sql.slice(t.start, t.referenceValueStart)}${binding.mappedAppId}${subtableSuffix}` : `APP${binding.mappedAppId}${subtableSuffix}`;
-    appendSegment(
-      normalizedReference,
-      t.start,
-      t.fullEnd,
-      binding.mappedAppId
-    );
-    cursor = t.fullEnd;
-  }
-  appendSegment(sql.slice(cursor), cursor, sql.length);
-  return {
-    normalizedSql: out.join(""),
-    hasProfileSyntax,
-    appBindingByMappedApp,
-    rewriteSegments
-  };
-}
 function buildCacheContext(defaultProfile, appBindingByMappedApp) {
   if (appBindingByMappedApp.size === 0) return `default:${defaultProfile.toLowerCase()}`;
   const pairs = [...appBindingByMappedApp.entries()].sort((a, b) => a[0] - b[0]).map(([mappedAppId, b]) => b.source === "logical" ? `M${mappedAppId}=logical:${b.logicalName}:APP${b.appId}@${b.profile}` : `M${mappedAppId}=physical:APP${b.appId}@${b.profile}`);
@@ -26851,6 +26865,7 @@ async function run() {
   let containsApplyStatement = false;
   let containsApplyMutation = false;
   let dryRunNeedsMetadata = false;
+  let parsedStatements = [];
   if (args.diagRecordId === null) {
     sql = args.executeSql;
     if (!sql && args.filePath) sql = (0, import_fs2.readFileSync)(args.filePath, "utf-8");
@@ -26878,6 +26893,7 @@ async function run() {
     const importEnabled = Object.keys(args.importCsv).length > 0 || Object.keys(args.importJson).length > 0;
     try {
       const statements = parseSqlStatements(sql, { import: importEnabled });
+      parsedStatements = statements;
       const hasApply = (statement) => statement.type === "UPDATE" || statement.type === "INSERT" ? (statement.applyBlocks?.length ?? 0) > 0 : statement.type === "UPSERT" ? (statement.onInsertApplyBlocks?.length ?? 0) > 0 || (statement.onUpdateApplyBlocks?.length ?? 0) > 0 : false;
       containsApplyStatement = statements.some(hasApply);
       containsApplyMutation = statements.some((statement) => {
@@ -27354,7 +27370,7 @@ query=${label}`);
           return 2;
         }
       }
-      const batchResult = await executeBatch(sql, client, {
+      let batchResult = await executeBatch(sql, client, {
         maxRecords,
         fetchParallel,
         onLimitReached: effectiveOnLimit,
@@ -27390,6 +27406,20 @@ query=${label}`);
           return true;
         } : void 0
       });
+      if (sqlDiagnosticContext) {
+        batchResult = {
+          ...batchResult,
+          statements: batchResult.statements.map(
+            (statementResult, index) => parsedStatements[index]?.type === "EXPLAIN" && statementResult.result ? {
+              ...statementResult,
+              result: restoreSqlDiagnosticValue(
+                statementResult.result,
+                sqlDiagnosticContext.appBindingByMappedApp
+              )
+            } : statementResult
+          )
+        };
+      }
       return writeBatchOutput(batchResult, { format, noHeader, pretty, displayOptions, outputPath, quiet });
     }
     let result = args.dryRun ? await execute(`EXPLAIN ${sql}`, client, {
@@ -27417,7 +27447,7 @@ query=${label}`);
       } : {},
       ...containsApplyMutation ? { allowApplyMutation: true } : {}
     });
-    if (args.dryRun && sqlDiagnosticContext) {
+    if ((args.dryRun || parsedStatements[0]?.type === "EXPLAIN") && sqlDiagnosticContext) {
       result = restoreSqlDiagnosticValue(result, sqlDiagnosticContext.appBindingByMappedApp);
     }
     if (result.type === "ASSERT") {