@rex0220/kintone-sql-tools 2.1.2 → 2.3.0

package/dist-cli/ksql.js

@@ -629,7 +629,22 @@ var Parser = class {
       throw new ParseError("SET \u306E\u53F3\u8FBA\u3067 NULL \u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\uFF08Phase 1a\uFF09", tok);
     }
     if (tok.kind === "(" /* LPAREN */ && this.peekAt(1).kind === "SELECT" /* SELECT */) {
-      throw new ParseError("SET \u306E\u30B9\u30AB\u30E9\u30FC\u30B5\u30D6\u30AF\u30A8\u30EA\u4EE3\u5165\u306F Phase 1b \u3067\u5BFE\u5FDC\u4E88\u5B9A\u3067\u3059", tok);
+      this.advance();
+      const query = this.parseSelect();
+      this.expect(")" /* RPAREN */);
+      if (this.isArithOp(this.peek().kind)) {
+        throw new ParseError(
+          "\u30B9\u30AB\u30E9\u30FC\u30B5\u30D6\u30AF\u30A8\u30EA\u306E\u5F8C\u306B\u7B97\u8853\u6F14\u7B97\u5B50\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u30B5\u30D6\u30AF\u30A8\u30EA\u5185\u3067\u8A08\u7B97\u3057\u3066\u304F\u3060\u3055\u3044",
+          this.peek()
+        );
+      }
+      const hasWildcard = query.columns.some(
+        (c) => c.type === "WILDCARD" || c.type === "PARENT_WILDCARD"
+      );
+      if (!hasWildcard && query.columns.length !== 1) {
+        throw new ParseError("scalar subquery in SET must return exactly 1 column.", tok);
+      }
+      return { type: "SCALAR_SUBQUERY", query };
     }
     if (tok.kind === "STRING" /* STRING */) {
       this.advance();
@@ -2492,6 +2507,28 @@ function analyzeBatch(statements) {
   };
 }
 
