@rex0220/kintone-sql-tools 2.12.0 → 2.14.0

package/dist-cli/ksql.js

@@ -26,6 +26,7 @@ __export(index_exports, {
   buildBatchStatementSummary: () => buildBatchStatementSummary,
   buildOutput: () => buildOutput,
   buildReplExecArgv: () => buildReplExecArgv,
+  buildValidationOutput: () => buildValidationOutput,
   extractAppIds: () => extractAppIds,
   normalizeAppKey: () => normalizeAppKey,
   normalizeSqlAppProfiles: () => normalizeSqlAppProfiles,
@@ -1503,6 +1504,7 @@ var Parser = class {
   tryParseImplicitAlias() {
     const k = this.peek().kind;
     if (k === "IDENT" /* IDENT */ || k === "BIDENT" /* BIDENT */) {
+      if (k === "IDENT" /* IDENT */ && this.peek().value.toUpperCase() === "VALIDATE" && this.peekAt(1).kind === "IDENT" /* IDENT */ && this.peekAt(1).value.toUpperCase() === "ONLY") return null;
       return this.parseTableAliasName();
     }
     return null;
@@ -1949,7 +1951,8 @@ var Parser = class {
       if (subtableCode) {
         throw new ParseError("INSERT INTO ... SELECT \u306F\u30B5\u30D6\u30C6\u30FC\u30D6\u30EB\u4EEE\u60F3\u30C6\u30FC\u30D6\u30EB\u3067\u306F\u672A\u5BFE\u5FDC\u3067\u3059", this.prev());
       }
-      return { type: "INSERT_SELECT", appId, fields, select };
+      const validation2 = this.parseDmlControlSuffix();
+      return { type: "INSERT_SELECT", appId, fields, select, ...validation2 };
     }
     this.expect("VALUES" /* VALUES */);
     const values = [];
@@ -1959,7 +1962,11 @@ var Parser = class {
       this.expect(")" /* RPAREN */);
       values.push(row);
     } while (this.consume("," /* COMMA */));
-    return subtableCode ? { type: "INSERT", appId, subtableCode, fields, values } : { type: "INSERT", appId, fields, values };
+    const validation = this.parseDmlControlSuffix();
+    if (subtableCode && (validation.validateOnly || validation.onErrorSkip)) {
+      throw new ParseError("VALIDATE ONLY / ON ERROR SKIP \u306F\u30B5\u30D6\u30C6\u30FC\u30D6\u30EB INSERT \u306B\u5BFE\u5FDC\u3057\u3066\u3044\u307E\u305B\u3093", this.prev());
+    }
+    return subtableCode ? { type: "INSERT", appId, subtableCode, fields, values, ...validation } : { type: "INSERT", appId, fields, values, ...validation };
   }
   parseUpsert() {
     this.expect("UPSERT" /* UPSERT */);
@@ -1976,7 +1983,8 @@ var Parser = class {
     if (this.peek().kind === "SELECT" /* SELECT */) {
       const select = this.parseSelect();
       const keyFields2 = this.parseOnDuplicate();
-      return { type: "UPSERT_SELECT", appId, fields, select, keyFields: keyFields2 };
+      const validation2 = this.parseDmlControlSuffix();
+      return { type: "UPSERT_SELECT", appId, fields, select, keyFields: keyFields2, ...validation2 };
     }
     this.expect("VALUES" /* VALUES */);
     const values = [];
@@ -1986,7 +1994,8 @@ var Parser = class {
       this.expect(")" /* RPAREN */);
     } while (this.consume("," /* COMMA */));
     const keyFields = this.parseOnDuplicate();
-    return { type: "UPSERT", appId, fields, values, keyFields };
+    const validation = this.parseDmlControlSuffix();
+    return { type: "UPSERT", appId, fields, values, keyFields, ...validation };
   }
   parseOnDuplicate() {
     this.expectKeyword("ON" /* ON */, "UPSERT \u306B\u306F ON DUPLICATE (\u30AD\u30FC\u30D5\u30A3\u30FC\u30EB\u30C9) \u304C\u5FC5\u8981\u3067\u3059");
@@ -2066,10 +2075,14 @@ var Parser = class {
       if (!table.alias) {
         throw new ParseError("UPDATE ... FROM \u306E\u30BD\u30FC\u30B9\u306B\u306F\u30A8\u30A4\u30EA\u30A2\u30B9\u304C\u5FC5\u8981\u3067\u3059", this.prev());
       }
+      if (table.alias.toLowerCase() === `app${appId}`.toLowerCase()) {
+        throw new ParseError(`UPDATE ... FROM \u306E\u30BD\u30FC\u30B9 alias \u306F\u66F4\u65B0\u5148 APP${appId} \u3068\u540C\u540D\u306B\u3067\u304D\u307E\u305B\u3093`, this.prev());
+      }
       from = {
         appId: table.appId,
         cteName: table.cteName,
         alias: table.alias,
+        targetJoinField: "",
         joinKeyField: "",
         targetFilter: null
       };
@@ -2088,6 +2101,7 @@ var Parser = class {
       }
       this.validateUpdateFromAssignments(assignments, from.alias, whereTok);
       const decomposed = this.decomposeUpdateFromWhere(where, appId, from.alias, whereTok);
+      from.targetJoinField = decomposed.targetJoinField;
       from.joinKeyField = decomposed.joinKeyField;
       from.targetFilter = decomposed.targetFilter;
     } else if (assignments.some((a) => a.value.type === "SOURCE_FIELD")) {
@@ -2096,8 +2110,66 @@ var Parser = class {
         whereTok
       );
     }
-    if (from !== null) return { type: "UPDATE", appId, assignments, where, from };
-    return subtableCode ? { type: "UPDATE", appId, subtableCode, assignments, where } : { type: "UPDATE", appId, assignments, where };
+    const validation = this.parseDmlControlSuffix();
+    if (subtableCode && (validation.validateOnly || validation.onErrorSkip)) {
+      throw new ParseError("VALIDATE ONLY / ON ERROR SKIP \u306F\u30B5\u30D6\u30C6\u30FC\u30D6\u30EB UPDATE \u306B\u5BFE\u5FDC\u3057\u3066\u3044\u307E\u305B\u3093", this.prev());
+    }
+    if (from !== null) return { type: "UPDATE", appId, assignments, where, from, ...validation };
+    return subtableCode ? { type: "UPDATE", appId, subtableCode, assignments, where, ...validation } : { type: "UPDATE", appId, assignments, where, ...validation };
+  }
+  /** DML末尾の VALIDATE ONLY または ON ERROR SKIP。各語はsoft keyword。 */
+  parseDmlControlSuffix() {
+    if (this.peek().kind === "ON" /* ON */) return this.parseOnErrorSkipSuffix();
+    if (this.isSoftKeyword("REJECT")) {
+      throw new ParseError("REJECT LIMIT \u306B\u306F ON ERROR SKIP INTO \u304C\u5FC5\u8981\u3067\u3059", this.peek());
+    }
+    if (!this.isSoftKeyword("VALIDATE")) return {};
+    const validateTok = this.advance();
+    if (!this.isSoftKeyword("ONLY")) {
+      throw new ParseError("VALIDATE \u306E\u5F8C\u306B\u306F ONLY \u304C\u5FC5\u8981\u3067\u3059", this.peek());
+    }
+    this.advance();
+    let validationErrorTable = null;
+    if (this.consume("INTO" /* INTO */)) {
+      const tok = this.peek();
+      if (tok.kind !== "IDENT" /* IDENT */ || !tok.value.startsWith("#")) {
+        throw new ParseError("VALIDATE ONLY INTO \u306B\u306F # \u3067\u59CB\u307E\u308B\u4E00\u6642\u30C6\u30FC\u30D6\u30EB\u540D\u304C\u5FC5\u8981\u3067\u3059", tok);
+      }
+      validationErrorTable = this.parseTableName();
+    }
+    if (this.peek().kind === "ON" /* ON */ || this.isSoftKeyword("REJECT")) {
+      throw new ParseError("VALIDATE ONLY \u3068 ON ERROR / REJECT LIMIT \u306F\u4F75\u8A18\u3067\u304D\u307E\u305B\u3093", validateTok);
+    }
+    return { validateOnly: true, validationErrorTable };
+  }
+  parseOnErrorSkipSuffix() {
+    const onTok = this.advance();
+    if (!this.isSoftKeyword("ERROR")) throw new ParseError("ON \u306E\u5F8C\u306B\u306F ERROR \u304C\u5FC5\u8981\u3067\u3059", this.peek());
+    this.advance();
+    if (!this.isSoftKeyword("SKIP")) throw new ParseError("ON ERROR \u306E\u5F8C\u306B\u306F SKIP \u304C\u5FC5\u8981\u3067\u3059", this.peek());
+    this.advance();
+    this.expect("INTO" /* INTO */, "ON ERROR SKIP \u306B\u306F INTO #\u4E00\u6642\u30C6\u30FC\u30D6\u30EB \u304C\u5FC5\u8981\u3067\u3059");
+    const tableTok = this.peek();
+    if (tableTok.kind !== "IDENT" /* IDENT */ || !tableTok.value.startsWith("#")) {
+      throw new ParseError("ON ERROR SKIP INTO \u306B\u306F # \u3067\u59CB\u307E\u308B\u4E00\u6642\u30C6\u30FC\u30D6\u30EB\u540D\u304C\u5FC5\u8981\u3067\u3059", tableTok);
+    }
+    const errorTable = this.parseTableName();
+    let rejectLimit = null;
+    if (this.isSoftKeyword("REJECT")) {
+      this.advance();
+      this.expect("LIMIT" /* LIMIT */, "REJECT \u306E\u5F8C\u306B\u306F LIMIT \u304C\u5FC5\u8981\u3067\u3059");
+      const tok = this.expect("NUMBER" /* NUMBER */, "REJECT LIMIT \u306B\u306F 0 \u4EE5\u4E0A\u306E\u6574\u6570\u304C\u5FC5\u8981\u3067\u3059");
+      if (!/^\d+$/.test(tok.value)) throw new ParseError("REJECT LIMIT \u306F 0 \u4EE5\u4E0A\u306E\u5B89\u5168\u306A\u6574\u6570\u3067\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044", tok);
+      rejectLimit = Number(tok.value);
+      if (!Number.isSafeInteger(rejectLimit)) throw new ParseError("REJECT LIMIT \u306F 0 \u4EE5\u4E0A\u306E\u5B89\u5168\u306A\u6574\u6570\u3067\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044", tok);
+    }
+    if (this.isSoftKeyword("REJECT") || this.isSoftKeyword("VALIDATE") || this.peek().kind === "ON" /* ON */) {
+      throw new ParseError("ON ERROR SKIP \u306E\u53E5\u304C\u91CD\u8907\u307E\u305F\u306F\u7AF6\u5408\u3057\u3066\u3044\u307E\u3059", onTok);
+    }
+    return { onErrorSkip: true, errorTable, rejectLimit };
+  }
+  isSoftKeyword(value) {
+    return this.peek().kind === "IDENT" /* IDENT */ && this.peek().value.toUpperCase() === value;
   }
   validateUpdateFromAssignments(assignments, sourceAlias, tok) {
     for (const assignment of assignments) {
@@ -2122,11 +2194,11 @@ var Parser = class {
     const leaves = this.flattenTopLevelAnd(where);
     const joins = [];
     leaves.forEach((leaf, index) => {
-      const sourceField = this.matchUpdateFromJoin(leaf, targetAppId, sourceAlias);
-      if (sourceField !== null) joins.push({ index, sourceField });
+      const matched = this.matchUpdateFromJoin(leaf, targetAppId, sourceAlias);
+      if (matched !== null) joins.push({ index, ...matched });
     });
     if (joins.length !== 1) {
-      throw new ParseError("UPDATE ... FROM \u306E WHERE \u306B\u306F target.$id = source.key \u306E\u7D50\u5408\u7B49\u5024\u304C\u3061\u3087\u3046\u30691\u3064\u5FC5\u8981\u3067\u3059", tok);
+      throw new ParseError("UPDATE ... FROM \u306E WHERE \u306B\u306F target.key = source.key \u306E\u7D50\u5408\u7B49\u5024\u304C\u3061\u3087\u3046\u30691\u3064\u5FC5\u8981\u3067\u3059", tok);
     }
     const join2 = joins[0];
     for (let i = 0; i < leaves.length; i++) {
@@ -2142,7 +2214,7 @@ var Parser = class {
       (acc, expr) => acc === null ? expr : { type: "LOGICAL", op: "AND", left: acc, right: expr },
       null
     );
-    return { joinKeyField: join2.sourceField, targetFilter };
+    return { targetJoinField: join2.targetField, joinKeyField: join2.sourceField, targetFilter };
   }
   flattenTopLevelAnd(expr) {
     if (expr.type === "GROUP") return this.flattenTopLevelAnd(expr.expr);
@@ -2156,16 +2228,20 @@ var Parser = class {
     const right = expr.right.type === "ARITH_VALUE" && expr.right.expr.type === "FIELD_REF" ? this.splitQualifiedField(expr.right.expr.field) : null;
     if (right === null) return null;
     const left = { alias: expr.left.tableAlias, field: expr.left.field };
-    if (this.isTargetIdRef(left, targetAppId) && this.isSourceRef(right, sourceAlias)) return right.field;
-    if (this.isSourceRef(left, sourceAlias) && this.isTargetIdRef(right, targetAppId)) return left.field;
+    if (this.isTargetRef(left, targetAppId) && this.isSourceRef(right, sourceAlias)) {
+      return { targetField: left.field, sourceField: right.field };
+    }
+    if (this.isSourceRef(left, sourceAlias) && this.isTargetRef(right, targetAppId)) {
+      return { targetField: right.field, sourceField: left.field };
+    }
     return null;
   }
   splitQualifiedField(field) {
     const dot = field.indexOf(".");
     return dot < 0 ? { alias: null, field } : { alias: field.slice(0, dot), field: field.slice(dot + 1) };
   }
-  isTargetIdRef(ref, appId) {
-    return ref.field === "$id" && (ref.alias === null || ref.alias.toLowerCase() === `app${appId}`.toLowerCase());
+  isTargetRef(ref, appId) {
+    return ref.alias === null || ref.alias.toLowerCase() === `app${appId}`.toLowerCase();
   }
   isSourceRef(ref, alias) {
     return ref.alias?.toLowerCase() === alias.toLowerCase();
@@ -2492,6 +2568,15 @@ function isDmlType(type) {
 function isReadOnlyType(type) {
   return type === "SELECT" || type === "UNION" || type === "WITH" || type === "EXPLAIN" || type === "SHOW_APPS" || type === "DESCRIBE" || type === "CREATE_TEMP_TABLE" || type === "DROP_TEMP_TABLE" || type === "SET_VARIABLE" || type === "DECLARE_VARIABLE" || type === "ASSERT";
 }
+function writesKintone(stmt) {
+  return isDmlType(stmt.type) && !("validateOnly" in stmt && stmt.validateOnly === true);
+}
+function isReadOnlyStatement(stmt) {
+  return !writesKintone(stmt) && (isReadOnlyType(stmt.type) || isDmlType(stmt.type));
+}
+function requiresCompleteInput(stmt) {
+  return isDmlType(stmt.type);
+}
 function hasWhereClause(stmt) {
   if (!stmt || typeof stmt !== "object") return false;
   const obj = stmt;
@@ -3731,11 +3816,17 @@ function analyzeBatch(statements) {
     }
   }
   const defined = /* @__PURE__ */ new Map();
+  const validationSchemas = /* @__PURE__ */ new Map();
   const createdOrder = [];
   const results = [];
   const variableDefs = /* @__PURE__ */ new Map();
   const variableOrder = [];
   statements.forEach((stmt, index) => {
+    const validationTable = "validationErrorTable" in stmt && stmt.validationErrorTable ? stmt.validationErrorTable : "onErrorSkip" in stmt && stmt.onErrorSkip ? stmt.errorTable ?? null : null;
+    if (statements.length === 1 && validationTable) {
+      const message = "onErrorSkip" in stmt && stmt.onErrorSkip ? "ArgumentError: ON ERROR SKIP requires a batch." : "ArgumentError: VALIDATE ONLY INTO requires a batch.";
+      throw new BatchAnalysisError(message, index);
+    }
     const statementType = getStatementType(stmt);
     const created = [];
     const dropped = [];
@@ -3790,6 +3881,28 @@ function analyzeBatch(statements) {
       }
       dependsOn.add(at);
     }
+    if (validationTable) {
+      const payloadFields = stmt.type === "UPDATE" ? ["$id", ...stmt.assignments.map((a) => a.field)] : "fields" in stmt ? stmt.fields : [];
+      const signature = JSON.stringify(payloadFields);
+      const at = defined.get(validationTable);
+      if (at === void 0) {
+        defined.set(validationTable, index);
+        validationSchemas.set(validationTable, signature);
+        createdOrder.push(validationTable);
+        created.push(validationTable);
+        if (defined.size > MAX_TEMP_TABLES) {
+          throw new BatchAnalysisError(`ParseError: batch exceeds ${MAX_TEMP_TABLES} temp tables.`, index);
+        }
+      } else {
+        if (validationSchemas.get(validationTable) !== signature) {
+          throw new BatchAnalysisError(
+            `ParseError: validation error table ${validationTable} has a different payload schema.`,
+            index
+          );
+        }
+        dependsOn.add(at);
+      }
+    }
     if (stmt.type === "CREATE_TEMP_TABLE") {
       if (defined.has(stmt.name)) {
         throw new BatchAnalysisError(
@@ -3822,8 +3935,8 @@ function analyzeBatch(statements) {
     results.push({
       index,
       statementType,
-      isDml: isDmlType(statementType),
-      isReadOnly: isReadOnlyType(statementType),
+      isDml: writesKintone(stmt),
+      isReadOnly: isReadOnlyStatement(stmt),
       hasWhere: hasWhereClause(stmt),
       insertValuesCount: getInsertValuesCount(stmt),
       appIds: [...stmtAppIds].sort((a, b) => a - b),
@@ -3833,10 +3946,15 @@ function analyzeBatch(statements) {
       dependsOn: [...dependsOn].sort((a, b) => a - b),
       tempOnlySource,
       targetAppId: isDmlType(statementType) && typeof stmt.appId === "number" ? stmt.appId : null,
-      isUpdateFrom: stmt.type === "UPDATE" && stmt.from != null
+      isUpdateFrom: stmt.type === "UPDATE" && stmt.from != null,
+      isValidationOnly: "validateOnly" in stmt && stmt.validateOnly === true,
+      isOnErrorSkip: "onErrorSkip" in stmt && stmt.onErrorSkip === true,
+      requiresCompleteInput: requiresCompleteInput(stmt)
     });
   });
   const containsDml = results.some((r) => r.isDml);
+  const containsValidationOnly = results.some((r) => r.isValidationOnly);
+  const needsCompleteInput = results.some((r) => r.requiresCompleteInput);
   const variables = variableOrder.map((name) => ({
     name,
     referencedBy: [...variableDefs.get(name).referencedBy]
@@ -3845,6 +3963,8 @@ function analyzeBatch(statements) {
     statementCount: statements.length,
     isReadOnlyBatch: !containsDml && results.every((r) => r.isReadOnly),
     containsDml,
+    containsValidationOnly,
+    requiresCompleteInput: needsCompleteInput,
     tempTables: createdOrder,
     variables,
     warnings: variables.filter((v) => v.referencedBy.length === 0).map((v) => `variable @${v.name} is never used.`),
@@ -4654,6 +4774,18 @@ function evalCaseWhenValue(expr, row, fieldType) {
   return "";
 }
 function toKintoneValue(value, fieldType) {
+  const result = normalizeDmlSqlValue(value, fieldType);
+  if (!result.ok) throw new DmlConvertError(result.message);
+  return result.value;
+}
+function normalizeDmlSqlValue(value, fieldType) {
+  try {
+    return { ok: true, value: convertDmlSqlValue(value, fieldType) };
+  } catch (e) {
+    return { ok: false, message: e instanceof Error ? e.message : String(e) };
+  }
+}
+function convertDmlSqlValue(value, fieldType) {
   switch (value.type) {
     case "VARIABLE":
       throw new DmlConvertError(`\u672A\u89E3\u6C7A\u306E\u30D0\u30C3\u30C1\u5909\u6570 @${value.name} \u304C\u3042\u308A\u307E\u3059`);
@@ -4958,7 +5090,7 @@ function hasAggregateColumns(columns) {
     (c) => c.type === "AGGREGATE" || c.type === "ARITH_AGG_COL" || c.type === "STRFUNC_COL" && hasAggregateInStringFuncExpr2(c.expr)
   );
 }
-function applyGroupBy(rows, groupByKeys, columns) {
+function applyGroupBy(rows, groupByKeys, columns, resolveAggSortKind) {
   const groups = /* @__PURE__ */ new Map();
   for (const row of rows) {
     const key = groupByKeys.map((k) => evalGroupByKey(k, row)).join("\0");
@@ -4982,15 +5114,15 @@ function applyGroupBy(rows, groupByKeys, columns) {
     for (const col of columns) {
       if (col.type === "AGGREGATE") {
         const syntheticKey = aggregateSyntheticName2(col.func, col.distinct, col.arg);
-        const value = String(evalAggregate(col.func, col.distinct, col.arg, groupRows));
+        const value = String(evalAggregate(col.func, col.distinct, col.arg, groupRows, resolveAggSortKind));
         outRow[col.alias ?? syntheticKey] = value;
         if (col.alias) outRow[syntheticKey] = value;
       } else if (col.type === "ARITH_AGG_COL") {
         const outputKey = col.alias ?? aggArithDefaultKey(col.expr);
-        outRow[outputKey] = String(evalAggArithExpr(col.expr, groupRows));
+        outRow[outputKey] = String(evalAggArithExpr(col.expr, groupRows, resolveAggSortKind));
       } else if (col.type === "STRFUNC_COL" && hasAggregateInStringFuncExpr2(col.expr)) {
         const outputKey = col.alias ?? stringFuncDefaultKey(col.expr);
-        const resolvedExpr = resolveAggInStringFuncExpr(col.expr, groupRows);
+        const resolvedExpr = resolveAggInStringFuncExpr(col.expr, groupRows, resolveAggSortKind);
         outRow[outputKey] = evalStringFunc(resolvedExpr, outRow);
       }
     }
@@ -5003,7 +5135,7 @@ function evalGroupByKey(key, row) {
   if (key.type === "FUNC_KEY") return evalStringFunc(key.expr, row);
   return String(evalArithExpr(key.expr, row));
 }
-function evalAggregate(func, distinct, arg, rows) {
+function evalAggregate(func, distinct, arg, rows, resolveAggSortKind) {
   if (arg.type === "WILDCARD") {
     return func === "COUNT" ? rows.length : 0;
   }
@@ -5023,6 +5155,11 @@ function evalAggregate(func, distinct, arg, rows) {
   }
   const eff = distinct ? [...new Set(strValues)] : strValues;
   if (func === "COUNT") return eff.length;
+  const sortKind = (func === "MIN" || func === "MAX") && arg.type === "FIELD_REF" ? resolveAggSortKind?.(toAggregateFieldRef(arg.field)) : void 0;
+  if (sortKind === "string") {
+    if (eff.length === 0) return "";
+    return func === "MAX" ? maxStringOf(eff) : minStringOf(eff);
+  }
   const nums = eff.map(Number);
   switch (func) {
     case "SUM":
@@ -5036,6 +5173,20 @@ function evalAggregate(func, distinct, arg, rows) {
       return nums.length === 0 ? 0 : minOf(nums);
   }
 }
+function toAggregateFieldRef(field) {
+  const dot = field.indexOf(".");
+  return dot > 0 ? { type: "FIELD", tableAlias: field.slice(0, dot), field: field.slice(dot + 1) } : { type: "FIELD", tableAlias: null, field };
+}
+function maxStringOf(values) {
+  let value = values[0];
+  for (const candidate of values) if (candidate > value) value = candidate;
+  return value;
+}
+function minStringOf(values) {
+  let value = values[0];
+  for (const candidate of values) if (candidate < value) value = candidate;
+  return value;
+}
 function maxOf(nums) {
   let m = nums[0];
   for (const n of nums) if (n > m) m = n;
@@ -5046,11 +5197,11 @@ function minOf(nums) {
   for (const n of nums) if (n < m) m = n;
   return m;
 }
-function evalAggArithExpr(node, rows) {
+function evalAggArithExpr(node, rows, resolveAggSortKind) {
   if (node.type === "NUMBER") return node.value;
-  if (node.type === "AGG_REF") return evalAggregate(node.func, node.distinct, node.arg, rows);
-  const l = evalAggArithExpr(node.left, rows);
-  const r = evalAggArithExpr(node.right, rows);
+  if (node.type === "AGG_REF") return Number(evalAggregate(node.func, node.distinct, node.arg, rows, resolveAggSortKind));
+  const l = evalAggArithExpr(node.left, rows, resolveAggSortKind);
+  const r = evalAggArithExpr(node.right, rows, resolveAggSortKind);
   switch (node.op) {
     case "+":
       return l + r;
@@ -5395,26 +5546,24 @@ function hasAggregateInStringFuncArg(arg) {
 function hasAggregateInStringFuncExpr2(expr) {
   return expr.args.some((arg) => hasAggregateInStringFuncArg(arg));
 }
-function resolveAggInStringFuncArg(arg, rows) {
+function resolveAggInStringFuncArg(arg, rows, resolveAggSortKind) {
   if (arg.type === "AGG_REF") {
-    return {
-      type: "NUMBER",
-      value: evalAggregate(arg.func, arg.distinct, arg.arg, rows)
-    };
+    const value = evalAggregate(arg.func, arg.distinct, arg.arg, rows, resolveAggSortKind);
+    return typeof value === "number" ? { type: "NUMBER", value } : { type: "STRING", value };
   }
   if (arg.type === "AGG_ARITH") {
-    return { type: "NUMBER", value: evalAggArithExpr(arg, rows) };
+    return { type: "NUMBER", value: evalAggArithExpr(arg, rows, resolveAggSortKind) };
   }
   if (arg.type === "STRING_FUNC") {
-    return resolveAggInStringFuncExpr(arg, rows);
+    return resolveAggInStringFuncExpr(arg, rows, resolveAggSortKind);
   }
   return arg;
 }
-function resolveAggInStringFuncExpr(expr, rows) {
+function resolveAggInStringFuncExpr(expr, rows, resolveAggSortKind) {
   return {
     type: "STRING_FUNC",
     func: expr.func,
-    args: expr.args.map((arg) => resolveAggInStringFuncArg(arg, rows))
+    args: expr.args.map((arg) => resolveAggInStringFuncArg(arg, rows, resolveAggSortKind))
   };
 }
 function runFullScan(input) {
@@ -5426,6 +5575,7 @@ function runFullScan(input) {
     sortKinds,
     fieldTypeResolver,
     havingFieldTypeResolver,
+    aggregateSortKindResolver,
     appliedKlikes,
     sourceColumns
   } = input;
@@ -5441,7 +5591,7 @@ function runFullScan(input) {
   }
   rows = applyFilter(rows, stmt.where, fieldTypeResolver, appliedKlikes);
   if (stmt.groupBy.length > 0 || hasAggregateColumns(stmt.columns)) {
-    rows = applyGroupBy(rows, stmt.groupBy, stmt.columns);
+    rows = applyGroupBy(rows, stmt.groupBy, stmt.columns, aggregateSortKindResolver);
   }
   rows = applyHaving(rows, stmt.having, havingFieldTypeResolver);
   if (stmt.distinct) {
@@ -5494,6 +5644,228 @@ function toFlatString(value) {
   }
 }
 
+// src/core/dmlValidation.ts
+var ARRAY_TYPES2 = /* @__PURE__ */ new Set(["CHECK_BOX", "MULTI_SELECT"]);
+var CHOICE_TYPES = /* @__PURE__ */ new Set(["DROP_DOWN", "RADIO_BUTTON", "CHECK_BOX", "MULTI_SELECT"]);
+function validateAndNormalizeDmlValue(raw, field) {
+  if (field.fieldType === "DATE" || field.fieldType === "TIME" || field.fieldType === "DATETIME") {
+    const original = rawScalarText(raw);
+    if (original !== "" && !isValidTemporalInput(original, field.fieldType)) {
+      return { ok: false, code: "ERR_TYPE_DATE", message: `${field.code} \u306E\u65E5\u4ED8\u30FB\u6642\u523B\u5F62\u5F0F\u304C\u4E0D\u6B63\u3067\u3059` };
+    }
+  }
+  let value;
+  try {
+    value = normalizeRaw(raw, field.fieldType);
+  } catch (e) {
+    const message = e instanceof Error ? e.message : String(e);
+    return { ok: false, code: typeCode(field.fieldType), message };
+  }
+  if (field.required && isEmpty(value)) {
+    return { ok: false, code: "ERR_REQUIRED", message: `${field.code} \u306F\u5FC5\u9808\u3067\u3059` };
+  }
+  if (!isEmpty(value) && field.fieldType === "NUMBER") {
+    const text = String(value);
+    if (!isFiniteDecimal(text)) {
+      return { ok: false, code: "ERR_TYPE_NUMBER", message: `${field.code} \u306F\u6570\u5024\u3067\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044` };
+    }
+    if (field.minValue != null && compareDecimal(text, field.minValue) < 0) {
+      return { ok: false, code: "ERR_RANGE_MIN", message: `${field.code} \u306F ${field.minValue} \u4EE5\u4E0A\u3067\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044` };
+    }
+    if (field.maxValue != null && compareDecimal(text, field.maxValue) > 0) {
+      return { ok: false, code: "ERR_RANGE_MAX", message: `${field.code} \u306F ${field.maxValue} \u4EE5\u4E0B\u3067\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044` };
+    }
+  }
+  if (!isEmpty(value) && (field.fieldType === "DATE" || field.fieldType === "TIME" || field.fieldType === "DATETIME")) {
+    if (!isValidTemporal(String(value), field.fieldType)) {
+      return { ok: false, code: "ERR_TYPE_DATE", message: `${field.code} \u306E\u65E5\u4ED8\u30FB\u6642\u523B\u5F62\u5F0F\u304C\u4E0D\u6B63\u3067\u3059` };
+    }
+  }
+  if (typeof value === "string") {
+    const length = value.length;
+    const min = field.minLength == null ? null : Number(field.minLength);
+    const max = field.maxLength == null ? null : Number(field.maxLength);
+    if (Number.isFinite(min) && length < min) {
+      return { ok: false, code: "ERR_LENGTH_MIN", message: `${field.code} \u306F ${min} \u6587\u5B57\u4EE5\u4E0A\u3067\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044` };
+    }
+    if (Number.isFinite(max) && length > max) {
+      return { ok: false, code: "ERR_LENGTH_MAX", message: `${field.code} \u306F ${max} \u6587\u5B57\u4EE5\u4E0B\u3067\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044` };
+    }
+  }
+  if (CHOICE_TYPES.has(field.fieldType) && field.optionOrder) {
+    const selected = Array.isArray(value) ? value.map(String) : [String(value)];
+    if (selected.some((choice) => !(choice in field.optionOrder))) {
+      return { ok: false, code: "ERR_CHOICE_INVALID", message: `${field.code} \u306B\u5B9A\u7FA9\u5916\u306E\u9078\u629E\u80A2\u304C\u3042\u308A\u307E\u3059` };
+    }
+  }
+  return { ok: true, value };
+}
+function rawScalarText(raw) {
+  if (raw == null) return "";
+  if (isSqlValue(raw) && (raw.type === "STRING" || raw.type === "NUMBER")) return String(raw.value);
+  return typeof raw === "string" || typeof raw === "number" ? String(raw) : "";
+}
+function isValidTemporalInput(value, type) {
+  if (type === "DATE") return isValidTemporal(value.replace(/\//g, "-"), "DATE");
+  if (type === "TIME") return isValidTemporal(value, "TIME");
+  let normalized = value.replace(/\//g, "-").replace(" ", "T");
+  if (/T\d{2}:\d{2}$/.test(normalized)) normalized += ":00";
+  if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}$/.test(normalized)) {
+    return isValidTemporal(normalized.slice(0, 10), "DATE") && isValidTemporal(normalized.slice(11), "TIME");
+  }
+  return isValidTemporal(normalized, "DATETIME");
+}
+function normalizeRaw(raw, fieldType) {
+  if (isSqlValue(raw)) {
+    const normalized = normalizeDmlSqlValue(raw, fieldType);
+    if (!normalized.ok) throw new Error(normalized.message);
+    return normalized.value;
+  }
+  if (Array.isArray(raw)) return raw.map((v) => typeof v === "object" && v !== null && "code" in v ? String(v.code) : String(v));
+  const text = raw == null ? "" : String(raw);
+  if (ARRAY_TYPES2.has(fieldType)) {
+    if (text === "") return [];
+    try {
+      const parsed = JSON.parse(text);
+      if (Array.isArray(parsed)) return parsed.map(String);
+    } catch {
+    }
+    return text.split(",").map((v) => v.trim());
+  }
+  return text;
+}
+function isSqlValue(value) {
+  return typeof value === "object" && value !== null && typeof value.type === "string";
+}
+function isEmptyDmlValue(value) {
+  if (value == null || value === "") return true;
+  if (Array.isArray(value)) return value.length === 0;
+  if (isSqlValue(value)) {
+    if (value.type === "STRING") return value.value === "";
+    if (value.type === "ARRAY") return value.elements.length === 0;
+  }
+  return false;
+}
+function isEmpty(value) {
+  return value === "" || Array.isArray(value) && value.length === 0;
+}
+function typeCode(type) {
+  return type === "NUMBER" ? "ERR_TYPE_NUMBER" : "ERR_TYPE_DATE";
+}
+function isFiniteDecimal(value) {
+  return /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)$/.test(value.trim());
+}
+function compareDecimal(left, right) {
+  const normalize = (input) => {
+    let s = input.trim();
+    let sign = 1;
+    if (s.startsWith("-")) {
+      sign = -1;
+      s = s.slice(1);
+    } else if (s.startsWith("+")) s = s.slice(1);
+    let [whole, fraction = ""] = s.split(".");
+    whole = (whole || "0").replace(/^0+(?=\d)/, "");
+    fraction = fraction.replace(/0+$/, "");
+    if (/^0*$/.test(whole) && fraction === "") sign = 1;
+    return { sign, whole, fraction };
+  };
+  const a = normalize(left);
+  const b = normalize(right);
+  if (a.sign !== b.sign) return a.sign < b.sign ? -1 : 1;
+  const direction = a.sign;
+  if (a.whole.length !== b.whole.length) return a.whole.length < b.whole.length ? -direction : direction;
+  if (a.whole !== b.whole) return a.whole < b.whole ? -direction : direction;
+  const width = Math.max(a.fraction.length, b.fraction.length);
+  const af = a.fraction.padEnd(width, "0");
+  const bf = b.fraction.padEnd(width, "0");
+  return af === bf ? 0 : af < bf ? -direction : direction;
+}
+function isValidTemporal(value, type) {
+  if (type === "TIME") {
+    const m2 = /^(\d{2}):(\d{2})(?::(\d{2}))?$/.exec(value);
+    return m2 !== null && Number(m2[1]) <= 23 && Number(m2[2]) <= 59 && Number(m2[3] ?? 0) <= 59;
+  }
+  const datePart = type === "DATE" ? value : value.slice(0, 10);
+  const m = /^(\d{4})-(\d{2})-(\d{2})$/.exec(datePart);
+  if (!m) return false;
+  const year = Number(m[1]);
+  const month = Number(m[2]);
+  const day = Number(m[3]);
+  const date = new Date(Date.UTC(year, month - 1, day));
+  if (date.getUTCFullYear() !== year || date.getUTCMonth() !== month - 1 || date.getUTCDate() !== day) return false;
+  if (type === "DATE") return true;
+  return /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(?::\d{2})?(?:Z|[+-]\d{2}:\d{2})$/.test(value) && isValidTemporal(value.slice(11, value.endsWith("Z") ? -1 : value.length - 6), "TIME");
+}
+
+// src/core/dmlValidationCandidates.ts
+var VALIDATION_META_COLUMNS = [
+  "$err_statement",
+  "$err_operation",
+  "$err_row",
+  "$err_field",
+  "$err_code",
+  "$err_message"
+];
+function validateDmlCandidates(candidates, operation, payloadFields, targetFields, fieldInfos, statementNumber) {
+  const infoByCode = new Map(fieldInfos.map((field) => [field.code, field]));
+  const errors = [];
+  const invalid = /* @__PURE__ */ new Set();
+  for (const candidate of candidates) {
+    candidate.record ??= {};
+    const rowErrors = [...candidate.preErrors];
+    for (const code of targetFields) {
+      const result = validateAndNormalizeDmlValue(candidate.payload.get(code), infoByCode.get(code));
+      if (!result.ok) rowErrors.push({ field: code, code: result.code, message: result.message });
+      else candidate.record[code] = { value: result.value };
+    }
+    if (candidate.mode === "create") {
+      for (const info of fieldInfos) {
+        if (info.inSubtable) continue;
+        if (candidate.payload.has(info.code)) continue;
+        const emptyDefault = isEmptyDmlValue(info.defaultValue);
+        if (!emptyDefault) {
+          const defaultResult = validateAndNormalizeDmlValue(info.defaultValue, info);
+          if (!defaultResult.ok) rowErrors.push({
+            field: info.code,
+            code: defaultResult.code,
+            message: `\u65E2\u5B9A\u5024: ${defaultResult.message}`
+          });
+        } else {
+          const emptyResult = validateAndNormalizeDmlValue("", info);
+          if (!emptyResult.ok) {
+            rowErrors.push({ field: info.code, code: emptyResult.code, message: emptyResult.message });
+          } else if (info.required) {
+            rowErrors.push({ field: info.code, code: "ERR_REQUIRED", message: `${info.code} \u306F\u5FC5\u9808\u3067\u3059` });
+          }
+        }
+      }
+    }
+    if (rowErrors.length > 0) invalid.add(candidate.rowNumber);
+    for (const error of rowErrors) {
+      const row = {};
+      for (const field of payloadFields) row[field] = renderValidationValue(candidate.payload.get(field));
+      row["$err_statement"] = String(statementNumber);
+      row["$err_operation"] = operation;
+      row["$err_row"] = String(candidate.rowNumber);
+      row["$err_field"] = error.field;
+      row["$err_code"] = error.code;
+      row["$err_message"] = error.message;
+      errors.push(row);
+    }
+  }
+  return { errors, invalidRows: invalid.size, invalidRowNumbers: invalid };
+}
+function renderValidationValue(value) {
+  if (value == null) return "";
+  if (typeof value === "object" && "type" in value) {
+    const sql = value;
+    if (sql.type === "STRING" || sql.type === "NUMBER") return String(sql.value ?? "");
+    if (sql.type === "ARRAY") return JSON.stringify(sql.elements?.map((e) => e.value) ?? []);
+  }
+  if (Array.isArray(value)) return JSON.stringify(value);
+  return String(value);
+}
+
 // src/execute.ts
 var SEARCH_ABORTED_WARNING = "\u691C\u7D22\u304C 10 \u4E07\u4EF6\u3067\u6253\u3061\u5207\u3089\u308C\u3001\u7D50\u679C\u304C\u6B20\u843D\u3057\u305F\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002";
 var SearchAbortedError = class extends Error {
@@ -5597,6 +5969,15 @@ async function executeParsedStatement(stmt, client, options, cacheContext) {
     throw new Error(`ParseError: variable @${unresolved} is not defined in a batch.`);
   }
   validateKlikeStatement(stmt);
+  if ("validateOnly" in stmt && stmt.validateOnly === true) {
+    if (stmt.validationErrorTable) {
+      throw new Error("ArgumentError: VALIDATE ONLY INTO requires a batch.");
+    }
+    return executeDmlValidation(stmt, client, { ...options, onLimitReached: "error" }, cacheContext, void 0, 1);
+  }
+  if ("onErrorSkip" in stmt && stmt.onErrorSkip === true) {
+    throw new Error("ArgumentError: ON ERROR SKIP requires a batch.");
+  }
   switch (stmt.type) {
     case "SELECT":
       return executeSelect(stmt, client, options, cacheContext);
@@ -5638,6 +6019,17 @@ async function executeParsedStatement(stmt, client, options, cacheContext) {
   }
 }
 var TEMP_TABLE_MAX_ROWS = 1e4;
+function appendValidationErrors(tempTables, name, columns, rows, maxRows) {
+  const current = tempTables.get(name);
+  if (current && (current.columns.length !== columns.length || current.columns.some((c, i) => c !== columns[i]))) {
+    throw new Error(`ArgumentError: validation error table ${name} has a different schema.`);
+  }
+  const existingRows = current?.rows ?? [];
+  if (existingRows.length + rows.length > maxRows) {
+    throw new Error(`ArgumentError: temp table ${name} exceeds max rows (${maxRows}).`);
+  }
+  tempTables.set(name, { columns: [...columns], rows: [...existingRows, ...rows] });
+}
 var BatchTimeoutError = class extends Error {
   constructor() {
     super("TimeoutError: batch timeout exceeded.");
@@ -5719,7 +6111,12 @@ async function executeBatch(sql, client, options = {}) {
       }
       results.push({ ...base, status: "success", ...outcome });
     } catch (e) {
-      results.push({ ...base, status: "error", error: toBatchStatementError(e) });
+      results.push({
+        ...base,
+        status: "error",
+        error: toBatchStatementError(e),
+        ...e instanceof RejectLimitExceededError ? { result: e.diagnostic } : {}
+      });
       failed.add(i);
       if (e instanceof BatchTimeoutError) {
         aborted = "timeout";
@@ -5778,6 +6175,38 @@ async function executeBatchStatement(stmt, info, client, options, cacheContext,
   }
   const resolvedStmt = resolveVariableRefs(stmt, variables);
   validateKlikeStatement(resolvedStmt);
+  if ("validateOnly" in resolvedStmt && resolvedStmt.validateOnly === true) {
+    const result = await executeDmlValidation(
+      resolvedStmt,
+      client,
+      { ...options, onLimitReached: "error" },
+      cacheContext,
+      tempTables,
+      info.index + 1
+    );
+    if (resolvedStmt.validationErrorTable) {
+      appendValidationErrors(
+        tempTables,
+        resolvedStmt.validationErrorTable,
+        result.columns,
+        result.errors,
+        options.tempTableMaxRows ?? TEMP_TABLE_MAX_ROWS
+      );
+    }
+    return { result };
+  }
+  if ("onErrorSkip" in resolvedStmt && resolvedStmt.onErrorSkip === true) {
+    return {
+      result: await executeOnErrorSkip(
+        resolvedStmt,
+        client,
+        { ...options, onLimitReached: "error" },
+        cacheContext,
+        tempTables,
+        info.index + 1
+      )
+    };
+  }
   if (resolvedStmt.type === "CREATE_TEMP_TABLE") {
     const materializeOptions = {
       ...options,
@@ -6311,6 +6740,116 @@ async function loadTypedInFieldTypes(stmt, client, cacheContext) {
   const entries = await Promise.all([...appIds].map(async (appId) => [appId, await getFieldTypeMap(appId, client, cacheContext)]));
   return new Map(entries);
 }
+function aggregateFieldRef(field) {
+  const dot = field.indexOf(".");
+  return dot > 0 ? { type: "FIELD", tableAlias: field.slice(0, dot), field: field.slice(dot + 1) } : { type: "FIELD", tableAlias: null, field };
+}
+function collectAggregateRef(func, arg, out) {
+  if ((func === "MIN" || func === "MAX") && arg.type === "FIELD_REF" && arg.field) {
+    out.push(aggregateFieldRef(arg.field));
+  }
+}
+function collectAggregateOperandRefs(node, out) {
+  if (node.type === "AGG_REF") {
+    collectAggregateRef(node.func, node.arg, out);
+    return;
+  }
+  if (node.type === "AGG_ARITH") {
+    collectAggregateOperandRefs(node.left, out);
+    collectAggregateOperandRefs(node.right, out);
+  }
+}
+function collectStringFuncAggregateRefs(expr, out) {
+  for (const arg of expr.args) {
+    if (arg.type === "AGG_REF" || arg.type === "AGG_ARITH") {
+      collectAggregateOperandRefs(arg, out);
+    } else if (arg.type === "STRING_FUNC") {
+      collectStringFuncAggregateRefs(arg, out);
+    }
+  }
+}
+function collectSelectAggregateSortRefs(columns) {
+  const refs = [];
+  for (const column of columns) {
+    if (column.type === "AGGREGATE") {
+      collectAggregateRef(column.func, column.arg, refs);
+    } else if (column.type === "ARITH_AGG_COL") {
+      collectAggregateOperandRefs(column.expr, refs);
+    } else if (column.type === "STRFUNC_COL") {
+      collectStringFuncAggregateRefs(column.expr, refs);
+    }
+  }
+  return refs;
+}
+var AGGREGATE_STRING_FIELD_TYPES = /* @__PURE__ */ new Set([
+  "SINGLE_LINE_TEXT",
+  "MULTI_LINE_TEXT",
+  "RICH_TEXT",
+  "LINK",
+  "DROP_DOWN",
+  "RADIO_BUTTON",
+  "STATUS",
+  "DATE",
+  "TIME",
+  "DATETIME",
+  "CREATED_TIME",
+  "UPDATED_TIME"
+]);
+function aggregateSortKind(info) {
+  if (info.sortKind !== void 0) return info.sortKind;
+  if (info.fieldType === "NUMBER" || info.fieldType === "RECORD_NUMBER") return "number";
+  return AGGREGATE_STRING_FIELD_TYPES.has(info.fieldType) ? "string" : void 0;
+}
+async function loadAggregateSortKindResolver(stmt, client, cacheContext) {
+  const refs = collectSelectAggregateSortRefs(stmt.columns);
+  if (refs.length === 0) return void 0;
+  const appIds = /* @__PURE__ */ new Set();
+  const physicalTables = physicalSelectTables(stmt);
+  for (const ref of refs) {
+    if (ref.tableAlias !== null) {
+      if (ref.tableAlias === "_p" && stmt.from.subtableCode && stmt.from.cteName === null) {
+        appIds.add(stmt.from.appId);
+        continue;
+      }
+      const table = findTableForAlias(stmt, ref.tableAlias);
+      if (table && table.cteName === null) appIds.add(table.appId);
+    } else if (stmt.joins.length === 0) {
+      if (stmt.from.cteName === null) appIds.add(stmt.from.appId);
+    } else {
+      if ([stmt.from, ...stmt.joins.map((join2) => join2.table)].some((table) => table.cteName !== null)) continue;
+      for (const table of physicalTables) appIds.add(table.appId);
+    }
+  }
+  if (appIds.size === 0) return void 0;
+  const fieldInfosByApp = new Map(
+    await Promise.all([...appIds].map(async (appId) => {
+      const infos = await getFieldsCached(appId, client, cacheContext);
+      return [appId, new Map(infos.map((info) => [info.code, info]))];
+    }))
+  );
+  const tables = [stmt.from, ...stmt.joins.map((join2) => join2.table)];
+  return (ref) => {
+    let info;
+    if (ref.tableAlias !== null) {
+      if (ref.tableAlias === "_p" && stmt.from.subtableCode && stmt.from.cteName === null) {
+        info = fieldInfosByApp.get(stmt.from.appId)?.get(ref.field);
+      } else {
+        const table = tables.find((candidate) => candidate.alias === ref.tableAlias);
+        if (!table || table.cteName !== null) return void 0;
+        info = fieldInfosByApp.get(table.appId)?.get(fieldCodeForTypeLookup(table, ref.field));
+      }
+    } else if (stmt.joins.length === 0) {
+      if (stmt.from.cteName !== null) return void 0;
+      info = fieldInfosByApp.get(stmt.from.appId)?.get(fieldCodeForTypeLookup(stmt.from, ref.field));
+    } else {
+      if (tables.some((table) => table.cteName !== null)) return void 0;
+      const matches = physicalTables.map((table) => fieldInfosByApp.get(table.appId)?.get(fieldCodeForTypeLookup(table, ref.field))).filter((candidate) => candidate !== void 0);
+      if (matches.length !== 1) return void 0;
+      info = matches[0];
+    }
+    return info ? aggregateSortKind(info) : void 0;
+  };
+}
 function fieldCodeForTypeLookup(table, field) {
   if (table.subtableCode && field.startsWith("_p.")) return field.slice(3);
   return field;
@@ -6356,9 +6895,10 @@ async function executeFullScanSelect(stmt, client, options, cacheContext, cteCac
     resolveSubqueries(stmt.where, client, options, cacheContext, cteCache),
     resolveSubqueries(stmt.having, client, options, cacheContext, cteCache)
   ]);
-  const [pushdownMeta, typedInFieldTypes] = await Promise.all([
+  const [pushdownMeta, typedInFieldTypes, aggregateSortKindResolver] = await Promise.all([
     loadTypedPushdownMeta(stmt, client, cacheContext),
-    loadTypedInFieldTypes(stmt, client, cacheContext)
+    loadTypedInFieldTypes(stmt, client, cacheContext),
+    loadAggregateSortKindResolver(stmt, client, cacheContext)
   ]);
   const fieldTypeResolvers = buildSelectFieldTypeResolvers(stmt, typedInFieldTypes);
   const pushdownPlan = buildKlikePushdownPlan(stmt, pushdownMeta);
@@ -6446,6 +6986,7 @@ async function executeFullScanSelect(stmt, client, options, cacheContext, cteCac
     sortKinds,
     fieldTypeResolver: fieldTypeResolvers.row,
     havingFieldTypeResolver: fieldTypeResolvers.having,
+    aggregateSortKindResolver,
     appliedKlikes: pushdownPlan.appliedKlikes
   });
   return { type: "SELECT", rows, columns, rowCount: rows.length, warnings: [...warnings] };
@@ -6529,9 +7070,10 @@ async function executeFullScanWithCte(stmt, client, options, cteCache, cacheCont
     resolveSubqueries(stmt.having, client, options, cacheContext, cteCache),
     resolveSelectCaseSubqueries(stmt, client, options, cacheContext, cteCache)
   ]);
-  const [pushdownMeta, typedInFieldTypes] = await Promise.all([
+  const [pushdownMeta, typedInFieldTypes, aggregateSortKindResolver] = await Promise.all([
     loadTypedPushdownMeta(stmt, client, cacheContext),
-    loadTypedInFieldTypes(stmt, client, cacheContext)
+    loadTypedInFieldTypes(stmt, client, cacheContext),
+    loadAggregateSortKindResolver(stmt, client, cacheContext)
   ]);
   const fieldTypeResolvers = buildSelectFieldTypeResolvers(stmt, typedInFieldTypes);
   const pushdownPlan = buildKlikePushdownPlan(stmt, pushdownMeta);
@@ -6603,6 +7145,7 @@ async function executeFullScanWithCte(stmt, client, options, cteCache, cacheCont
     sortKinds,
     fieldTypeResolver: fieldTypeResolvers.row,
     havingFieldTypeResolver: fieldTypeResolvers.having,
+    aggregateSortKindResolver,
     appliedKlikes: pushdownPlan.appliedKlikes,
     sourceColumns
   });
@@ -6926,7 +7469,7 @@ async function buildSortKindsForSelect(stmt, client, cacheContext) {
 }
 function convertProcessRowValue(raw, dstFieldType) {
   const USER_TYPES2 = /* @__PURE__ */ new Set(["USER_SELECT", "ORGANIZATION_SELECT", "GROUP_SELECT"]);
-  const ARRAY_TYPES2 = /* @__PURE__ */ new Set(["CHECK_BOX", "MULTI_SELECT"]);
+  const ARRAY_TYPES3 = /* @__PURE__ */ new Set(["CHECK_BOX", "MULTI_SELECT"]);
   if (USER_TYPES2.has(dstFieldType ?? "")) {
     if (raw === "") return [];
     try {
@@ -6938,7 +7481,7 @@ function convertProcessRowValue(raw, dstFieldType) {
     }
     return raw.split(",").map((c) => ({ code: c.trim() }));
   }
-  if (ARRAY_TYPES2.has(dstFieldType ?? "")) {
+  if (ARRAY_TYPES3.has(dstFieldType ?? "")) {
     if (raw === "") return [];
     try {
       const parsed = JSON.parse(raw);
@@ -6949,6 +7492,396 @@ function convertProcessRowValue(raw, dstFieldType) {
   }
   return raw;
 }
+var NON_WRITABLE_FIELD_TYPES = /* @__PURE__ */ new Set([
+  "CALC",
+  "RECORD_NUMBER",
+  "CREATOR",
+  "CREATED_TIME",
+  "MODIFIER",
+  "UPDATED_TIME",
+  "STATUS",
+  "STATUS_ASSIGNEE",
+  "CATEGORY",
+  "REFERENCE_TABLE"
+]);
+async function executeDmlValidation(stmt, client, options, cacheContext, tempTables, statementNumber) {
+  return (await prepareDmlValidation(stmt, client, options, cacheContext, tempTables, statementNumber)).result;
+}
+var RejectLimitExceededError = class extends Error {
+  constructor(message, diagnostic) {
+    super(`RejectLimitExceededError: ${message}`);
+    this.diagnostic = diagnostic;
+    this.name = "RejectLimitExceededError";
+  }
+};
+async function prepareDmlValidation(stmt, client, options, cacheContext, tempTables, statementNumber) {
+  const operation = stmt.type === "UPDATE" ? "UPDATE" : stmt.type.startsWith("UPSERT") ? "UPSERT" : "INSERT";
+  const payloadFields = stmt.type === "UPDATE" ? ["$id", ...stmt.assignments.map((a) => a.field)] : [...stmt.fields];
+  if (new Set(payloadFields).size !== payloadFields.length) {
+    throw new Error("ArgumentError: DML target fields contain duplicates.");
+  }
+  const fieldInfos = await getFieldsCached(stmt.appId, client, cacheContext);
+  const infoByCode = new Map(fieldInfos.map((field) => [field.code, field]));
+  const targetFields = stmt.type === "UPDATE" ? stmt.assignments.map((a) => a.field) : stmt.fields;
+  for (const code of targetFields) {
+    const info = infoByCode.get(code);
+    if (!info) throw new Error(`ArgumentError: DML target field ${code} does not exist.`);
+    if (info.writable === false || NON_WRITABLE_FIELD_TYPES.has(info.fieldType)) {
+      throw new Error(`ArgumentError: DML target field ${code} is not writable (${info.fieldType}).`);
+    }
+  }
+  const candidates = await materializeValidationCandidates(stmt, operation, client, options, cacheContext, tempTables, infoByCode);
+  const { errors, invalidRows, invalidRowNumbers } = validateDmlCandidates(
+    candidates,
+    operation,
+    payloadFields,
+    targetFields,
+    fieldInfos,
+    statementNumber
+  );
+  const columns = [...payloadFields, ...VALIDATION_META_COLUMNS];
+  const result = {
+    type: "VALIDATION",
+    operation,
+    validatedRows: candidates.length,
+    validRows: candidates.length - invalidRows,
+    invalidRows,
+    errorCount: errors.length,
+    columns,
+    errors,
+    ...stmt.validationErrorTable ? { errTable: stmt.validationErrorTable } : stmt.onErrorSkip && stmt.errorTable ? { errTable: stmt.errorTable } : {}
+  };
+  return { result, candidates, invalidRowNumbers };
+}
+async function executeOnErrorSkip(stmt, client, options, cacheContext, tempTables, statementNumber) {
+  const prepared = await prepareDmlValidation(
+    stmt,
+    client,
+    options,
+    cacheContext,
+    tempTables,
+    statementNumber
+  );
+  const errTable = stmt.errorTable;
+  if (!errTable) throw new Error("ArgumentError: ON ERROR SKIP requires INTO #error_table.");
+  appendValidationErrors(
+    tempTables,
+    errTable,
+    prepared.result.columns,
+    prepared.result.errors,
+    options.tempTableMaxRows ?? TEMP_TABLE_MAX_ROWS
+  );
+  const rejectLimit = stmt.rejectLimit ?? null;
+  if (rejectLimit !== null && prepared.result.invalidRows > rejectLimit) {
+    throw new RejectLimitExceededError(
+      `rejected rows (${prepared.result.invalidRows}) exceed REJECT LIMIT (${rejectLimit}).`,
+      prepared.result
+    );
+  }
+  const valid = prepared.candidates.filter((candidate) => !prepared.invalidRowNumbers.has(candidate.rowNumber));
+  if (options.confirm) {
+    const operation = stmt.type.startsWith("INSERT") ? "INSERT" : "UPDATE";
+    const ok = await options.confirm(valid.length, operation);
+    if (!ok) throw new OperationCancelledError(operation, valid.length);
+  }
+  const common = {
+    affectedRows: valid.length,
+    skippedRows: prepared.result.invalidRows,
+    rejectLimit,
+    errTable
+  };
+  if (stmt.type === "INSERT" || stmt.type === "INSERT_SELECT") {
+    const createdIds = [];
+    for (let i = 0; i < valid.length; i += 100) {
+      const response = await client.postRecords({ app: stmt.appId, records: valid.slice(i, i + 100).map((c) => c.record) });
+      createdIds.push(response.ids);
+    }
+    return { type: "INSERT", createdIds, insertedCount: createdIds.flat().length, ...common };
+  }
+  if (stmt.type === "UPDATE") {
+    const updates2 = valid.map((candidate) => {
+      if (candidate.targetId === void 0) throw new Error("InternalError: prepared UPDATE candidate has no targetId.");
+      return { id: candidate.targetId, record: candidate.record };
+    });
+    for (let i = 0; i < updates2.length; i += 100) {
+      await client.putRecords({ app: stmt.appId, records: updates2.slice(i, i + 100) });
+    }
+    return { type: "UPDATE", updatedCount: updates2.length, ...common };
+  }
+  const inserts = valid.filter((candidate) => candidate.mode === "create");
+  const updates = valid.filter((candidate) => candidate.mode === "update").map((candidate) => {
+    if (candidate.targetId === void 0) throw new Error("InternalError: prepared UPSERT candidate has no targetId.");
+    return { id: candidate.targetId, record: candidate.record };
+  });
+  let insertedCount = 0;
+  for (let i = 0; i < inserts.length; i += 100) {
+    const response = await client.postRecords({ app: stmt.appId, records: inserts.slice(i, i + 100).map((c) => c.record) });
+    insertedCount += response.ids.length;
+  }
+  for (let i = 0; i < updates.length; i += 100) {
+    await client.putRecords({ app: stmt.appId, records: updates.slice(i, i + 100) });
+  }
+  return { type: "UPSERT", insertedCount, updatedCount: updates.length, ...common };
+}
+async function materializeValidationCandidates(stmt, operation, client, options, cacheContext, tempTables, infoByCode) {
+  if (stmt.type === "UPDATE") return materializeUpdateValidationCandidates(stmt, client, options, cacheContext, tempTables);
+  let rows;
+  if (stmt.type === "INSERT" || stmt.type === "UPSERT") {
+    rows = stmt.values.map((row) => row.map(
+      (value, i) => value.type === "CASE_VALUE" ? evalCaseWhenValue(value.expr, {}, infoByCode.get(stmt.fields[i])?.fieldType) : value
+    ));
+  } else {
+    const selectResult = tempTables && tempTables.size > 0 ? await executeQueryWithCte(stmt.select, client, { ...options, onLimitReached: "error" }, tempTables, cacheContext) : await executeSelect(stmt.select, client, { ...options, onLimitReached: "error" }, cacheContext);
+    if (selectResult.columns.length !== stmt.fields.length) {
+      throw new Error(`SELECT \u306E\u5217\u6570\uFF08${selectResult.columns.length}\uFF09\u3068 DML \u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u6570\uFF08${stmt.fields.length}\uFF09\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093`);
+    }
+    rows = selectResult.rows.map((row) => selectResult.columns.map((column) => row[column] ?? ""));
+  }
+  const candidates = rows.map((values, index) => ({
+    rowNumber: index + 1,
+    operation,
+    mode: "create",
+    payload: new Map(stmt.fields.map((field, i) => [field, values[i]])),
+    preErrors: [],
+    record: {}
+  }));
+  if (stmt.type !== "UPSERT" && stmt.type !== "UPSERT_SELECT") return candidates;
+  for (const key of stmt.keyFields) {
+    if (!stmt.fields.includes(key)) throw new Error(`ON DUPLICATE \u306E\u30AD\u30FC\u300C${key}\u300D\u304C UPSERT \u30D5\u30A3\u30FC\u30EB\u30C9\u306B\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093`);
+  }
+  const fieldTypes = new Map([...infoByCode].map(([code, info]) => [code, info.fieldType]));
+  const rowKeys = candidates.map((candidate) => stmt.keyFields.map((key) => renderValidationValue(candidate.payload.get(key))));
+  const targets = await resolveUpsertTargets(stmt.appId, stmt.keyFields, rowKeys, client, options, fieldTypes);
+  const numeric = stmt.keyFields.map((key) => fieldTypes.get(key) === "NUMBER");
+  const keyCounts = /* @__PURE__ */ new Map();
+  for (const parts of rowKeys) {
+    const key = upsertNormalizedKey(parts, numeric);
+    keyCounts.set(key, (keyCounts.get(key) ?? 0) + 1);
+  }
+  candidates.forEach((candidate, index) => {
+    const parts = rowKeys[index];
+    const targetId = lookupUpsertTarget(targets, parts);
+    candidate.mode = targetId === void 0 ? "create" : "update";
+    if (targetId !== void 0) candidate.targetId = targetId;
+    stmt.keyFields.forEach((key, keyIndex) => {
+      if (parts[keyIndex] === "") candidate.preErrors.push({ field: key, code: "ERR_KEY_EMPTY", message: `UPSERT \u30AD\u30FC ${key} \u306F\u7A7A\u306B\u3067\u304D\u307E\u305B\u3093` });
+    });
+    if ((keyCounts.get(upsertNormalizedKey(parts, numeric)) ?? 0) > 1) {
+      candidate.preErrors.push({ field: stmt.keyFields[0], code: "ERR_KEY_DUP_SOURCE", message: "UPSERT \u30BD\u30FC\u30B9\u5185\u3067\u30AD\u30FC\u304C\u91CD\u8907\u3057\u3066\u3044\u307E\u3059" });
+    }
+  });
+  return candidates;
+}
+async function materializeUpdateValidationCandidates(stmt, client, options, cacheContext, tempTables) {
+  if (stmt.from) return materializeUpdateFromValidationCandidates(stmt, stmt.from, client, options, cacheContext, tempTables);
+  await resolveSetSubqueries(stmt.assignments, client, options, cacheContext);
+  const fieldTypes = await getFieldTypeMap(stmt.appId, client, cacheContext);
+  let records;
+  if (hasArithAssignment(stmt)) {
+    const getParams = updateToGetQueryForArith(stmt);
+    const resolved = await fetchRecordsForSharedPlan(client.getRecords, getParams.app, getParams.query, [...getParams.fields], {
+      maxRecords: options.maxRecords ?? 1e4,
+      parallel: options.fetchParallel ?? 1,
+      onLimit: "error"
+    });
+    records = updateToPutBatchesArith(stmt, resolved.records, fieldTypes).flatMap((batch) => batch.records);
+  } else {
+    const getParams = updateToGetQuery(stmt);
+    const resolved = await resolveDmlTargetIds(client.getRecords, getParams.app, getParams.query, {
+      maxRecords: options.maxRecords ?? 1e4,
+      parallel: options.fetchParallel ?? 1
+    });
+    records = updateToPutBatches(stmt, resolved.ids, fieldTypes).flatMap((batch) => batch.records);
+  }
+  return records.sort((a, b) => a.id - b.id).map((entry, index) => ({
+    rowNumber: index + 1,
+    operation: "UPDATE",
+    mode: "update",
+    payload: new Map([["$id", String(entry.id)], ...stmt.assignments.map((a) => [a.field, entry.record[a.field]?.value ?? ""])]),
+    preErrors: [],
+    record: entry.record,
+    targetId: entry.id
+  }));
+}
+async function materializeUpdateFromValidationCandidates(stmt, from, client, options, cacheContext, tempTables) {
+  const matched = await resolveUpdateFromMatchedRecords(stmt, from, client, options, cacheContext, tempTables);
+  const fieldTypes = await getFieldTypeMap(stmt.appId, client, cacheContext);
+  const records = updateFromToPutBatches(stmt, matched, fieldTypes).flatMap((batch) => batch.records);
+  return records.sort((a, b) => a.id - b.id).map((entry, index) => ({
+    rowNumber: index + 1,
+    operation: "UPDATE",
+    mode: "update",
+    payload: new Map([["$id", String(entry.id)], ...stmt.assignments.map((a) => [a.field, entry.record[a.field]?.value ?? ""])]),
+    preErrors: [],
+    record: entry.record,
+    targetId: entry.id
+  }));
+}
+var UPDATE_FROM_KEY_CHUNK_SIZE = UPSERT_IN_CHUNK_SIZE;
+var UPDATE_FROM_UNSUPPORTED_SOURCE_TYPES = /* @__PURE__ */ new Set([
+  "CHECK_BOX",
+  "MULTI_SELECT",
+  "USER_SELECT",
+  "ORGANIZATION_SELECT",
+  "GROUP_SELECT",
+  "FILE"
+]);
+async function resolveUpdateFromMatchedRecords(stmt, from, client, options, cacheContext, tempTables) {
+  const joinKind = await resolveUpdateFromTargetJoinKind(stmt, from, client, cacheContext);
+  const sourceFields = [...new Set(stmt.assignments.filter((a) => a.value.type === "SOURCE_FIELD").map((a) => a.value.type === "SOURCE_FIELD" ? a.value.field : ""))];
+  const requiredSourceFields = [.../* @__PURE__ */ new Set([from.joinKeyField, ...sourceFields])];
+  const sourceRows = await loadUpdateFromSourceRows(
+    from,
+    requiredSourceFields,
+    sourceFields,
+    client,
+    options,
+    cacheContext,
+    tempTables
+  );
+  const sourceByKey = /* @__PURE__ */ new Map();
+  for (const row of sourceRows) {
+    if (!Object.prototype.hasOwnProperty.call(row, from.joinKeyField)) {
+      throw new Error(`ArgumentError: UPDATE ... FROM source column ${from.joinKeyField} does not exist.`);
+    }
+    const key = normalizeUpdateFromJoinKey(row[from.joinKeyField], joinKind, "source");
+    if (sourceByKey.has(key)) {
+      throw new Error(`ArgumentError: UPDATE ... FROM source has multiple rows for normalized key ${key}.`);
+    }
+    sourceByKey.set(key, row);
+  }
+  if (sourceByKey.size === 0) return [];
+  const maxRecords = options.maxRecords ?? 1e4;
+  const targetFields = collectUpdateFromTargetFields(stmt);
+  const filterQuery = from.targetFilter === null ? "" : updateToGetQuery({ ...stmt, from: null, where: from.targetFilter }).query;
+  const targetRecords = [];
+  const seenTargetIds = /* @__PURE__ */ new Set();
+  let fetchedTargetCount = 0;
+  for (const keys of splitChunks([...sourceByKey.keys()], UPDATE_FROM_KEY_CHUNK_SIZE)) {
+    const keyQuery = `${from.targetJoinField} in (${keys.map(sqlQuote).join(",")})`;
+    const query = filterQuery ? `(${keyQuery}) and (${filterQuery})` : keyQuery;
+    const resolved = await fetchRecordsForSharedPlan(
+      client.getRecords,
+      stmt.appId,
+      query,
+      targetFields,
+      { maxRecords, parallel: options.fetchParallel ?? 1, onLimit: "error" }
+    );
+    fetchedTargetCount += resolved.records.length;
+    if (fetchedTargetCount > maxRecords) {
+      throw new FetchAllLimitError(
+        `\u53D6\u5F97\u4EF6\u6570\u304C\u4E0A\u9650\uFF08${maxRecords} \u4EF6\uFF09\u3092\u8D85\u3048\u307E\u3057\u305F\u3002WHERE \u53E5\u3067\u7D5E\u308A\u8FBC\u3080\u304B\u3001maxRecords \u3092\u5F15\u304D\u4E0A\u3052\u3066\u304F\u3060\u3055\u3044\u3002`
+      );
+    }
+    for (const record of resolved.records) {
+      const id = record["$id"]?.value;
+      if (typeof id !== "string" || id === "") {
+        throw new Error("ArgumentError: UPDATE ... FROM target record does not contain a valid $id.");
+      }
+      if (seenTargetIds.has(id)) continue;
+      seenTargetIds.add(id);
+      targetRecords.push(record);
+    }
+  }
+  const matched = [];
+  for (const target of targetRecords) {
+    const raw = target[from.targetJoinField]?.value;
+    const key = normalizeUpdateFromJoinKey(raw, joinKind, "target");
+    if (key === null) continue;
+    const source = sourceByKey.get(key);
+    if (source !== void 0) matched.push({ target, source });
+  }
+  return matched;
+}
+async function resolveUpdateFromTargetJoinKind(stmt, from, client, cacheContext) {
+  if (from.targetJoinField === "$id") return "id";
+  const info = (await getFieldsCached(stmt.appId, client, cacheContext)).find((field) => field.code === from.targetJoinField);
+  if (!info) {
+    throw new Error(`ArgumentError: UPDATE ... FROM target column ${from.targetJoinField} does not exist.`);
+  }
+  if (info.inSubtable || info.writable === false || info.fieldType !== "SINGLE_LINE_TEXT" && info.fieldType !== "NUMBER") {
+    throw new Error(
+      `ArgumentError: UPDATE ... FROM does not support target join field type ${info.fieldType} (${from.targetJoinField}).`
+    );
+  }
+  return info.fieldType === "NUMBER" ? "number" : "string";
+}
+async function loadUpdateFromSourceRows(from, requiredSourceFields, sourceValueFields, client, options, cacheContext, tempTables) {
+  if (from.cteName !== null) {
+    const table = tempTables?.get(from.cteName);
+    if (!table) throw new Error(`ArgumentError: temp table ${from.cteName} is not available.`);
+    for (const field of requiredSourceFields) {
+      if (!table.columns.includes(field)) {
+        throw new Error(`ArgumentError: UPDATE ... FROM source column ${field} does not exist.`);
+      }
+    }
+    return table.rows;
+  }
+  const sourceTypes = await getFieldTypeMap(from.appId, client, cacheContext);
+  const joinType = from.joinKeyField === "$id" ? "RECORD_NUMBER" : sourceTypes.get(from.joinKeyField);
+  if (joinType === void 0) {
+    throw new Error(`ArgumentError: UPDATE ... FROM source column ${from.joinKeyField} does not exist.`);
+  }
+  if (from.joinKeyField !== "$id" && joinType !== "SINGLE_LINE_TEXT" && joinType !== "NUMBER") {
+    throw new Error(
+      `ArgumentError: UPDATE ... FROM does not support source join field type ${joinType} (${from.joinKeyField}).`
+    );
+  }
+  for (const field of sourceValueFields) {
+    if (field !== "$id" && !sourceTypes.has(field)) {
+      throw new Error(`ArgumentError: UPDATE ... FROM source column ${field} does not exist.`);
+    }
+    const type = field === "$id" ? "RECORD_NUMBER" : sourceTypes.get(field);
+    if (UPDATE_FROM_UNSUPPORTED_SOURCE_TYPES.has(type ?? "")) {
+      throw new Error(`ArgumentError: UPDATE ... FROM does not support source field type ${type} (${field}).`);
+    }
+  }
+  const resolved = await fetchRecordsForSharedPlan(
+    client.getRecords,
+    from.appId,
+    "",
+    requiredSourceFields,
+    { maxRecords: options.maxRecords ?? 1e4, parallel: options.fetchParallel ?? 1, onLimit: "error" }
+  );
+  return resolved.records.map((record) => flatten(record, null));
+}
+function normalizeUpdateFromJoinKey(raw, kind, side) {
+  if (typeof raw !== "string") {
+    throw new Error(`ArgumentError: UPDATE ... FROM ${side} key must be a scalar string: ${String(raw)}`);
+  }
+  if (kind === "string") {
+    if (raw === "") {
+      if (side === "target") return null;
+      throw new Error("ArgumentError: UPDATE ... FROM source key must not be empty.");
+    }
+    return raw;
+  }
+  if (kind === "number" && side === "target" && raw === "") return null;
+  if (kind === "id") {
+    const text2 = raw.trim();
+    const id = Number(text2);
+    if (text2 === "" || !Number.isSafeInteger(id) || id <= 0) {
+      throw new Error(`ArgumentError: UPDATE ... FROM ${side} key must be a positive safe integer: ${raw}`);
+    }
+    return String(id);
+  }
+  const text = raw.trim();
+  if (!/^[+-]?(?:\d+(?:\.\d*)?|\.\d+)$/.test(text)) {
+    throw new Error(`ArgumentError: UPDATE ... FROM ${side} key must be a finite decimal: ${raw}`);
+  }
+  let unsigned = text;
+  let negative = false;
+  if (unsigned.startsWith("-") || unsigned.startsWith("+")) {
+    negative = unsigned[0] === "-";
+    unsigned = unsigned.slice(1);
+  }
+  let [whole, fraction = ""] = unsigned.split(".");
+  whole = (whole || "0").replace(/^0+(?=\d)/, "");
+  fraction = fraction.replace(/0+$/, "");
+  const zero = /^0*$/.test(whole) && fraction === "";
+  const canonical = fraction === "" ? whole : `${whole}.${fraction}`;
+  return negative && !zero ? `-${canonical}` : canonical;
+}
 async function executeInsert(stmt, client, options, cacheContext) {
   if (stmt.subtableCode) {
     return executeInsertSubtable(stmt, client, options, cacheContext);
@@ -7048,98 +7981,20 @@ async function executeUpdate(stmt, client, options, cacheContext, tempTables) {
   }
   return { type: "UPDATE", updatedCount: ids.length };
 }
-var UPDATE_FROM_ID_CHUNK_SIZE = 50;
-var UPDATE_FROM_UNSUPPORTED_SOURCE_TYPES = /* @__PURE__ */ new Set([
-  "CHECK_BOX",
-  "MULTI_SELECT",
-  "USER_SELECT",
-  "ORGANIZATION_SELECT",
-  "GROUP_SELECT",
-  "FILE"
-]);
 async function executeUpdateFrom(stmt, from, client, options, cacheContext, tempTables) {
-  const sourceFields = [...new Set(stmt.assignments.filter((a) => a.value.type === "SOURCE_FIELD").map((a) => a.value.type === "SOURCE_FIELD" ? a.value.field : ""))];
-  const requiredSourceFields = [.../* @__PURE__ */ new Set([from.joinKeyField, ...sourceFields])];
-  let sourceRows;
-  if (from.cteName !== null) {
-    const table = tempTables?.get(from.cteName);
-    if (!table) throw new Error(`ArgumentError: temp table ${from.cteName} is not available.`);
-    for (const field of requiredSourceFields) {
-      if (!table.columns.includes(field)) {
-        throw new Error(`ArgumentError: UPDATE ... FROM source column ${field} does not exist.`);
-      }
-    }
-    sourceRows = table.rows;
-  } else {
-    const sourceTypes = await getFieldTypeMap(from.appId, client, cacheContext);
-    for (const field of requiredSourceFields) {
-      if (field !== "$id" && !sourceTypes.has(field)) {
-        throw new Error(`ArgumentError: UPDATE ... FROM source column ${field} does not exist.`);
-      }
-      const type = sourceTypes.get(field);
-      if (UPDATE_FROM_UNSUPPORTED_SOURCE_TYPES.has(type ?? "")) {
-        throw new Error(`ArgumentError: UPDATE ... FROM does not support source field type ${type} (${field}).`);
-      }
-    }
-    const maxRecords = options.maxRecords ?? 1e4;
-    const resolved = await fetchRecordsForSharedPlan(
-      client.getRecords,
-      from.appId,
-      "",
-      requiredSourceFields,
-      { maxRecords, parallel: options.fetchParallel ?? 1, onLimit: "error" }
-    );
-    sourceRows = resolved.records.map((record) => flatten(record, null));
-  }
-  const sourceById = /* @__PURE__ */ new Map();
-  for (const row of sourceRows) {
-    if (!Object.prototype.hasOwnProperty.call(row, from.joinKeyField)) {
-      throw new Error(`ArgumentError: UPDATE ... FROM source column ${from.joinKeyField} does not exist.`);
-    }
-    const raw = row[from.joinKeyField];
-    const text = typeof raw === "string" ? raw.trim() : "";
-    const id = Number(text);
-    if (text === "" || !Number.isSafeInteger(id) || id <= 0) {
-      throw new Error(`ArgumentError: UPDATE ... FROM source key must be a positive safe integer: ${String(raw)}`);
-    }
-    if (sourceById.has(id)) {
-      throw new Error(`ArgumentError: UPDATE ... FROM source has multiple rows for target $id ${id}.`);
-    }
-    sourceById.set(id, row);
-  }
-  const targetIds = [...sourceById.keys()];
-  const targetFields = collectUpdateFromTargetFields(stmt);
-  const filterQuery = from.targetFilter === null ? "" : updateToGetQuery({ ...stmt, from: null, where: from.targetFilter }).query;
-  const targetRecords = [];
-  for (const ids of splitChunks(targetIds, UPDATE_FROM_ID_CHUNK_SIZE)) {
-    const idQuery = `$id in (${ids.map((id) => sqlQuote(String(id))).join(",")})`;
-    const query = filterQuery ? `(${idQuery}) and (${filterQuery})` : idQuery;
-    const resolved = await fetchRecordsForSharedPlan(
-      client.getRecords,
-      stmt.appId,
-      query,
-      targetFields,
-      { maxRecords: Math.max(ids.length, 1), parallel: options.fetchParallel ?? 1, onLimit: "error" }
-    );
-    targetRecords.push(...resolved.records);
-  }
+  const matched = await resolveUpdateFromMatchedRecords(stmt, from, client, options, cacheContext, tempTables);
   if (options.confirm) {
-    const ok = await options.confirm(targetRecords.length, "UPDATE");
-    if (!ok) throw new OperationCancelledError("UPDATE", targetRecords.length);
+    const ok = await options.confirm(matched.length, "UPDATE");
+    if (!ok) throw new OperationCancelledError("UPDATE", matched.length);
   }
   const fieldTypes = await getFieldTypeMap(stmt.appId, client, cacheContext);
-  const matched = targetRecords.map((target) => {
-    const id = Number(target["$id"]?.value);
-    const source = sourceById.get(id);
-    if (!source) throw new Error(`ArgumentError: UPDATE ... FROM could not resolve source row for target $id ${id}.`);
-    return { target, source };
-  });
   const batches = updateFromToPutBatches(stmt, matched, fieldTypes);
   for (const batch of batches) await client.putRecords(batch);
-  return { type: "UPDATE", updatedCount: targetRecords.length };
+  return { type: "UPDATE", updatedCount: matched.length };
 }
 function collectUpdateFromTargetFields(stmt) {
   const fields = /* @__PURE__ */ new Set(["$id"]);
+  if (stmt.from) fields.add(stmt.from.targetJoinField);
   const visit = (node) => {
     if (Array.isArray(node)) {
       node.forEach(visit);
@@ -8085,7 +8940,7 @@ function buildUpdatePlan(stmt, label) {
   if (stmt.from) {
     const source = stmt.from.cteName ?? `APP${stmt.from.appId}`;
     lines.push(`  source:        ${source} AS ${stmt.from.alias}`);
-    lines.push(`  join:          APP${stmt.appId}.$id = ${stmt.from.alias}.${stmt.from.joinKeyField}`);
+    lines.push(`  join:          APP${stmt.appId}.${stmt.from.targetJoinField} = ${stmt.from.alias}.${stmt.from.joinKeyField}`);
     lines.push(`  target filter: ${stmt.from.targetFilter ? safeWhereToKintone(stmt.from.targetFilter) : "(none)"}`);
   } else {
     lines.push(`  kintone query: ${safeWhereToKintone(stmt.where)}`);
@@ -8326,12 +9181,32 @@ function isSubtableRow(v) {
 // src/output/batchEnvelope.ts
 function toMutationSummary(result) {
   if (result.type === "INSERT") {
-    return { insertedCount: result.insertedCount, createdIds: result.createdIds };
+    return {
+      insertedCount: result.insertedCount,
+      createdIds: result.createdIds,
+      ...result.affectedRows !== void 0 ? { affectedRows: result.affectedRows } : {},
+      ...result.skippedRows !== void 0 ? { skippedRows: result.skippedRows } : {},
+      ...result.rejectLimit !== void 0 ? { rejectLimit: result.rejectLimit } : {},
+      ...result.errTable !== void 0 ? { errTable: result.errTable } : {}
+    };
   }
-  if (result.type === "UPDATE") return { updatedCount: result.updatedCount };
+  if (result.type === "UPDATE") return {
+    updatedCount: result.updatedCount,
+    ...result.affectedRows !== void 0 ? { affectedRows: result.affectedRows } : {},
+    ...result.skippedRows !== void 0 ? { skippedRows: result.skippedRows } : {},
+    ...result.rejectLimit !== void 0 ? { rejectLimit: result.rejectLimit } : {},
+    ...result.errTable !== void 0 ? { errTable: result.errTable } : {}
+  };
   if (result.type === "DELETE") return { deletedCount: result.deletedCount };
   if (result.type === "UPSERT") {
-    return { insertedCount: result.insertedCount, updatedCount: result.updatedCount };
+    return {
+      insertedCount: result.insertedCount,
+      updatedCount: result.updatedCount,
+      ...result.affectedRows !== void 0 ? { affectedRows: result.affectedRows } : {},
+      ...result.skippedRows !== void 0 ? { skippedRows: result.skippedRows } : {},
+      ...result.rejectLimit !== void 0 ? { rejectLimit: result.rejectLimit } : {},
+      ...result.errTable !== void 0 ? { errTable: result.errTable } : {}
+    };
   }
   return { reorderedParentCount: result.reorderedParentCount };
 }
@@ -8358,11 +9233,31 @@ function buildBatchEnvelope(batch, options = {}) {
       }
       entry.resultIndex = results.length;
       results.push({
+        type: "SELECT",
         columns: s.result.columns,
         rows: s.result.rows,
         rowCount: s.result.rowCount,
         warnings: s.result.warnings ?? []
       });
+    } else if (s.result?.type === "VALIDATION") {
+      totalRows += s.result.errorCount;
+      if (maxTotalRecords !== void 0 && totalRows > maxTotalRecords) {
+        throw new Error(`ArgumentError: batch total rows (${totalRows}) exceed maxTotalRecords (${maxTotalRecords}).`);
+      }
+      entry.resultIndex = results.length;
+      results.push({
+        type: "VALIDATION",
+        columns: s.result.columns,
+        rows: s.result.errors,
+        rowCount: s.result.errorCount,
+        warnings: [],
+        operation: s.result.operation,
+        validatedRows: s.result.validatedRows,
+        validRows: s.result.validRows,
+        invalidRows: s.result.invalidRows,
+        errorCount: s.result.errorCount,
+        ...s.result.errTable ? { errTable: s.result.errTable } : {}
+      });
     } else if (s.status === "success" && s.result && s.result.type !== "SELECT" && s.result.type !== "ASSERT") {
       Object.assign(entry, toMutationSummary(s.result));
     }
@@ -8643,6 +9538,9 @@ function clampInt(v, min, max) {
 
 // src/core/formFieldInfo.ts
 function flattenFormFieldProperties(properties) {
+  return flattenFields(properties, collectLookupCopyFields(properties));
+}
+function flattenFields(properties, lookupCopyFields, inSubtable = false) {
   const out = [];
   for (const field of Object.values(properties)) {
     out.push({
@@ -8650,12 +9548,49 @@ function flattenFormFieldProperties(properties) {
       label: field.label,
       fieldType: field.type,
       optionOrder: toOptionOrderMap(field.options),
-      sortKind: detectSortKind(field.type, field.format)
+      sortKind: detectSortKind(field.type, field.format),
+      required: field.required,
+      minValue: normalizeConstraintValue(field.minValue),
+      maxValue: normalizeConstraintValue(field.maxValue),
+      minLength: normalizeConstraintValue(field.minLength),
+      maxLength: normalizeConstraintValue(field.maxLength),
+      defaultValue: field.defaultValue,
+      inSubtable,
+      writable: !lookupCopyFields.has(field.code) && !NON_WRITABLE_FIELD_TYPES2.has(field.type)
     });
-    if (field.fields) out.push(...flattenFormFieldProperties(field.fields));
+    if (field.fields) out.push(...flattenFields(field.fields, lookupCopyFields, true));
   }
   return out;
 }
+var NON_WRITABLE_FIELD_TYPES2 = /* @__PURE__ */ new Set([
+  "CALC",
+  "RECORD_NUMBER",
+  "CREATOR",
+  "CREATED_TIME",
+  "MODIFIER",
+  "UPDATED_TIME",
+  "STATUS",
+  "STATUS_ASSIGNEE",
+  "CATEGORY",
+  "REFERENCE_TABLE",
+  "SUBTABLE"
+]);
+function collectLookupCopyFields(properties) {
+  const result = /* @__PURE__ */ new Set();
+  const visit = (fields) => {
+    for (const field of Object.values(fields)) {
+      for (const mapping of field.lookup?.fieldMappings ?? []) {
+        if (mapping.field) result.add(mapping.field);
+      }
+      if (field.fields) visit(field.fields);
+    }
+  };
+  visit(properties);
+  return result;
+}
+function normalizeConstraintValue(value) {
+  return value == null || value === "" ? void 0 : value;
+}
 function toOptionOrderMap(options) {
   if (!options || typeof options !== "object") return void 0;
   const order = {};
@@ -9788,6 +10723,11 @@ function buildAssertOutput(result, format, pretty) {
   if (format === "jsonl") return JSON.stringify(payload);
   return `assertion ok: ${result.condition}`;
 }
+function buildValidationOutput(result, format, noHeader, pretty, displayOptions) {
+  if (format === "json") return JSON.stringify({ ok: true, ...result, metrics: void 0 }, null, pretty ? 2 : 0);
+  if (format === "jsonl") return result.errors.map((row) => JSON.stringify(row)).join("\n");
+  return buildOutput({ type: "SELECT", columns: result.columns, rows: result.errors, rowCount: result.errorCount }, format, noHeader, pretty, displayOptions);
+}
 function buildMutationOutput(result, format, noHeader, pretty) {
   const row = { type: result.type };
   if (result.type === "INSERT") {
@@ -9802,6 +10742,12 @@ function buildMutationOutput(result, format, noHeader, pretty) {
   } else if (result.type === "REORDER") {
     row.reorderedParentCount = result.reorderedParentCount;
   }
+  if (result.type === "INSERT" || result.type === "UPDATE" || result.type === "UPSERT") {
+    if (result.affectedRows !== void 0) row.affectedRows = result.affectedRows;
+    if (result.skippedRows !== void 0) row.skippedRows = result.skippedRows;
+    if (result.rejectLimit !== void 0) row.rejectLimit = result.rejectLimit;
+    if (result.errTable !== void 0) row.errTable = result.errTable;
+  }
   if (format === "json") return JSON.stringify(row, null, pretty ? 2 : 0);
   if (format === "jsonl") return JSON.stringify(row);
   const cols = Object.keys(row);
@@ -9912,6 +10858,14 @@ function buildBatchStatementSummary(s) {
     else if (r.type === "DELETE") parts.push(`deleted=${r.deletedCount}`);
     else if (r.type === "UPSERT") parts.push(`inserted=${r.insertedCount} updated=${r.updatedCount}`);
     else if (r.type === "REORDER") parts.push(`reordered=${r.reorderedParentCount}`);
+    else if (r.type === "VALIDATION") parts.push(`validated=${r.validatedRows} valid=${r.validRows} invalid=${r.invalidRows} errors=${r.errorCount}`);
+    if ((r.type === "INSERT" || r.type === "UPDATE" || r.type === "UPSERT") && r.skippedRows !== void 0) {
+      parts.push(`affected=${r.affectedRows} skipped=${r.skippedRows} errTable=${r.errTable}`);
+    }
+  }
+  if (s.status === "error" && s.result?.type === "VALIDATION") {
+    const r = s.result;
+    parts.push(`validated=${r.validatedRows} valid=${r.validRows} invalid=${r.invalidRows} errors=${r.errorCount}`);
   }
   if (s.status === "error" && s.error) parts.push(s.error.message);
   if (s.status === "skipped" && s.skippedReason) parts.push(`reason=${s.skippedReason}`);
@@ -9945,6 +10899,8 @@ function buildBatchResultsOutput(batch, opts) {
   for (const s of batch.statements) {
     if (s.status === "success" && s.result?.type === "SELECT") {
       outputs.push(buildOutput(s.result, opts.format, opts.noHeader, opts.pretty, opts.displayOptions));
+    } else if (s.result?.type === "VALIDATION") {
+      outputs.push(buildValidationOutput(s.result, opts.format, opts.noHeader, opts.pretty, opts.displayOptions));
     }
   }
   return outputs.join("\n\n");
@@ -10607,6 +11563,7 @@ async function run() {
   let isBatchSql = false;
   let batchContainsDml = false;
   let batchAnalysis = null;
+  let needsCompleteInput = false;
   if (args.diagRecordId === null) {
     sql = args.executeSql;
     if (!sql && args.filePath) sql = (0, import_fs2.readFileSync)(args.filePath, "utf-8");
@@ -10637,14 +11594,16 @@ async function run() {
         batchAnalysis = analyzeBatch(statements);
         isBatchSql = true;
         batchContainsDml = batchAnalysis.containsDml;
+        needsCompleteInput = batchAnalysis.requiresCompleteInput;
       } else {
         const stmt = parseSqlStatement(sql);
         parsedStmt = stmt;
         stmtType = getStatementType(stmt);
-        isDmlStatement = isDmlType(stmtType);
+        isDmlStatement = writesKintone(stmt);
+        needsCompleteInput = requiresCompleteInput(stmt);
         hasWhere = hasWhereClause(stmt);
         insertValuesCount = getInsertValuesCount(stmt);
-        const supported = stmtType === "SELECT" || stmtType === "UNION" || stmtType === "WITH" || stmtType === "EXPLAIN" || stmtType === "SHOW_APPS" || stmtType === "DESCRIBE" || stmtType === "ASSERT" || isDmlStatement;
+        const supported = stmtType === "SELECT" || stmtType === "UNION" || stmtType === "WITH" || stmtType === "EXPLAIN" || stmtType === "SHOW_APPS" || stmtType === "DESCRIBE" || stmtType === "ASSERT" || isDmlType(stmtType);
         if (!supported) {
           process.stderr.write(`ArgumentError: unsupported statement type in CLI: ${stmtType}
 `);
@@ -10688,10 +11647,10 @@ async function run() {
   const yes = args.yes || envBool("KSQL_YES") === true || Boolean(profile.dml?.yes);
   const allowWithoutWhere = args.allowWithoutWhere || envBool("KSQL_ALLOW_WITHOUT_WHERE") === true || Boolean(profile.dml?.allowWithoutWhere);
   const dmlMaxRows = args.dmlMaxRows ?? envInt2("KSQL_DML_MAX_ROWS") ?? profile.dml?.maxRows ?? 100;
-  const dmlForcesOnLimitError = isDmlStatement || batchContainsDml;
+  const dmlForcesOnLimitError = needsCompleteInput;
   const effectiveOnLimit = dmlForcesOnLimitError ? "error" : onLimit;
   if (dmlForcesOnLimitError && onLimit === "truncate" && !quiet && !args.dryRun) {
-    process.stderr.write("note: onLimit=truncate is ignored for DML (forced to error)\n");
+    process.stderr.write(isDmlStatement || batchContainsDml ? "note: onLimit=truncate is ignored for DML (forced to error)\n" : "note: onLimit=truncate is ignored for VALIDATE ONLY (forced to error)\n");
   }
   if (format === "markdown" && noHeader) {
     process.stderr.write("ArgumentError: --no-header cannot be used with --format markdown|md.\n");
@@ -11074,6 +12033,16 @@ query=${label}`);
       if (outputPath) (0, import_fs2.writeFileSync)(outputPath, `${output2}
 `, "utf-8");
       else if (output2) process.stdout.write(`${output2}
+`);
+      return 0;
+    }
+    if (result.type === "VALIDATION") {
+      const output2 = buildValidationOutput(result, format, noHeader, pretty, displayOptions);
+      if (outputPath) (0, import_fs2.writeFileSync)(outputPath, `${output2}
+`, "utf-8");
+      else if (output2) process.stdout.write(`${output2}
+`);
+      if (!quiet) process.stderr.write(`validated=${result.validatedRows} valid=${result.validRows} invalid=${result.invalidRows} errors=${result.errorCount}
 `);
       return 0;
     }
@@ -11127,6 +12096,7 @@ if (isDirectCliRun()) {
   buildBatchStatementSummary,
   buildOutput,
   buildReplExecArgv,
+  buildValidationOutput,
   extractAppIds,
   normalizeAppKey,
   normalizeSqlAppProfiles,