@rex0220/kintone-sql-tools 3.37.0 → 3.38.0

package/dist-cli/ksql.js

@@ -1925,24 +1925,25 @@ var Parser = class {
     }
     if (this.isGroupingFunctionStart()) {
       const ref = this.parseGroupingRef();
-      const alias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
-      return { type: "GROUPING_COL", ref, alias: alias2 };
+      const parsedAlias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
+      return this.withAliasDisplay({ type: "GROUPING_COL", ref, alias: parsedAlias2?.alias ?? null }, parsedAlias2);
     }
     if (this.tryAggregateFunc() === null && this.hasTopLevelTokenBeforeValueEnd("||" /* CONCAT_OP */)) {
       const expr = this.parseScalarValueExpr({ allowAggregateArgs: true });
-      const alias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
-      return { type: "SCALAR_VALUE_COL", expr, alias: alias2 };
+      const parsedAlias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
+      return this.withAliasDisplay({ type: "SCALAR_VALUE_COL", expr, alias: parsedAlias2?.alias ?? null }, parsedAlias2);
     }
     if (this.peek().kind === "VARIABLE" /* VARIABLE */) {
       const variable = this.advance();
       if (!this.consume("AS" /* AS */)) {
         throw new ParseError("SELECT \u5217\u306E\u30D0\u30C3\u30C1\u5909\u6570\u306B\u306F AS alias \u304C\u5FC5\u8981\u3067\u3059", this.peek());
       }
-      return {
+      const parsedAlias2 = this.parseAliasName();
+      return this.withAliasDisplay({
         type: "VARIABLE_COL",
         name: variable.value.slice(1).toLowerCase(),
-        alias: this.parseAliasName()
-      };
+        alias: parsedAlias2.alias
+      }, parsedAlias2);
     }
     const windowFunc = this.tryWindowFunc();
     if (windowFunc !== null) {
@@ -1950,58 +1951,58 @@ var Parser = class {
     }
     if (this.peek().kind === "CASE" /* CASE */) {
       const expr = this.parseCaseWhenExpr(true);
-      const alias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
-      return { type: "CASE_COL", expr, alias: alias2 };
+      const parsedAlias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
+      return this.withAliasDisplay({ type: "CASE_COL", expr, alias: parsedAlias2?.alias ?? null }, parsedAlias2);
     }
     if (this.peek().kind === "IF" /* IF */) {
       const expr = this.parseIfExpr(true);
-      const alias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
-      return { type: "CASE_COL", expr, alias: alias2 };
+      const parsedAlias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
+      return this.withAliasDisplay({ type: "CASE_COL", expr, alias: parsedAlias2?.alias ?? null }, parsedAlias2);
     }
     if (this.tryStringFuncName() !== null) {
       const funcExpr = this.parseStringFuncExpr();
       if (this.isArithOp(this.peek().kind)) {
         const node = this.parseSelectArith(() => this.continueArith(funcExpr));
-        const alias3 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
-        return { type: "ARITH_COL", expr: node, alias: alias3 };
+        const parsedAlias3 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
+        return this.withAliasDisplay({ type: "ARITH_COL", expr: node, alias: parsedAlias3?.alias ?? null }, parsedAlias3);
       }
-      const alias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
-      return { type: "STRFUNC_COL", expr: funcExpr, alias: alias2 };
+      const parsedAlias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
+      return this.withAliasDisplay({ type: "STRFUNC_COL", expr: funcExpr, alias: parsedAlias2?.alias ?? null }, parsedAlias2);
     }
     const aggFunc = this.tryAggregateFunc();
     if (aggFunc !== null) {
       const ref = this.parseAggregateRef(aggFunc);
       if (this.isArithOp(this.peek().kind)) {
         const expr = this.continueAggArith(ref);
-        const alias3 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
-        return { type: "ARITH_AGG_COL", expr, alias: alias3 };
+        const parsedAlias3 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
+        return this.withAliasDisplay({ type: "ARITH_AGG_COL", expr, alias: parsedAlias3?.alias ?? null }, parsedAlias3);
       }
-      const alias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
-      return {
+      const parsedAlias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
+      return this.withAliasDisplay({
         type: "AGGREGATE",
         func: ref.func,
         distinct: ref.distinct,
         arg: ref.arg,
         ...ref.separator !== void 0 ? { separator: ref.separator } : {},
-        alias: alias2
-      };
+        alias: parsedAlias2?.alias ?? null
+      }, parsedAlias2);
     }
     if (this.peek().kind === "(" /* LPAREN */ && this.peekAt(1).kind === "SELECT" /* SELECT */) {
       this.advance();
       const query = this.parseSelect();
       this.expect(")" /* RPAREN */);
-      const alias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
-      return { type: "SCALAR_SUBQUERY_COL", query, alias: alias2 };
+      const parsedAlias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
+      return this.withAliasDisplay({ type: "SCALAR_SUBQUERY_COL", query, alias: parsedAlias2?.alias ?? null }, parsedAlias2);
     }
     if (this.peek().kind === "STRING" /* STRING */) {
       const value = this.expect("STRING" /* STRING */).value;
-      const alias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
-      return { type: "LITERAL_COL", value, alias: alias2 };
+      const parsedAlias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
+      return this.withAliasDisplay({ type: "LITERAL_COL", value, alias: parsedAlias2?.alias ?? null }, parsedAlias2);
     }
     if (this.peek().kind === "(" /* LPAREN */ || this.peek().kind === "NUMBER" /* NUMBER */) {
       const node = this.parseSelectArith(() => this.parseArithAddSub());
-      const alias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
-      return { type: "ARITH_COL", expr: node, alias: alias2 };
+      const parsedAlias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
+      return this.withAliasDisplay({ type: "ARITH_COL", expr: node, alias: parsedAlias2?.alias ?? null }, parsedAlias2);
     }
     const field = this.parseColumnFieldRef();
     if (field === "_p.*") {
@@ -2013,11 +2014,11 @@ var Parser = class {
     if (this.isArithOp(this.peek().kind)) {
       const left = { type: "FIELD_REF", field };
       const node = this.parseSelectArith(() => this.continueArith(left));
-      const alias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
-      return { type: "ARITH_COL", expr: node, alias: alias2 };
+      const parsedAlias2 = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
+      return this.withAliasDisplay({ type: "ARITH_COL", expr: node, alias: parsedAlias2?.alias ?? null }, parsedAlias2);
     }
-    const alias = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
-    return { type: "FIELD", field, alias };
+    const parsedAlias = this.consume("AS" /* AS */) ? this.parseAliasName() : null;
+    return this.withAliasDisplay({ type: "FIELD", field, alias: parsedAlias?.alias ?? null }, parsedAlias);
   }
   tryWindowFunc() {
     return PARSER_WINDOW_FUNCTION_TOKEN_MAP[this.peek().kind] ?? null;
@@ -2045,8 +2046,8 @@ var Parser = class {
     if (!this.consume("AS" /* AS */)) {
       throw new ParseError("\u30A6\u30A3\u30F3\u30C9\u30A6\u95A2\u6570\u306B\u306F AS alias \u304C\u5FC5\u8981\u3067\u3059", this.peek());
     }
-    const alias = this.parseAliasName();
-    return { type: "WINDOW_COL", func, partitionBy, orderBy, alias };
+    const parsedAlias = this.parseAliasName();
+    return this.withAliasDisplay({ type: "WINDOW_COL", func, partitionBy, orderBy, alias: parsedAlias.alias }, parsedAlias);
   }
   selectColumnHasAggregate(column) {
     if (column.type === "AGGREGATE" || column.type === "ARITH_AGG_COL") return true;
@@ -4195,10 +4196,24 @@ var Parser = class {
     }
     if (tok.kind === "IDENT" /* IDENT */ || tok.kind === "BIDENT" /* BIDENT */ || KEYWORDS.has(tok.value.toUpperCase())) {
       this.advance();
-      return tok.value.toLowerCase();
+      return {
+        alias: tok.value.toLowerCase(),
+        // alias は小文字で統一
+        display: tok.value
+      };
     }
     throw new ParseError("\u30A8\u30A4\u30EA\u30A2\u30B9\u540D\u304C\u5FC5\u8981\u3067\u3059", tok);
   }
+  /** 互換 snapshot を変えず、SELECT 列 AST に表示表記を保持する。 */
+  withAliasDisplay(column, parsedAlias) {
+    if (parsedAlias !== null) {
+      Object.defineProperty(column, "aliasDisplay", {
+        value: parsedAlias.display,
+        enumerable: false
+      });
+    }
+    return column;
+  }
   /** フィールド名または修飾フィールド名（alias.field）を解析する */
   parseFieldPath() {
     const first = this.parseIdentifier();
@@ -16089,7 +16104,7 @@ function materializedColumnMetaEqual(left, right) {
   if (!left || !right || left.size !== right.size) return false;
   for (const [column, meta] of left) {
     const candidate = right.get(column);
-    if (!candidate || candidate.sortKind !== meta.sortKind || candidate.fieldType !== meta.fieldType || !fieldSemanticsEqual(candidate.semantics, meta.semantics)) return false;
+    if (!candidate || candidate.displayName !== meta.displayName || candidate.sortKind !== meta.sortKind || candidate.fieldType !== meta.fieldType || !fieldSemanticsEqual(candidate.semantics, meta.semantics)) return false;
   }
   return true;
 }
@@ -16368,7 +16383,16 @@ async function executeBatchStatement(stmt, info, client, options, cacheContext,
   }
   if (info.tempTablesReferenced.length > 0) {
     if (resolvedStmt.type === "SELECT" || resolvedStmt.type === "UNION") {
-      return { result: await executeQueryWithCte(resolvedStmt, client, options, tempTables, cacheContext) };
+      return {
+        result: await executeQueryWithCte(
+          resolvedStmt,
+          client,
+          options,
+          tempTables,
+          cacheContext,
+          options.captureColumnMeta === true
+        )
+      };
     }
     if (resolvedStmt.type === "WITH") {
       return { result: await executeWith(resolvedStmt, client, options, cacheContext, tempTables) };
@@ -16530,7 +16554,8 @@ 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.`);
-      return value.type === "number" ? { type: "ARITH_COL", expr: { type: "NUMBER", value: value.value, raw: value.raw ?? String(value.value) }, alias: obj["alias"] } : { type: "LITERAL_COL", value: value.value, alias: obj["alias"] };
+      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 };
     }
     if (obj["type"] === "VARIABLE_IN_LIST") return obj;
     const resolved = Object.fromEntries(
@@ -16543,6 +16568,9 @@ function resolveBatchVariableReferencesInternal(node, variables, numericArithmet
         )
       ])
     );
+    if (typeof obj["aliasDisplay"] === "string") {
+      resolved["aliasDisplay"] = obj["aliasDisplay"];
+    }
     if (resolved["type"] === "BINARY") {
       const right = resolved["right"];
       if (right?.["type"] === "VARIABLE_IN_LIST" && typeof right["name"] === "string") {
@@ -18068,6 +18096,9 @@ function inferAggregateArgMeta(arg, resolveField2) {
   if (arg.elseResult) results.push(caseResultColumnMeta(arg.elseResult, resolveField2));
   return mergeExpressionColumnMeta(results);
 }
+function withDisplayName(meta, displayName) {
+  return { ...meta ?? {}, displayName };
+}
 function selectNeedsSourceColumnMeta(stmt) {
   return stmt.columns.some(
     (column) => column.type === "FIELD" || column.type === "WILDCARD" || column.type === "PARENT_WILDCARD" || column.type === "CASE_COL" || column.type === "AGGREGATE" && (column.func === "MIN" || column.func === "MAX" || column.func === "MODE")
@@ -18132,7 +18163,7 @@ async function inferSelectColumnMeta(stmt, outputColumns, client, cacheContext,
     for (const output of outputColumns) {
       const ref = aggregateFieldRef(output);
       const meta = withPublicSource(resolveField2(ref), ref);
-      if (meta) inferred.set(output, meta);
+      inferred.set(output, withDisplayName(meta, meta?.displayName ?? output));
     }
     return inferred;
   }
@@ -18140,7 +18171,7 @@ async function inferSelectColumnMeta(stmt, outputColumns, client, cacheContext,
     for (const output of outputColumns) {
       const ref = aggregateFieldRef(output);
       const meta = withPublicSource(resolveField2(ref), ref);
-      if (meta) inferred.set(output, meta);
+      inferred.set(output, withDisplayName(meta, meta?.displayName ?? output));
     }
   }
   const explicitColumns = stmt.columns.filter(
@@ -18184,7 +18215,7 @@ async function inferSelectColumnMeta(stmt, outputColumns, client, cacheContext,
     } else if (column.type === "SCALAR_SUBQUERY_COL") {
       meta = unknownStringColumnMeta();
     }
-    if (meta) inferred.set(output, meta);
+    inferred.set(output, withDisplayName(meta, column.aliasDisplay ?? output));
   });
   return inferred;
 }
@@ -18196,15 +18227,14 @@ function mergeUnionColumnMeta(left, right) {
     const a = leftMeta?.get(column);
     const rightColumn = right.columns[index];
     const b = rightColumn === void 0 ? void 0 : rightMeta?.get(rightColumn);
+    let meta;
     if (a && b) {
       const combined = mergeExpressionColumnMeta([a, b]);
       const publicSourceApp = a.publicSourceApp === b.publicSourceApp ? a.publicSourceApp : void 0;
       const { publicSourceApp: _discarded, ...withoutPublicSource } = combined;
-      merged.set(
-        column,
-        publicSourceApp === void 0 ? withoutPublicSource : { ...withoutPublicSource, publicSourceApp }
-      );
-    } else if (a || b) merged.set(column, unknownStringColumnMeta());
+      meta = publicSourceApp === void 0 ? withoutPublicSource : { ...withoutPublicSource, publicSourceApp };
+    } else meta = unknownStringColumnMeta();
+    merged.set(column, withDisplayName(meta, a?.displayName ?? column));
   });
   return merged;
 }
@@ -25332,35 +25362,41 @@ function tryParseStatements(sql) {
   }
 }
 
-// src/node/sqlDiagnostics.ts
-function restoreSqlDiagnosticValue(value, bindings) {
+// src/core/sqlDiagnostics.ts
+function restoreSqlDiagnosticValue(value, bindings, options = {}) {
+  const displayMode = options.logicalAppDisplay ?? "profile";
   if (typeof value === "string") {
     const dmlTarget = value.match(/^(\s*target:\s*)APP(\d+) \((\d+)\)\s*$/);
     if (dmlTarget && dmlTarget[2] === dmlTarget[3]) {
       const binding = bindings.get(Number(dmlTarget[2]));
       if (binding) {
-        const target = binding.source === "logical" ? `LAPP_${binding.logicalName} -> APP${binding.appId}@${binding.profile}` : `APP${binding.appId}@${binding.profile}`;
+        const target = binding.source === "logical" ? displayMode === "physical" ? `LAPP_${binding.logicalName} -> APP${binding.appId}` : `LAPP_${binding.logicalName} -> APP${binding.appId}@${binding.profile}` : displayMode === "physical" ? `APP${binding.appId}` : `APP${binding.appId}@${binding.profile}`;
         return `${dmlTarget[1]}${target}`;
       }
     }
     let restored = value;
     for (const binding of bindings.values()) {
       const internal = `APP${binding.mappedAppId}`;
-      const display = binding.source === "logical" ? `LAPP_${binding.logicalName}@${binding.profile}` : `APP${binding.appId}@${binding.profile}`;
+      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;
   }
   if (Array.isArray(value)) {
-    return value.map((item) => restoreSqlDiagnosticValue(item, bindings));
+    return value.map((item) => restoreSqlDiagnosticValue(item, bindings, options));
   }
   if (value !== null && typeof value === "object") {
     return Object.fromEntries(
-      Object.entries(value).map(([key, item]) => [key, restoreSqlDiagnosticValue(item, bindings)])
+      Object.entries(value).map(([key, item]) => [
+        key,
+        restoreSqlDiagnosticValue(item, bindings, options)
+      ])
     );
   }
   return value;
 }
+
+// src/node/sqlDiagnostics.ts
 function restoreSqlContextError(err, sourceSql, context) {
   if (!(err instanceof Error)) return err;
   let message = err.message;