+// src/core/scalarCompare.ts
+function compareScalarValues(op, leftStr, rightStr) {
+  if (op === "=") return leftStr === rightStr;
+  if (op === "!=" || op === "<>") return leftStr !== rightStr;
+  const rightNum = Number(rightStr);
+  if (leftStr === "" && rightStr !== "" && Number.isFinite(rightNum)) {
+    return op === "<" || op === "<=";
+  }
+  const leftNum = Number(leftStr);
+  const numeric = !Number.isNaN(leftNum) && !Number.isNaN(rightNum);
+  switch (op) {
+    case ">":
+      return numeric ? leftNum > rightNum : leftStr > rightStr;
+    case "<":
+      return numeric ? leftNum < rightNum : leftStr < rightStr;
+    case ">=":
+      return numeric ? leftNum >= rightNum : leftStr >= rightStr;
+    case "<=":
+      return numeric ? leftNum <= rightNum : leftStr <= rightStr;
+  }
+}
+
 // src/engine/pushDownNot.ts
 function pushDownNot(expr) {
   switch (expr.type) {
@@ -3466,24 +3503,7 @@ function evalOp(op, leftStr, right, row) {
     return !matchLike(leftStr, pattern);
   }
   const rightStr = resolveValue(right, row);
-  const leftNum = Number(leftStr);
-  const rightNum = Number(rightStr);
-  const numeric = !Number.isNaN(leftNum) && !Number.isNaN(rightNum);
-  switch (op) {
-    case "=":
-      return leftStr === rightStr;
-    case "!=":
-    case "<>":
-      return leftStr !== rightStr;
-    case ">":
-      return numeric ? leftNum > rightNum : leftStr > rightStr;
-    case "<":
-      return numeric ? leftNum < rightNum : leftStr < rightStr;
-    case ">=":
-      return numeric ? leftNum >= rightNum : leftStr >= rightStr;
-    case "<=":
-      return numeric ? leftNum <= rightNum : leftStr <= rightStr;
-  }
+  return compareScalarValues(op, leftStr, rightStr);
 }
 function assertResolvedInListValues2(values) {
   const unresolved = values.find((item) => item.type === "VARIABLE");
@@ -4086,60 +4106,59 @@ async function resolveDmlTargetIds(getRecords, app, query, options) {
 }
 
 // src/core/optimization/wherePredicatePushdown.ts
-function extractTableCondition(where, tableAlias) {
+function extractSafePushdownLeaves(where, options = {}) {
+  return extractAndLeaves(where, (expr) => isSafeComparison(expr, options));
+}
+function extractNumericPushdownCandidates(where, options = {}) {
+  return extractAndLeaves(where, (expr) => isNumericCandidate(expr, options));
+}
+function extractAndLeaves(where, accept) {
   switch (where.type) {
     case "BINARY":
-      if (isLike(where)) return null;
-      if (!isSingleTableField(where.left, tableAlias)) return null;
-      if (!isPushDownableRight(where.right)) return null;
-      return where;
-    case "NULL_CHECK":
-      if (!isSingleTableField(where.field, tableAlias)) return null;
-      return where;
+      return accept(where) ? where : null;
     case "LOGICAL":
-      if (where.op === "AND") {
-        const left = extractTableCondition(where.left, tableAlias);
-        const right = extractTableCondition(where.right, tableAlias);
+      if (where.op !== "AND") return null;
+      {
+        const left = extractAndLeaves(where.left, accept);
+        const right = extractAndLeaves(where.right, accept);
         if (left && right) return { ...where, left, right };
         return left ?? right ?? null;
       }
-      return referencesOnlyTable(where, tableAlias) ? where : null;
-    case "NOT":
     case "GROUP":
-      return referencesOnlyTable(where, tableAlias) ? where : null;
+      return extractAndLeaves(where.expr, accept);
+    case "NULL_CHECK":
+    case "NOT":
     case "EXISTS":
       return null;
   }
 }
-function isSingleTableField(field, tableAlias) {
-  if (field.type !== "FIELD") return false;
-  return field.tableAlias === tableAlias;
+function isSafeComparison(expr, options) {
+  if (isSafeIdComparison(expr, options)) return true;
+  if (!isNumericCandidate(expr, options)) return false;
+  return options.fieldTypes?.get(expr.left.field) === "NUMBER";
 }
-function isPushDownableRight(value) {
-  switch (value.type) {
-    case "STRING":
-    case "NUMBER":
-    case "KINTONE_FUNC":
-    case "IN_LIST":
-      return true;
-    default:
-      return false;
-  }
+function isSafeIdComparison(expr, options) {
+  if (!isTargetIdField(expr.left, options)) return false;
+  if (expr.right.type !== "NUMBER") return false;
+  return expr.op === "=" || expr.op === ">" || expr.op === "<" || expr.op === ">=" || expr.op === "<=";
 }
-function referencesOnlyTable(expr, tableAlias) {
-  switch (expr.type) {
-    case "BINARY":
-      return !isLike(expr) && isSingleTableField(expr.left, tableAlias) && isPushDownableRight(expr.right);
-    case "NULL_CHECK":
-      return isSingleTableField(expr.field, tableAlias);
-    case "LOGICAL":
-      return referencesOnlyTable(expr.left, tableAlias) && referencesOnlyTable(expr.right, tableAlias);
-    case "NOT":
-    case "GROUP":
-      return referencesOnlyTable(expr.expr, tableAlias);
-    case "EXISTS":
-      return false;
-  }
+function isTargetIdField(field, options) {
+  if (field.type !== "FIELD" || field.field !== "$id") return false;
+  const targetAlias = options.tableAlias ?? null;
+  if (field.tableAlias === targetAlias) return true;
+  return options.allowUnqualifiedFields === true && field.tableAlias === null;
+}
+function isNumericCandidate(expr, options) {
+  if (expr.left.type !== "FIELD" || expr.left.field === "$id") return false;
+  if (!isTargetField(expr.left, options)) return false;
+  if (expr.right.type !== "NUMBER") return false;
+  if (expr.op === "=") return true;
+  return (expr.op === "<" || expr.op === ">") && Number.isSafeInteger(expr.right.value);
+}
+function isTargetField(field, options) {
+  const targetAlias = options.tableAlias ?? null;
+  if (field.tableAlias === targetAlias) return true;
+  return options.allowUnqualifiedFields === true && field.tableAlias === null;
 }
 
 // src/engine/process.ts
@@ -4916,7 +4935,26 @@ async function executeBatch(sql, client, options = {}) {
 }
 async function executeBatchStatement(stmt, info, client, options, cacheContext, tempTables, variables) {
   if (stmt.type === "SET_VARIABLE") {
-    variables.set(stmt.name, evaluateScalarExpr(stmt.expr));
+    const resolvedStmt2 = resolveVariableRefs(stmt, variables);
+    if (resolvedStmt2.expr.type === "SCALAR_SUBQUERY") {
+      try {
+        const value = await evaluateScalarSubquery(
+          resolvedStmt2.expr.query,
+          client,
+          options,
+          cacheContext,
+          tempTables
+        );
+        variables.set(stmt.name, { type: "string", value });
+      } catch (e) {
+        if (e instanceof ScalarSubqueryError) {
+          throw new Error(`ArgumentError: ${e.message}`);
+        }
+        throw e;
+      }
+    } else {
+      variables.set(stmt.name, evaluateScalarExpr(resolvedStmt2.expr));
+    }
     return {};
   }
   const resolvedStmt = resolveVariableRefs(stmt, variables);
@@ -5079,6 +5117,12 @@ var AssertError = class extends Error {
     this.name = "AssertError";
   }
 };
+var ScalarSubqueryError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "ScalarSubqueryError";
+  }
+};
 async function executeAssert(stmt, client, options, cacheContext, tempTables) {
   const left = await evalAssertOperand(stmt.left, client, options, cacheContext, tempTables);
   if (stmt.op === "BETWEEN") {
@@ -5087,7 +5131,7 @@ async function executeAssert(stmt, client, options, cacheContext, tempTables) {
     }
     const low = await evalAssertOperand(stmt.low, client, options, cacheContext, tempTables);
     const high = await evalAssertOperand(stmt.high, client, options, cacheContext, tempTables);
-    if (!compareAssertValues(">=", left, low) || !compareAssertValues("<=", left, high)) {
+    if (!compareScalarValues(">=", left, low) || !compareScalarValues("<=", left, high)) {
       throw new AssertError(`assertion failed: ${stmt.text} (actual: ${left}).`);
     }
     return { type: "ASSERT", condition: stmt.text };
@@ -5096,7 +5140,7 @@ async function executeAssert(stmt, client, options, cacheContext, tempTables) {
     throw new Error("ArgumentError: malformed ASSERT statement.");
   }
   const right = await evalAssertOperand(stmt.right, client, options, cacheContext, tempTables);
-  if (!compareAssertValues(stmt.op, left, right)) {
+  if (!compareScalarValues(stmt.op, left, right)) {
     throw new AssertError(`assertion failed: ${stmt.text} (actual: ${left}).`);
   }
   return { type: "ASSERT", condition: stmt.text };
@@ -5112,25 +5156,38 @@ async function evalAssertOperand(operand, client, options, cacheContext, tempTab
     case "ARITH":
       return String(evalAssertArith(operand));
     case "SCALAR_SUBQUERY": {
-      const { query, probed } = withScalarProbeLimit(operand.query);
-      const result = await runSubquery(query, client, options, cacheContext, tempTables);
-      if (result.columns.length > 1) {
-        throw new AssertError(
-          `scalar subquery returned ${result.columns.length} columns (expected 1 column).`
+      try {
+        return await evaluateScalarSubquery(
+          operand.query,
+          client,
+          options,
+          cacheContext,
+          tempTables
         );
+      } catch (e) {
+        if (e instanceof ScalarSubqueryError) throw new AssertError(e.message);
+        throw e;
       }
-      if (result.rowCount === 0) {
-        throw new AssertError("scalar subquery returned no rows (expected 1 row).");
-      }
-      if (result.rowCount > 1) {
-        const rows = probed && result.rowCount === 2 ? "2 or more rows" : `${result.rowCount} rows`;
-        throw new AssertError(`scalar subquery returned ${rows} (expected 1 row).`);
-      }
-      const col = result.columns[0] ?? "";
-      return result.rows[0]?.[col] ?? "";
     }
   }
 }
+async function evaluateScalarSubquery(sourceQuery, client, options, cacheContext, tempTables) {
+  const { query, probed } = withScalarProbeLimit(sourceQuery);
+  const result = await runSubquery(query, client, options, cacheContext, tempTables);
+  if (result.columns.length !== 1) {
+    throw new ScalarSubqueryError(
+      `scalar subquery returned ${result.columns.length} columns (expected 1 column).`
+    );
+  }
+  if (result.rowCount === 0) {
+    throw new ScalarSubqueryError("scalar subquery returned no rows (expected 1 row).");
+  }
+  if (result.rowCount > 1) {
+    const rows = probed && result.rowCount === 2 ? "2 or more rows" : `${result.rowCount} rows`;
+    throw new ScalarSubqueryError(`scalar subquery returned ${rows} (expected 1 row).`);
+  }
+  return result.rows[0]?.[result.columns[0]] ?? "";
+}
 function withScalarProbeLimit(query) {
   const hasAgg = query.groupBy.length > 0 || query.columns.some((c) => c.type === "AGGREGATE" || c.type === "ARITH_AGG_COL");
   if (hasAgg || query.distinct || query.limit !== null) return { query, probed: false };
@@ -5156,26 +5213,6 @@ function evalAssertArith(node) {
   }
   throw new Error(`ArgumentError: unsupported operand in ASSERT expression: ${node.type}`);
 }
-function compareAssertValues(op, leftStr, rightStr) {
-  const leftNum = Number(leftStr);
-  const rightNum = Number(rightStr);
-  const numeric = !Number.isNaN(leftNum) && !Number.isNaN(rightNum);
-  switch (op) {
-    case "=":
-      return leftStr === rightStr;
-    case "!=":
-    case "<>":
-      return leftStr !== rightStr;
-    case ">":
-      return numeric ? leftNum > rightNum : leftStr > rightStr;
-    case "<":
-      return numeric ? leftNum < rightNum : leftStr < rightStr;
-    case ">=":
-      return numeric ? leftNum >= rightNum : leftStr >= rightStr;
-    case "<=":
-      return numeric ? leftNum <= rightNum : leftStr <= rightStr;
-  }
-}
 async function executeSelect(stmt, client, options, cacheContext, cteCache) {
   if (isNoFromSelect(stmt)) {
     return executeNoFromSelect(stmt);
@@ -5309,6 +5346,44 @@ async function validateSelectFieldCodes(stmt, mode, client, cacheContext) {
     }
   }
 }
+function extractMainSafePushdown(stmt, fieldTypes) {
+  if (stmt.where === null || stmt.from.subtableCode || stmt.from.cteName !== null) return null;
+  if (stmt.joins.length === 0) {
+    return extractSafePushdownLeaves(stmt.where, {
+      tableAlias: stmt.from.alias ?? void 0,
+      allowUnqualifiedFields: true,
+      fieldTypes
+    });
+  }
+  if (!stmt.from.alias) return null;
+  return extractSafePushdownLeaves(stmt.where, { tableAlias: stmt.from.alias, fieldTypes });
+}
+function extractMainNumericPushdownCandidate(stmt) {
+  if (stmt.where === null || stmt.from.subtableCode || stmt.from.cteName !== null) return null;
+  if (stmt.joins.length === 0) {
+    return extractNumericPushdownCandidates(stmt.where, {
+      tableAlias: stmt.from.alias ?? void 0,
+      allowUnqualifiedFields: true
+    });
+  }
+  if (!stmt.from.alias) return null;
+  return extractNumericPushdownCandidates(stmt.where, { tableAlias: stmt.from.alias });
+}
+async function loadNumericPushdownFieldTypes(stmt, client, cacheContext) {
+  const appIds = /* @__PURE__ */ new Set();
+  if (extractMainNumericPushdownCandidate(stmt) !== null) appIds.add(stmt.from.appId);
+  if (stmt.where !== null) {
+    for (const join2 of stmt.joins) {
+      if (!join2.table.alias || join2.table.subtableCode || join2.table.cteName !== null) continue;
+      const candidate = extractNumericPushdownCandidates(stmt.where, {
+        tableAlias: join2.table.alias
+      });
+      if (candidate !== null) appIds.add(join2.table.appId);
+    }
+  }
+  const entries = await Promise.all([...appIds].map(async (appId) => [appId, await getFieldTypeMap(appId, client, cacheContext)]));
+  return new Map(entries);
+}
 async function executeFullScanSelect(stmt, client, options, cacheContext, cteCache) {
   const maxRecords = options.maxRecords ?? 1e4;
   const warnings = /* @__PURE__ */ new Set();
@@ -5317,20 +5392,22 @@ async function executeFullScanSelect(stmt, client, options, cacheContext, cteCac
     resolveSubqueries(stmt.where, client, options, cacheContext, cteCache),
     resolveSubqueries(stmt.having, client, options, cacheContext, cteCache)
   ]);
+  const pushdownFieldTypes = await loadNumericPushdownFieldTypes(stmt, client, cacheContext);
+  const mainPushDown = extractMainSafePushdown(
+    stmt,
+    pushdownFieldTypes.get(stmt.from.appId)
+  );
   const tableConditions = /* @__PURE__ */ new Map();
   if (stmt.where !== null) {
-    if (stmt.from.alias) {
-      const cond = extractTableCondition(stmt.where, stmt.from.alias);
-      if (cond) tableConditions.set(stmt.from.alias, cond);
-    }
     for (const join2 of stmt.joins) {
-      if (join2.table.alias) {
-        const cond = extractTableCondition(stmt.where, join2.table.alias);
-        if (cond) tableConditions.set(join2.table.alias, cond);
-      }
+      if (!join2.table.alias || join2.table.subtableCode || join2.table.cteName !== null) continue;
+      const cond = extractSafePushdownLeaves(stmt.where, {
+        tableAlias: join2.table.alias,
+        fieldTypes: pushdownFieldTypes.get(join2.table.appId)
+      });
+      if (cond) tableConditions.set(join2.table.alias, cond);
     }
   }
-  const mainPushDown = stmt.from.alias ? tableConditions.get(stmt.from.alias) ?? null : null;
   const mainFetch = fetchTableRecordsForFullScan(
     stmt,
     stmt.from,
@@ -6612,7 +6689,7 @@ function buildBatchExplainPlans(sql) {
   return {
     statementCount: statements.length,
     statements: statements.map((stmt, i) => {
-      const planStmt = stmt.type === "SET_VARIABLE" ? stmt : resolveVariableRefs(stmt, variables);
+      const planStmt = stmt.type === "SET_VARIABLE" ? stmt.expr.type === "SCALAR_SUBQUERY" ? { ...stmt, expr: resolveVariableRefs(stmt.expr, variables) } : stmt : resolveVariableRefs(stmt, variables);
       const result = {
         index: i,
         type: analysis.statements[i].statementType,
@@ -6641,6 +6718,15 @@ function buildBatchStatementPlan(stmt, info) {
     ];
   }
   if (stmt.type === "SET_VARIABLE") {
+    if (stmt.expr.type === "SCALAR_SUBQUERY") {
+      const subInfo = hasTempTableRef(stmt.expr.query) ? info : { ...info, tempTablesReferenced: [] };
+      return [
+        `SET @${stmt.name} = (SELECT ...)`,
+        "  value:         \u30B5\u30D6\u30AF\u30A8\u30EA\u3092\u5B9F\u884C\u6642\u306B1\u56DE\u8A55\u4FA1\uFF081\u884C1\u5217\u30FB\u30D0\u30C3\u30C1\u5185\u5B9A\u6570\u30FB\u7D50\u679C\u30E1\u30BF\u30C7\u30FC\u30BF\u306B\u306F\u975E\u516C\u958B\uFF09",
+        "  subquery:",
+        ...buildPlanForBatchQuery(stmt.expr.query, subInfo).map((l) => `  ${l}`)
+      ];
+    }
     return [
       `SET @${stmt.name} = <scalar expression>`,
       "  value:         \u5B9F\u884C\u6642\u306B1\u56DE\u8A55\u4FA1\uFF08\u30D0\u30C3\u30C1\u5185\u5B9A\u6570\u30FB\u7D50\u679C\u30E1\u30BF\u30C7\u30FC\u30BF\u306B\u306F\u975E\u516C\u958B\uFF09"
@@ -6741,19 +6827,27 @@ function buildSelectPlan(stmt, label) {
   } else {
     const mainFields = selectToFetchAllFields(stmt, stmt.from);
     const mainAliasStr = stmt.from.alias ? ` AS ${stmt.from.alias}` : "";
-    const mainPushDown = stmt.from.alias && stmt.where ? extractTableCondition(stmt.where, stmt.from.alias) : null;
+    const mainPushDown = extractMainSafePushdown(stmt);
+    const mainCandidate = extractMainNumericPushdownCandidate(stmt);
     const mainQ = mainPushDown !== null ? whereToKintone(mainPushDown) : "(\u5168\u4EF6\u53D6\u5F97)";
     lines.push(`  app:           APP${stmt.from.appId}${mainAliasStr} (${stmt.from.appId})`);
     lines.push(`  kintone query: ${mainQ}`);
+    if (mainCandidate !== null) {
+      lines.push(`  pushdown candidate: ${whereToKintone(mainCandidate)}\uFF08\u5B9F\u884C\u6642\u306E\u578B\u78BA\u8A8D\u5F85\u3061\uFF09`);
+    }
     lines.push(`  fields:        ${mainFields.length === 0 ? "(\u5168\u30D5\u30A3\u30FC\u30EB\u30C9)" : mainFields.join(", ")}`);
     for (const join2 of stmt.joins) {
       const joinFields = selectToFetchAllFields(stmt, join2.table);
       const joinAliasStr = join2.table.alias ? ` AS ${join2.table.alias}` : "";
       const joinType = join2.type === "INNER" ? "JOIN" : `${join2.type} JOIN`;
-      const joinPushDown = join2.table.alias && stmt.where ? extractTableCondition(stmt.where, join2.table.alias) : null;
+      const joinPushDown = join2.table.alias && !join2.table.subtableCode && join2.table.cteName === null && stmt.where ? extractSafePushdownLeaves(stmt.where, { tableAlias: join2.table.alias }) : null;
+      const joinCandidate = join2.table.alias && !join2.table.subtableCode && join2.table.cteName === null && stmt.where ? extractNumericPushdownCandidates(stmt.where, { tableAlias: join2.table.alias }) : null;
       const joinQ = joinPushDown !== null ? whereToKintone(joinPushDown) : "(\u5168\u4EF6\u53D6\u5F97)";
       lines.push(`  ${joinType}:        APP${join2.table.appId}${joinAliasStr} (${join2.table.appId})`);
       lines.push(`  kintone query: ${joinQ}`);
+      if (joinCandidate !== null) {
+        lines.push(`  pushdown candidate: ${whereToKintone(joinCandidate)}\uFF08\u5B9F\u884C\u6642\u306E\u578B\u78BA\u8A8D\u5F85\u3061\uFF09`);
+      }
       lines.push(`  fields:        ${joinFields.length === 0 ? "(\u5168\u30D5\u30A3\u30FC\u30EB\u30C9)" : joinFields.join(", ")}`);
     }
   }

package/dist-mcp/ksql-mcp.js

@@ -31542,7 +31542,22 @@ var Parser = class {
       throw new ParseError("SET \u306E\u53F3\u8FBA\u3067 NULL \u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\uFF08Phase 1a\uFF09", tok);
     }
     if (tok.kind === "(" /* LPAREN */ && this.peekAt(1).kind === "SELECT" /* SELECT */) {
-      throw new ParseError("SET \u306E\u30B9\u30AB\u30E9\u30FC\u30B5\u30D6\u30AF\u30A8\u30EA\u4EE3\u5165\u306F Phase 1b \u3067\u5BFE\u5FDC\u4E88\u5B9A\u3067\u3059", tok);
+      this.advance();
+      const query = this.parseSelect();
+      this.expect(")" /* RPAREN */);
+      if (this.isArithOp(this.peek().kind)) {
+        throw new ParseError(
+          "\u30B9\u30AB\u30E9\u30FC\u30B5\u30D6\u30AF\u30A8\u30EA\u306E\u5F8C\u306B\u7B97\u8853\u6F14\u7B97\u5B50\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u30B5\u30D6\u30AF\u30A8\u30EA\u5185\u3067\u8A08\u7B97\u3057\u3066\u304F\u3060\u3055\u3044",
+          this.peek()
+        );
+      }
+      const hasWildcard = query.columns.some(
+        (c) => c.type === "WILDCARD" || c.type === "PARENT_WILDCARD"
+      );
+      if (!hasWildcard && query.columns.length !== 1) {
+        throw new ParseError("scalar subquery in SET must return exactly 1 column.", tok);
+      }
+      return { type: "SCALAR_SUBQUERY", query };
     }
     if (tok.kind === "STRING" /* STRING */) {
       this.advance();
@@ -33393,6 +33408,28 @@ function analyzeBatch(statements) {
   };
 }
 
+// src/core/scalarCompare.ts
+function compareScalarValues(op, leftStr, rightStr) {
+  if (op === "=") return leftStr === rightStr;
+  if (op === "!=" || op === "<>") return leftStr !== rightStr;
+  const rightNum = Number(rightStr);
+  if (leftStr === "" && rightStr !== "" && Number.isFinite(rightNum)) {
+    return op === "<" || op === "<=";
+  }
+  const leftNum = Number(leftStr);
+  const numeric = !Number.isNaN(leftNum) && !Number.isNaN(rightNum);
+  switch (op) {
+    case ">":
+      return numeric ? leftNum > rightNum : leftStr > rightStr;
+    case "<":
+      return numeric ? leftNum < rightNum : leftStr < rightStr;
+    case ">=":
+      return numeric ? leftNum >= rightNum : leftStr >= rightStr;
+    case "<=":
+      return numeric ? leftNum <= rightNum : leftStr <= rightStr;
+  }
+}
+
 // src/engine/pushDownNot.ts
 function pushDownNot(expr) {
   switch (expr.type) {
@@ -34367,24 +34404,7 @@ function evalOp(op, leftStr, right, row) {
     return !matchLike(leftStr, pattern);
   }
   const rightStr = resolveValue(right, row);
-  const leftNum = Number(leftStr);
-  const rightNum = Number(rightStr);
-  const numeric = !Number.isNaN(leftNum) && !Number.isNaN(rightNum);
-  switch (op) {
-    case "=":
-      return leftStr === rightStr;
-    case "!=":
-    case "<>":
-      return leftStr !== rightStr;
-    case ">":
-      return numeric ? leftNum > rightNum : leftStr > rightStr;
-    case "<":
-      return numeric ? leftNum < rightNum : leftStr < rightStr;
-    case ">=":
-      return numeric ? leftNum >= rightNum : leftStr >= rightStr;
-    case "<=":
-      return numeric ? leftNum <= rightNum : leftStr <= rightStr;
-  }
+  return compareScalarValues(op, leftStr, rightStr);
 }
 function assertResolvedInListValues2(values) {
   const unresolved = values.find((item) => item.type === "VARIABLE");
@@ -34987,60 +35007,59 @@ async function resolveDmlTargetIds(getRecords, app, query, options) {
 }
 
 // src/core/optimization/wherePredicatePushdown.ts
-function extractTableCondition(where, tableAlias) {
+function extractSafePushdownLeaves(where, options = {}) {
+  return extractAndLeaves(where, (expr) => isSafeComparison(expr, options));
+}
+function extractNumericPushdownCandidates(where, options = {}) {
+  return extractAndLeaves(where, (expr) => isNumericCandidate(expr, options));
+}
+function extractAndLeaves(where, accept) {
   switch (where.type) {
     case "BINARY":
-      if (isLike(where)) return null;
-      if (!isSingleTableField(where.left, tableAlias)) return null;
-      if (!isPushDownableRight(where.right)) return null;
-      return where;
-    case "NULL_CHECK":
-      if (!isSingleTableField(where.field, tableAlias)) return null;
-      return where;
+      return accept(where) ? where : null;
     case "LOGICAL":
-      if (where.op === "AND") {
-        const left = extractTableCondition(where.left, tableAlias);
-        const right = extractTableCondition(where.right, tableAlias);
+      if (where.op !== "AND") return null;
+      {
+        const left = extractAndLeaves(where.left, accept);
+        const right = extractAndLeaves(where.right, accept);
         if (left && right) return { ...where, left, right };
         return left ?? right ?? null;
       }
-      return referencesOnlyTable(where, tableAlias) ? where : null;
-    case "NOT":
     case "GROUP":
-      return referencesOnlyTable(where, tableAlias) ? where : null;
+      return extractAndLeaves(where.expr, accept);
+    case "NULL_CHECK":
+    case "NOT":
     case "EXISTS":
       return null;
   }
 }
-function isSingleTableField(field, tableAlias) {
-  if (field.type !== "FIELD") return false;
-  return field.tableAlias === tableAlias;
+function isSafeComparison(expr, options) {
+  if (isSafeIdComparison(expr, options)) return true;
+  if (!isNumericCandidate(expr, options)) return false;
+  return options.fieldTypes?.get(expr.left.field) === "NUMBER";
 }
-function isPushDownableRight(value) {
-  switch (value.type) {
-    case "STRING":
-    case "NUMBER":
-    case "KINTONE_FUNC":
-    case "IN_LIST":
-      return true;
-    default:
-      return false;
-  }
+function isSafeIdComparison(expr, options) {
+  if (!isTargetIdField(expr.left, options)) return false;
+  if (expr.right.type !== "NUMBER") return false;
+  return expr.op === "=" || expr.op === ">" || expr.op === "<" || expr.op === ">=" || expr.op === "<=";
 }
-function referencesOnlyTable(expr, tableAlias) {
-  switch (expr.type) {
-    case "BINARY":
-      return !isLike(expr) && isSingleTableField(expr.left, tableAlias) && isPushDownableRight(expr.right);
-    case "NULL_CHECK":
-      return isSingleTableField(expr.field, tableAlias);
-    case "LOGICAL":
-      return referencesOnlyTable(expr.left, tableAlias) && referencesOnlyTable(expr.right, tableAlias);
-    case "NOT":
-    case "GROUP":
-      return referencesOnlyTable(expr.expr, tableAlias);
-    case "EXISTS":
-      return false;
-  }
+function isTargetIdField(field, options) {
+  if (field.type !== "FIELD" || field.field !== "$id") return false;
+  const targetAlias = options.tableAlias ?? null;
+  if (field.tableAlias === targetAlias) return true;
+  return options.allowUnqualifiedFields === true && field.tableAlias === null;
+}
+function isNumericCandidate(expr, options) {
+  if (expr.left.type !== "FIELD" || expr.left.field === "$id") return false;
+  if (!isTargetField(expr.left, options)) return false;
+  if (expr.right.type !== "NUMBER") return false;
+  if (expr.op === "=") return true;
+  return (expr.op === "<" || expr.op === ">") && Number.isSafeInteger(expr.right.value);
+}
+function isTargetField(field, options) {
+  const targetAlias = options.tableAlias ?? null;
+  if (field.tableAlias === targetAlias) return true;
+  return options.allowUnqualifiedFields === true && field.tableAlias === null;
 }
 
 // src/engine/process.ts
@@ -35817,7 +35836,26 @@ async function executeBatch(sql, client, options = {}) {
 }
 async function executeBatchStatement(stmt, info, client, options, cacheContext, tempTables, variables) {
   if (stmt.type === "SET_VARIABLE") {
-    variables.set(stmt.name, evaluateScalarExpr(stmt.expr));
+    const resolvedStmt2 = resolveVariableRefs(stmt, variables);
+    if (resolvedStmt2.expr.type === "SCALAR_SUBQUERY") {
+      try {
+        const value = await evaluateScalarSubquery(
+          resolvedStmt2.expr.query,
+          client,
+          options,
+          cacheContext,
+          tempTables
+        );
+        variables.set(stmt.name, { type: "string", value });
+      } catch (e) {
+        if (e instanceof ScalarSubqueryError) {
+          throw new Error(`ArgumentError: ${e.message}`);
+        }
+        throw e;
+      }
+    } else {
+      variables.set(stmt.name, evaluateScalarExpr(resolvedStmt2.expr));
+    }
     return {};
   }
   const resolvedStmt = resolveVariableRefs(stmt, variables);
@@ -35980,6 +36018,12 @@ var AssertError = class extends Error {
     this.name = "AssertError";
   }
 };
+var ScalarSubqueryError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "ScalarSubqueryError";
+  }
+};
 async function executeAssert(stmt, client, options, cacheContext, tempTables) {
   const left = await evalAssertOperand(stmt.left, client, options, cacheContext, tempTables);
   if (stmt.op === "BETWEEN") {
@@ -35988,7 +36032,7 @@ async function executeAssert(stmt, client, options, cacheContext, tempTables) {
     }
     const low = await evalAssertOperand(stmt.low, client, options, cacheContext, tempTables);
     const high = await evalAssertOperand(stmt.high, client, options, cacheContext, tempTables);
-    if (!compareAssertValues(">=", left, low) || !compareAssertValues("<=", left, high)) {
+    if (!compareScalarValues(">=", left, low) || !compareScalarValues("<=", left, high)) {
       throw new AssertError(`assertion failed: ${stmt.text} (actual: ${left}).`);
     }
     return { type: "ASSERT", condition: stmt.text };
@@ -35997,7 +36041,7 @@ async function executeAssert(stmt, client, options, cacheContext, tempTables) {
     throw new Error("ArgumentError: malformed ASSERT statement.");
   }
   const right = await evalAssertOperand(stmt.right, client, options, cacheContext, tempTables);
-  if (!compareAssertValues(stmt.op, left, right)) {
+  if (!compareScalarValues(stmt.op, left, right)) {
     throw new AssertError(`assertion failed: ${stmt.text} (actual: ${left}).`);
   }
   return { type: "ASSERT", condition: stmt.text };
@@ -36013,25 +36057,38 @@ async function evalAssertOperand(operand, client, options, cacheContext, tempTab
     case "ARITH":
       return String(evalAssertArith(operand));
     case "SCALAR_SUBQUERY": {
-      const { query, probed } = withScalarProbeLimit(operand.query);
-      const result = await runSubquery(query, client, options, cacheContext, tempTables);
-      if (result.columns.length > 1) {
-        throw new AssertError(
-          `scalar subquery returned ${result.columns.length} columns (expected 1 column).`
+      try {
+        return await evaluateScalarSubquery(
+          operand.query,
+          client,
+          options,
+          cacheContext,
+          tempTables
         );
+      } catch (e) {
+        if (e instanceof ScalarSubqueryError) throw new AssertError(e.message);
+        throw e;
       }
-      if (result.rowCount === 0) {
-        throw new AssertError("scalar subquery returned no rows (expected 1 row).");
-      }
-      if (result.rowCount > 1) {
-        const rows = probed && result.rowCount === 2 ? "2 or more rows" : `${result.rowCount} rows`;
-        throw new AssertError(`scalar subquery returned ${rows} (expected 1 row).`);
-      }
-      const col = result.columns[0] ?? "";
-      return result.rows[0]?.[col] ?? "";
     }
   }
 }
+async function evaluateScalarSubquery(sourceQuery, client, options, cacheContext, tempTables) {
+  const { query, probed } = withScalarProbeLimit(sourceQuery);
+  const result = await runSubquery(query, client, options, cacheContext, tempTables);
+  if (result.columns.length !== 1) {
+    throw new ScalarSubqueryError(
+      `scalar subquery returned ${result.columns.length} columns (expected 1 column).`
+    );
+  }
+  if (result.rowCount === 0) {
+    throw new ScalarSubqueryError("scalar subquery returned no rows (expected 1 row).");
+  }
+  if (result.rowCount > 1) {
+    const rows = probed && result.rowCount === 2 ? "2 or more rows" : `${result.rowCount} rows`;
+    throw new ScalarSubqueryError(`scalar subquery returned ${rows} (expected 1 row).`);
+  }
+  return result.rows[0]?.[result.columns[0]] ?? "";
+}
 function withScalarProbeLimit(query) {
   const hasAgg = query.groupBy.length > 0 || query.columns.some((c) => c.type === "AGGREGATE" || c.type === "ARITH_AGG_COL");
   if (hasAgg || query.distinct || query.limit !== null) return { query, probed: false };
@@ -36057,26 +36114,6 @@ function evalAssertArith(node) {
   }
   throw new Error(`ArgumentError: unsupported operand in ASSERT expression: ${node.type}`);
 }
-function compareAssertValues(op, leftStr, rightStr) {
-  const leftNum = Number(leftStr);
-  const rightNum = Number(rightStr);
-  const numeric = !Number.isNaN(leftNum) && !Number.isNaN(rightNum);
-  switch (op) {
-    case "=":
-      return leftStr === rightStr;
-    case "!=":
-    case "<>":
-      return leftStr !== rightStr;
-    case ">":
-      return numeric ? leftNum > rightNum : leftStr > rightStr;
-    case "<":
-      return numeric ? leftNum < rightNum : leftStr < rightStr;
-    case ">=":
-      return numeric ? leftNum >= rightNum : leftStr >= rightStr;
-    case "<=":
-      return numeric ? leftNum <= rightNum : leftStr <= rightStr;
-  }
-}
 async function executeSelect(stmt, client, options, cacheContext, cteCache) {
   if (isNoFromSelect(stmt)) {
     return executeNoFromSelect(stmt);
@@ -36210,6 +36247,44 @@ async function validateSelectFieldCodes(stmt, mode, client, cacheContext) {
     }
   }
 }
+function extractMainSafePushdown(stmt, fieldTypes) {
+  if (stmt.where === null || stmt.from.subtableCode || stmt.from.cteName !== null) return null;
+  if (stmt.joins.length === 0) {
+    return extractSafePushdownLeaves(stmt.where, {
+      tableAlias: stmt.from.alias ?? void 0,
+      allowUnqualifiedFields: true,
+      fieldTypes
+    });
+  }
+  if (!stmt.from.alias) return null;
+  return extractSafePushdownLeaves(stmt.where, { tableAlias: stmt.from.alias, fieldTypes });
+}
+function extractMainNumericPushdownCandidate(stmt) {
+  if (stmt.where === null || stmt.from.subtableCode || stmt.from.cteName !== null) return null;
+  if (stmt.joins.length === 0) {
+    return extractNumericPushdownCandidates(stmt.where, {
+      tableAlias: stmt.from.alias ?? void 0,
+      allowUnqualifiedFields: true
+    });
+  }
+  if (!stmt.from.alias) return null;
+  return extractNumericPushdownCandidates(stmt.where, { tableAlias: stmt.from.alias });
+}
+async function loadNumericPushdownFieldTypes(stmt, client, cacheContext) {
+  const appIds = /* @__PURE__ */ new Set();
+  if (extractMainNumericPushdownCandidate(stmt) !== null) appIds.add(stmt.from.appId);
+  if (stmt.where !== null) {
+    for (const join of stmt.joins) {
+      if (!join.table.alias || join.table.subtableCode || join.table.cteName !== null) continue;
+      const candidate = extractNumericPushdownCandidates(stmt.where, {
+        tableAlias: join.table.alias
+      });
+      if (candidate !== null) appIds.add(join.table.appId);
+    }
+  }
+  const entries = await Promise.all([...appIds].map(async (appId) => [appId, await getFieldTypeMap(appId, client, cacheContext)]));
+  return new Map(entries);
+}
 async function executeFullScanSelect(stmt, client, options, cacheContext, cteCache) {
   const maxRecords2 = options.maxRecords ?? 1e4;
   const warnings = /* @__PURE__ */ new Set();
@@ -36218,20 +36293,22 @@ async function executeFullScanSelect(stmt, client, options, cacheContext, cteCac
     resolveSubqueries(stmt.where, client, options, cacheContext, cteCache),
     resolveSubqueries(stmt.having, client, options, cacheContext, cteCache)
   ]);
+  const pushdownFieldTypes = await loadNumericPushdownFieldTypes(stmt, client, cacheContext);
+  const mainPushDown = extractMainSafePushdown(
+    stmt,
+    pushdownFieldTypes.get(stmt.from.appId)
+  );
   const tableConditions = /* @__PURE__ */ new Map();
   if (stmt.where !== null) {
-    if (stmt.from.alias) {
-      const cond = extractTableCondition(stmt.where, stmt.from.alias);
-      if (cond) tableConditions.set(stmt.from.alias, cond);
-    }
     for (const join of stmt.joins) {
-      if (join.table.alias) {
-        const cond = extractTableCondition(stmt.where, join.table.alias);
-        if (cond) tableConditions.set(join.table.alias, cond);
-      }
+      if (!join.table.alias || join.table.subtableCode || join.table.cteName !== null) continue;
+      const cond = extractSafePushdownLeaves(stmt.where, {
+        tableAlias: join.table.alias,
+        fieldTypes: pushdownFieldTypes.get(join.table.appId)
+      });
+      if (cond) tableConditions.set(join.table.alias, cond);
     }
   }
-  const mainPushDown = stmt.from.alias ? tableConditions.get(stmt.from.alias) ?? null : null;
   const mainFetch = fetchTableRecordsForFullScan(
     stmt,
     stmt.from,
@@ -37513,7 +37590,7 @@ function buildBatchExplainPlans(sql) {
   return {
     statementCount: statements.length,
     statements: statements.map((stmt, i) => {
-      const planStmt = stmt.type === "SET_VARIABLE" ? stmt : resolveVariableRefs(stmt, variables);
+      const planStmt = stmt.type === "SET_VARIABLE" ? stmt.expr.type === "SCALAR_SUBQUERY" ? { ...stmt, expr: resolveVariableRefs(stmt.expr, variables) } : stmt : resolveVariableRefs(stmt, variables);
       const result = {
         index: i,
         type: analysis.statements[i].statementType,
@@ -37542,6 +37619,15 @@ function buildBatchStatementPlan(stmt, info) {
     ];
   }
   if (stmt.type === "SET_VARIABLE") {
+    if (stmt.expr.type === "SCALAR_SUBQUERY") {
+      const subInfo = hasTempTableRef(stmt.expr.query) ? info : { ...info, tempTablesReferenced: [] };
+      return [
+        `SET @${stmt.name} = (SELECT ...)`,
+        "  value:         \u30B5\u30D6\u30AF\u30A8\u30EA\u3092\u5B9F\u884C\u6642\u306B1\u56DE\u8A55\u4FA1\uFF081\u884C1\u5217\u30FB\u30D0\u30C3\u30C1\u5185\u5B9A\u6570\u30FB\u7D50\u679C\u30E1\u30BF\u30C7\u30FC\u30BF\u306B\u306F\u975E\u516C\u958B\uFF09",
+        "  subquery:",
+        ...buildPlanForBatchQuery(stmt.expr.query, subInfo).map((l) => `  ${l}`)
+      ];
+    }
     return [
       `SET @${stmt.name} = <scalar expression>`,
       "  value:         \u5B9F\u884C\u6642\u306B1\u56DE\u8A55\u4FA1\uFF08\u30D0\u30C3\u30C1\u5185\u5B9A\u6570\u30FB\u7D50\u679C\u30E1\u30BF\u30C7\u30FC\u30BF\u306B\u306F\u975E\u516C\u958B\uFF09"
@@ -37642,19 +37728,27 @@ function buildSelectPlan(stmt, label) {
   } else {
     const mainFields = selectToFetchAllFields(stmt, stmt.from);
     const mainAliasStr = stmt.from.alias ? ` AS ${stmt.from.alias}` : "";
-    const mainPushDown = stmt.from.alias && stmt.where ? extractTableCondition(stmt.where, stmt.from.alias) : null;
+    const mainPushDown = extractMainSafePushdown(stmt);
+    const mainCandidate = extractMainNumericPushdownCandidate(stmt);
     const mainQ = mainPushDown !== null ? whereToKintone(mainPushDown) : "(\u5168\u4EF6\u53D6\u5F97)";
     lines.push(`  app:           APP${stmt.from.appId}${mainAliasStr} (${stmt.from.appId})`);
     lines.push(`  kintone query: ${mainQ}`);
+    if (mainCandidate !== null) {
+      lines.push(`  pushdown candidate: ${whereToKintone(mainCandidate)}\uFF08\u5B9F\u884C\u6642\u306E\u578B\u78BA\u8A8D\u5F85\u3061\uFF09`);
+    }
     lines.push(`  fields:        ${mainFields.length === 0 ? "(\u5168\u30D5\u30A3\u30FC\u30EB\u30C9)" : mainFields.join(", ")}`);
     for (const join of stmt.joins) {
       const joinFields = selectToFetchAllFields(stmt, join.table);
       const joinAliasStr = join.table.alias ? ` AS ${join.table.alias}` : "";
       const joinType = join.type === "INNER" ? "JOIN" : `${join.type} JOIN`;
-      const joinPushDown = join.table.alias && stmt.where ? extractTableCondition(stmt.where, join.table.alias) : null;
+      const joinPushDown = join.table.alias && !join.table.subtableCode && join.table.cteName === null && stmt.where ? extractSafePushdownLeaves(stmt.where, { tableAlias: join.table.alias }) : null;
+      const joinCandidate = join.table.alias && !join.table.subtableCode && join.table.cteName === null && stmt.where ? extractNumericPushdownCandidates(stmt.where, { tableAlias: join.table.alias }) : null;
       const joinQ = joinPushDown !== null ? whereToKintone(joinPushDown) : "(\u5168\u4EF6\u53D6\u5F97)";
       lines.push(`  ${joinType}:        APP${join.table.appId}${joinAliasStr} (${join.table.appId})`);
       lines.push(`  kintone query: ${joinQ}`);
+      if (joinCandidate !== null) {
+        lines.push(`  pushdown candidate: ${whereToKintone(joinCandidate)}\uFF08\u5B9F\u884C\u6642\u306E\u578B\u78BA\u8A8D\u5F85\u3061\uFF09`);
+      }
       lines.push(`  fields:        ${joinFields.length === 0 ? "(\u5168\u30D5\u30A3\u30FC\u30EB\u30C9)" : joinFields.join(", ")}`);
     }
   }
@@ -39982,7 +40076,7 @@ Options:
   -h, --help         Show help
 `);
 }
-var SERVER_VERSION = true ? "2.1.2" : "0.0.0-dev";
+var SERVER_VERSION = true ? "2.3.0" : "0.0.0-dev";
 function createServer(args) {
   const server = new McpServer({
     name: "ksql-mcp",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rex0220/kintone-sql-tools",
-  "version": "2.1.2",
+  "version": "2.3.0",
   "description": "kintone SQL plugin, CLI, and MCP tools (ksql)",
   "publishConfig": {
     "access": "public"