@rex0220/kintone-sql-tools 3.37.1 → 3.39.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();
@@ -1925,24 +1950,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 +1976,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 +2039,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 +2071,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 +4221,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();
@@ -6792,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") {
@@ -6803,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);
@@ -6904,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);
@@ -6916,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);
@@ -16089,7 +16157,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;
 }
@@ -16108,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.");
@@ -16179,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
         );
@@ -16224,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);
@@ -16269,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] });
@@ -16368,7 +16453,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) };
@@ -16483,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":
@@ -16519,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.`
         );
@@ -16530,7 +16651,11 @@ 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"] };
+      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 };
     }
     if (obj["type"] === "VARIABLE_IN_LIST") return obj;
     const resolved = Object.fromEntries(
@@ -16543,6 +16668,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 +18196,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 +18263,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 +18271,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 +18315,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 +18327,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;
 }
@@ -22643,7 +22773,8 @@ async function buildBatchExplainPlans(sql, client, injectedVariables, cacheConte
   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 = [];
     for (let i = 0; i < statements.length; i++) {
@@ -22676,7 +22807,7 @@ async function buildBatchExplainPlans(sql, client, injectedVariables, cacheConte
         plan: statementPlan.length === 0 ? metadataPlan : [statementPlan[0], ...metadataPlan, ...statementPlan.slice(1)]
       });
       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 };
@@ -22715,6 +22846,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"
@@ -25344,13 +25481,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));