@rex0220/kintone-sql-tools 3.54.4 → 3.56.0

package/dist-cli/ksql.js

@@ -17931,7 +17931,7 @@ async function executeSelect(stmt, client, options, cacheContext, cteCache, capt
     maxRecords: options.maxRecords ?? 1e4,
     hasKlike: whereHasKlike(stmt.where)
   }) : null;
-  await validateSelectFieldCodes(
+  const subtableFieldWarnings = await validateSelectFieldCodes(
     stmt,
     orderPlan?.kind === "CANONICAL_LOCAL" ? "FULL_SCAN" : mode,
     client,
@@ -17976,7 +17976,7 @@ async function executeSelect(stmt, client, options, cacheContext, cteCache, capt
       await inferSelectColumnMeta(stmt, result.columns, client, cacheContext, cteCache, forLibraryCapture)
     );
   }
-  return mergeSelectWarnings(result, defaultRangeWarnings);
+  return mergeSelectWarnings(result, [...defaultRangeWarnings, ...subtableFieldWarnings]);
 }
 async function buildRuntimePlainGroupByPlan(stmt, client, cacheContext, materializedTables) {
   if (stmt.groupBy.length === 0) return void 0;
@@ -18369,6 +18369,7 @@ async function executeSimpleSelect(stmt, client, options, cacheContext, orderPla
   return { type: "SELECT", rows: projected, columns, rowCount: projected.length, warnings: [...warnings] };
 }
 async function validateSelectFieldCodes(stmt, mode, client, cacheContext) {
+  const warnings = [];
   const appToFields = /* @__PURE__ */ new Map();
   const addFields = (appId, fields) => {
     if (fields.length === 0) return;
@@ -18379,13 +18380,25 @@ async function validateSelectFieldCodes(stmt, mode, client, cacheContext) {
     }
     for (const f of fields) target.add(f);
   };
+  const parentTableFields = /* @__PURE__ */ new Map();
+  const addParentFields = (appId, fields) => {
+    let target = parentTableFields.get(appId);
+    if (!target) {
+      target = /* @__PURE__ */ new Set();
+      parentTableFields.set(appId, target);
+    }
+    for (const f of fields) target.add(f);
+  };
   if (mode === "SIMPLE") {
     const params = selectToKintoneParams(stmt);
     addFields(params.app, params.fields);
+    if (!stmt.from.subtableCode) addParentFields(params.app, params.fields);
   } else {
     const tables = [stmt.from, ...stmt.joins.map((j) => j.table)].filter((t) => t.cteName === null);
     for (const table of tables) {
-      addFields(table.appId, selectToFetchAllFields(stmt, table));
+      const fields = selectToFetchAllFields(stmt, table);
+      addFields(table.appId, fields);
+      if (!table.subtableCode) addParentFields(table.appId, fields);
     }
   }
   for (const [appId, fields] of appToFields.entries()) {
@@ -18398,7 +18411,21 @@ async function validateSelectFieldCodes(stmt, mode, client, cacheContext) {
     if (unknown.length > 0) {
       throw new Error(`ArgumentError: unknown field code(s): ${unknown.join(", ")} (APP${appId})`);
     }
+    const referenced = parentTableFields.get(appId);
+    if (referenced) {
+      const subtableFields = defs.filter(
+        (d) => d.inSubtable === true && referenced.has(d.code)
+      );
+      for (const field of subtableFields) {
+        const owner = field.subtableCode ?? "";
+        const source = owner ? `\u30B5\u30D6\u30C6\u30FC\u30D6\u30EB\u300C${owner}\u300D` : "\u30B5\u30D6\u30C6\u30FC\u30D6\u30EB";
+        warnings.push(
+          `${field.code} \u306F${source}\u306E\u4E2D\u306E\u9805\u76EE\u3067\u3059\u3002APP${appId} \u304B\u3089\u9078\u3076\u3068\u3001\u30A8\u30E9\u30FC\u306B\u306A\u3089\u305A\u5168\u884C\u304C\u7A7A\u306B\u306A\u308A\u307E\u3059\u3002` + (owner ? `APP${appId}$${owner} \u304B\u3089\u9078\u3093\u3067\u304F\u3060\u3055\u3044\uFF08\u89AA\u306E\u30EC\u30B3\u30FC\u30C9 ID \u306F _pid\u3001\u89AA\u9805\u76EE\u306F _p.<\u30D5\u30A3\u30FC\u30EB\u30C9\u30B3\u30FC\u30C9> \u306B\u306A\u308A\u307E\u3059\uFF09\u3002` : "")
+        );
+      }
+    }
   }
+  return warnings;
 }
 function b86SourceLabel(table) {
   return table.cteName ?? `APP${table.appId}`;
@@ -19887,7 +19914,7 @@ async function fetchTableRecordsForFullScan(stmt, table, client, maxRecords, par
     });
     return resolved.records;
   }
-  const parentQuery = isMainTable ? "" : "";
+  const parentQuery = isMainTable && allowOriginalWherePushdown && stmt.joins.length === 0 && stmt.where !== null && resolvedWhereCapabilities.get(stmt)?.capability === "EXACT_PUSHDOWN" && !whereRequiresJsEval(stmt.where) ? whereToKintone(stmt.where) : "";
   const parentResolved = await fetchRecordsForSharedPlan(client.getRecords, table.appId, parentQuery, fields, {
     parallel,
     maxRecords,
@@ -23130,9 +23157,12 @@ var SHOW_APPS_COLUMNS = Object.freeze([
   "\u8AAC\u660E"
 ]);
 var DESCRIBE_COLUMNS = Object.freeze([
+  // B145: サブテーブル列は「その項目がどの表にあるか」を示す。無いと明細項目を
+  // 親項目と取り違え、親から SELECT して全行空という結果になる（エラーも警告も出ない）。
   "\u30D5\u30A3\u30FC\u30EB\u30C9\u30B3\u30FC\u30C9",
   "\u30E9\u30D9\u30EB",
   "\u30BF\u30A4\u30D7",
+  "\u30B5\u30D6\u30C6\u30FC\u30D6\u30EB",
   "\u30EB\u30C3\u30AF\u30A2\u30C3\u30D7",
   "\u30B3\u30D4\u30FC\u5143",
   "\u91CD\u8907\u7981\u6B62",
@@ -23155,6 +23185,8 @@ async function executeDescribe(stmt, client, cacheContext) {
     "\u30D5\u30A3\u30FC\u30EB\u30C9\u30B3\u30FC\u30C9": f.code,
     "\u30E9\u30D9\u30EB": f.label,
     "\u30BF\u30A4\u30D7": f.fieldType,
+    // 明細項目はサブテーブルのフィールドコード、親項目は空文字。
+    "\u30B5\u30D6\u30C6\u30FC\u30D6\u30EB": f.inSubtable === true ? f.subtableCode ?? "" : "",
     "\u30EB\u30C3\u30AF\u30A2\u30C3\u30D7": f.hasLookup === true ? "YES" : "",
     "\u30B3\u30D4\u30FC\u5143": f.isLookupCopyTarget === true ? "YES" : "",
     "\u91CD\u8907\u7981\u6B62": f.isUnique === true ? "YES" : "",