@rex0220/kintone-sql-tools 1.1.0 → 1.1.2

package/dist-cli/ksql.js

@@ -3299,6 +3299,62 @@ async function resolveDmlTargetIds(getRecords, app, query, options) {
   };
 }
 
+// src/core/optimization/wherePredicatePushdown.ts
+function extractTableCondition(where, tableAlias) {
+  switch (where.type) {
+    case "BINARY":
+      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;
+    case "LOGICAL":
+      if (where.op === "AND") {
+        const left = extractTableCondition(where.left, tableAlias);
+        const right = extractTableCondition(where.right, tableAlias);
+        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;
+    case "EXISTS":
+      return null;
+  }
+}
+function isSingleTableField(field, tableAlias) {
+  if (field.type !== "FIELD") return false;
+  return field.tableAlias === tableAlias;
+}
+function isPushDownableRight(value) {
+  switch (value.type) {
+    case "STRING":
+    case "NUMBER":
+    case "KINTONE_FUNC":
+    case "IN_LIST":
+      return true;
+    default:
+      return false;
+  }
+}
+function referencesOnlyTable(expr, tableAlias) {
+  switch (expr.type) {
+    case "BINARY":
+      return 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;
+  }
+}
+
 // src/engine/process.ts
 function flatten(record, alias) {
   const row = {};
@@ -3652,7 +3708,12 @@ function project(rows, columns, scalarCache) {
         }
         case "STRFUNC_COL": {
           const key = col.alias ?? stringFuncDefaultKey(col.expr);
-          out[key] = row[key] ?? evalStringFunc(col.expr, row);
+          if (hasAggregateInStringFuncExpr2(col.expr)) {
+            const srcKey = stringFuncDefaultKey(col.expr);
+            out[key] = row[col.alias ?? srcKey] ?? row[srcKey] ?? evalStringFunc(col.expr, row);
+          } else {
+            out[key] = evalStringFunc(col.expr, row);
+          }
           if (rowIdx === 0) orderedKeys.push(key);
           break;
         }
@@ -3993,7 +4054,21 @@ async function executeFullScanSelect(stmt, client, options, cacheContext) {
   const parallel = options.fetchParallel ?? 1;
   await resolveSubqueries(stmt.where, client, options, cacheContext);
   await resolveSubqueries(stmt.having, client, options, cacheContext);
-  const mainRecords = await fetchTableRecordsForFullScan(
+  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);
+      }
+    }
+  }
+  const mainPushDown = stmt.from.alias ? tableConditions.get(stmt.from.alias) ?? null : null;
+  const mainFetch = fetchTableRecordsForFullScan(
     stmt,
     stmt.from,
     client,
@@ -4001,11 +4076,39 @@ async function executeFullScanSelect(stmt, client, options, cacheContext) {
     parallel,
     true,
     options.onLimitReached ?? "error",
-    warnings
+    warnings,
+    mainPushDown
   );
+  const parallelJoins = [];
+  const onOptJoins = [];
+  for (const join2 of stmt.joins) {
+    const jCond = join2.table.alias ? tableConditions.get(join2.table.alias) ?? null : null;
+    if (jCond !== null) {
+      parallelJoins.push({
+        join: join2,
+        promise: fetchTableRecordsForFullScan(
+          stmt,
+          join2.table,
+          client,
+          maxRecords,
+          parallel,
+          false,
+          options.onLimitReached ?? "error",
+          warnings,
+          jCond
+        )
+      });
+    } else {
+      onOptJoins.push(join2);
+    }
+  }
+  const mainRecords = await mainFetch;
   const tables = /* @__PURE__ */ new Map();
   tables.set(stmt.from.alias, mainRecords);
-  const joinFetches = stmt.joins.map(async (join2) => {
+  for (const { join: join2, promise } of parallelJoins) {
+    tables.set(join2.table.alias, await promise);
+  }
+  await Promise.all(onOptJoins.map(async (join2) => {
     const optimized = await tryFetchJoinRecordsBySourceKeys(
       stmt,
       join2,
@@ -4014,7 +4117,8 @@ async function executeFullScanSelect(stmt, client, options, cacheContext) {
       maxRecords,
       parallel,
       options.onLimitReached ?? "error",
-      warnings
+      warnings,
+      null
     );
     const joinRecords = optimized ?? await fetchTableRecordsForFullScan(
       stmt,
@@ -4024,11 +4128,11 @@ async function executeFullScanSelect(stmt, client, options, cacheContext) {
       parallel,
       false,
       options.onLimitReached ?? "error",
-      warnings
+      warnings,
+      null
     );
     tables.set(join2.table.alias, joinRecords);
-  });
-  await Promise.all(joinFetches);
+  }));
   const scalarCache = await resolveScalarColumns(stmt.columns, client, options, cacheContext);
   const optionOrders = await buildOptionOrdersForSelect(stmt, client, cacheContext);
   const sortKinds = await buildSortKindsForSelect(stmt, client, cacheContext);
@@ -4241,13 +4345,15 @@ function processRowToKintoneRecord(row) {
     Object.entries(row).map(([k, v]) => [k, { value: v ?? "" }])
   );
 }
-async function fetchTableRecordsForFullScan(stmt, table, client, maxRecords, parallel, isMainTable, onLimit, warnings) {
+async function fetchTableRecordsForFullScan(stmt, table, client, maxRecords, parallel, isMainTable, onLimit, warnings, pushDownCond = null) {
   const fields = selectToFetchAllFields(stmt, table);
   const onTruncate = (max) => {
     warnings.add(`\u53D6\u5F97\u4E0A\u9650\uFF08${max} \u4EF6\uFF09\u306B\u9054\u3057\u305F\u305F\u3081\u3001${max} \u4EF6\u3067\u6253\u3061\u5207\u3063\u3066\u8868\u793A\u3057\u3066\u3044\u307E\u3059\u3002`);
   };
   if (!table.subtableCode) {
-    const query = isMainTable ? selectToFetchAllParams(stmt, table.appId).query : "";
+    const baseQuery = isMainTable ? selectToFetchAllParams(stmt, table.appId).query : "";
+    const pushQuery = pushDownCond !== null ? whereToKintone(pushDownCond) : "";
+    const query = baseQuery && pushQuery ? `(${baseQuery}) and (${pushQuery})` : baseQuery || pushQuery;
     const resolved = await fetchRecordsForSharedPlan(client.getRecords, table.appId, query, fields, {
       parallel,
       maxRecords,
@@ -4282,7 +4388,7 @@ function splitChunks(items, size) {
 var JOIN_IN_CHUNK_SIZE = 50;
 var JOIN_IN_MAX_CHUNKS = 6;
 var JOIN_IN_MAX_KEYS = JOIN_IN_CHUNK_SIZE * JOIN_IN_MAX_CHUNKS;
-async function tryFetchJoinRecordsBySourceKeys(stmt, join2, tables, client, maxRecords, parallel, onLimit, warnings) {
+async function tryFetchJoinRecordsBySourceKeys(stmt, join2, tables, client, maxRecords, parallel, onLimit, warnings, pushDownCond = null) {
   if (join2.type !== "INNER") return null;
   if (!join2.table.alias) return null;
   if (join2.table.subtableCode) return null;
@@ -4315,7 +4421,7 @@ async function tryFetchJoinRecordsBySourceKeys(stmt, join2, tables, client, maxR
   if (values.length === 0) return [];
   if (values.length > JOIN_IN_MAX_KEYS) {
     warnings.add(
-      `JOIN\u30AD\u30FC\u304C ${values.length} \u4EF6\u306E\u305F\u3081 IN \u6700\u9069\u5316\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u3001JOIN\u5148\u3092\u5168\u4EF6\u53D6\u5F97\u3057\u307E\u3059\uFF08\u4E0A\u9650 ${JOIN_IN_MAX_KEYS} \u4EF6\uFF09\u3002`
+      `JOIN\u30AD\u30FC\u304C ${values.length} \u4EF6\u306E\u305F\u3081 ON \u6700\u9069\u5316\u3092\u30B9\u30AD\u30C3\u30D7\u3057\u3001JOIN\u5148\u3092\u5168\u4EF6\u53D6\u5F97\u3057\u307E\u3059\uFF08\u4E0A\u9650 ${JOIN_IN_MAX_KEYS} \u4EF6\uFF09\u3002`
     );
     return null;
   }
@@ -4327,7 +4433,8 @@ async function tryFetchJoinRecordsBySourceKeys(stmt, join2, tables, client, maxR
   const merged = [];
   const seen = /* @__PURE__ */ new Set();
   for (const chunk2 of chunks) {
-    const query = `${joinField} in (${chunk2.map(sqlQuote).join(",")})`;
+    const inClause = `${joinField} in (${chunk2.map(sqlQuote).join(",")})`;
+    const query = pushDownCond !== null ? `(${inClause}) and (${whereToKintone(pushDownCond)})` : inClause;
     const resolved = await fetchRecordsForSharedPlan(client.getRecords, join2.table.appId, query, fields, {
       parallel,
       maxRecords,
@@ -5143,19 +5250,21 @@ function buildSelectPlan(stmt, label) {
     lines.push(`  kintone query: ${params.query || "(\u306A\u3057)"}`);
     lines.push(`  fields:        ${params.fields.length === 0 ? "(\u5168\u30D5\u30A3\u30FC\u30EB\u30C9)" : params.fields.join(", ")}`);
   } else {
-    const mainParams = selectToFetchAllParams(stmt, stmt.from.appId);
     const mainFields = selectToFetchAllFields(stmt, stmt.from);
-    const mainAlias = stmt.from.alias ? ` AS ${stmt.from.alias}` : "";
-    const mainQ = mainParams.query ? `${mainParams.query}  (\u6B8B\u308A\u306F JS \u8A55\u4FA1)` : "(\u5168\u4EF6\u53D6\u5F97)";
-    lines.push(`  app:           APP${stmt.from.appId}${mainAlias} (${stmt.from.appId})`);
+    const mainAliasStr = stmt.from.alias ? ` AS ${stmt.from.alias}` : "";
+    const mainPushDown = stmt.from.alias && stmt.where ? extractTableCondition(stmt.where, stmt.from.alias) : null;
+    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}`);
     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 joinAlias = join2.table.alias ? ` AS ${join2.table.alias}` : "";
+      const joinAliasStr = join2.table.alias ? ` AS ${join2.table.alias}` : "";
       const joinType = join2.type === "INNER" ? "JOIN" : `${join2.type} JOIN`;
-      lines.push(`  ${joinType}:        APP${join2.table.appId}${joinAlias} (${join2.table.appId})`);
-      lines.push(`  kintone query: (\u5168\u4EF6\u53D6\u5F97)`);
+      const joinPushDown = join2.table.alias && stmt.where ? extractTableCondition(stmt.where, 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}`);
       lines.push(`  fields:        ${joinFields.length === 0 ? "(\u5168\u30D5\u30A3\u30FC\u30EB\u30C9)" : joinFields.join(", ")}`);
     }
   }
@@ -7040,7 +7149,7 @@ async function run() {
       isDmlStatement = isDmlType(stmtType);
       hasWhere = hasWhereClause(stmt);
       insertValuesCount = getInsertValuesCount(stmt);
-      const supported = stmtType === "SELECT" || isDmlStatement;
+      const supported = stmtType === "SELECT" || stmtType === "UNION" || stmtType === "WITH" || stmtType === "EXPLAIN" || stmtType === "SHOW_APPS" || stmtType === "DESCRIBE" || isDmlStatement;
       if (!supported) {
         process.stderr.write(`ArgumentError: unsupported statement type in CLI: ${stmtType}
 `);
@@ -7088,7 +7197,7 @@ async function run() {
   const appIds = sql ? extractAppIds(sql) : [];
   const defaultApp = args.app ?? envInt("KSQL_APP") ?? profile.app ?? null;
   if (appIds.length === 0 && defaultApp !== null) appIds.push(defaultApp);
-  const allowNoFromSelect = isNoFromSelectStatement(parsedStmt);
+  const allowNoFromSelect = isNoFromSelectStatement(parsedStmt) || stmtType === "SHOW_APPS";
   if (appIds.length === 0 && !allowNoFromSelect && !args.dryRun && args.diagRecordId === null) {
     process.stderr.write("ArgumentError: no APPxxx found in SQL and --app is not set.\n");
     return 2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rex0220/kintone-sql-tools",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "kintone SQL plugin and CLI tools (ksql)",
   "publishConfig": {
     "access": "public"
@@ -25,7 +25,7 @@
     "prepack": "npm run build:cli",
     "start": "run-p develop upload",
     "develop": "node build.mjs --watch",
-    "upload": "rex0220-plugin-uploader -f dist/ksql-plugin-v1.1.0.zip --watch"
+    "upload": "rex0220-plugin-uploader -f dist/ksql-plugin-v1.1.2.zip --watch"
   },
   "files": [
     "dist-cli/",