@rex0220/kintone-sql-tools 3.55.0 → 3.56.1

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,11 +17976,31 @@ 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]);
+}
+function subtableGroupingAdvice(fieldName, owners) {
+  if (owners.length === 1) {
+    const { appId, owner } = owners[0];
+    return `ArgumentError: ${fieldName} \u306F\u30B5\u30D6\u30C6\u30FC\u30D6\u30EB\u300C${owner}\u300D\uFF08APP${appId}\uFF09\u306E\u4E2D\u306E\u9805\u76EE\u3067\u3059\u3002\u89AA\u30C6\u30FC\u30D6\u30EB\u306E GROUP BY \u306B\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002APP${appId}$${owner} \u304B\u3089\u96C6\u8A08\u3057\u3066\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`;
+  }
+  const list = owners.map(({ appId, owner }) => `APP${appId}$${owner}`).join(" / ");
+  return `ArgumentError: ${fieldName} \u306F\u30B5\u30D6\u30C6\u30FC\u30D6\u30EB\u306E\u4E2D\u306E\u9805\u76EE\u3067\u3059\uFF08${list}\uFF09\u3002\u89AA\u30C6\u30FC\u30D6\u30EB\u306E GROUP BY \u306B\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\u3069\u306E\u30B5\u30D6\u30C6\u30FC\u30D6\u30EB\u304B\u3089\u96C6\u8A08\u3059\u308B\u304B\u3092 FROM \u3067\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002`;
+}
+function dedupeSubtableOwners(owners) {
+  const seen = /* @__PURE__ */ new Set();
+  const result = [];
+  for (const entry of owners) {
+    const key = `${entry.appId}\0${entry.owner}`;
+    if (seen.has(key)) continue;
+    seen.add(key);
+    result.push(entry);
+  }
+  return result;
 }
 async function buildRuntimePlainGroupByPlan(stmt, client, cacheContext, materializedTables) {
   if (stmt.groupBy.length === 0) return void 0;
   const sources = [stmt.from, ...stmt.joins.map((join2) => join2.table)];
+  const subtableOwners = /* @__PURE__ */ new Map();
   const inputs = await Promise.all(sources.map(async (source) => {
     if (source.cteName !== null) {
       const materialized = materializedTables?.get(source.cteName);
@@ -17991,6 +18011,12 @@ async function buildRuntimePlainGroupByPlan(stmt, client, cacheContext, material
     }
     const fields = await getFieldsCached(source.appId, client, cacheContext);
     if (!source.subtableCode) {
+      for (const field of fields) {
+        if (field.inSubtable !== true || !field.subtableCode) continue;
+        const entries = subtableOwners.get(field.code) ?? [];
+        entries.push({ appId: source.appId, owner: field.subtableCode });
+        subtableOwners.set(field.code, dedupeSubtableOwners(entries));
+      }
       return {
         kind: "APP",
         fieldCodes: fields.filter((field) => !field.inSubtable).map((field) => field.code)
@@ -18012,10 +18038,10 @@ async function buildRuntimePlainGroupByPlan(stmt, client, cacheContext, material
   );
   const groupBy = stmt.groupBy;
   const plan = planPlainGroupByResolution(groupBy, stmt.columns, schemas);
-  assertRuntimePlainGroupByPlan(stmt, groupBy, plan);
+  assertRuntimePlainGroupByPlan(stmt, groupBy, plan, subtableOwners);
   return plan;
 }
-function assertRuntimePlainGroupByPlan(stmt, groupBy, plan) {
+function assertRuntimePlainGroupByPlan(stmt, groupBy, plan, subtableOwners) {
   const physicalAppIds = [
     stmt.from,
     ...stmt.joins.map((join2) => join2.table)
@@ -18028,6 +18054,12 @@ function assertRuntimePlainGroupByPlan(stmt, groupBy, plan) {
     const name = key?.type === "FIELD_NAME" ? key.name : "(expression)";
     if (item.kind === "UNKNOWN") {
       const appSuffix = primaryPhysicalAppId === null ? "" : ` (APP${primaryPhysicalAppId})`;
+      const dot = item.name.indexOf(".");
+      const bare = dot >= 0 ? item.name.slice(dot + 1) : item.name;
+      const owners = subtableOwners.get(item.name) ?? subtableOwners.get(bare) ?? [];
+      if (owners.length > 0) {
+        throw new Error(subtableGroupingAdvice(item.name, owners));
+      }
       throw new Error(`ArgumentError: unknown field code(s): ${item.name}${appSuffix}`);
     }
     if (item.kind === "ALIAS_REJECT") {
@@ -18078,9 +18110,15 @@ async function buildGroupingFieldResolver(stmt, client, cacheContext, materializ
       return [appId, new Map(infos.map((info) => [info.code, info]))];
     }))
   );
+  const subtableFieldOf = (table, code) => {
+    if (table.subtableCode) return null;
+    const info = infosByApp.get(table.appId)?.get(code);
+    return info?.inSubtable === true ? info.subtableCode ?? "" : null;
+  };
   const physicalMatch = (table, field) => {
     if (field === "$id") return "$id";
     const code = fieldCodeForTypeLookup(table, field);
+    if (subtableFieldOf(table, code) !== null) return null;
     return infosByApp.get(table.appId)?.has(code) ? code : null;
   };
   const materializedHas = (table, field) => {
@@ -18115,6 +18153,10 @@ async function buildGroupingFieldResolver(stmt, client, cacheContext, materializ
       }
       const code = physicalMatch(table, field.field);
       if (code === null) {
+        const owner = subtableFieldOf(table, fieldCodeForTypeLookup(table, field.field));
+        if (owner !== null && owner !== "") {
+          throw new Error(subtableGroupingAdvice(field.field, [{ appId: table.appId, owner }]));
+        }
         throw new Error(`ArgumentError: B65 field ${field.tableAlias}.${field.field} does not exist in APP${table.appId}.`);
       }
       return resolved(table, tableIndex, field, code);
@@ -18137,6 +18179,15 @@ async function buildGroupingFieldResolver(stmt, client, cacheContext, materializ
         `ArgumentError: B65 field ${field.field} resolves to a materialized CTE/temp column; physical APP fields are required.`
       );
     }
+    const owners = tables.flatMap((table) => {
+      if (table.cteName !== null) return [];
+      const owner = subtableFieldOf(table, fieldCodeForTypeLookup(table, field.field));
+      return owner === null || owner === "" ? [] : [{ appId: table.appId, owner }];
+    });
+    const uniqueOwners = dedupeSubtableOwners(owners);
+    if (uniqueOwners.length > 0) {
+      throw new Error(subtableGroupingAdvice(field.field, uniqueOwners));
+    }
     throw new Error(`ArgumentError: B65 field ${field.field} does not exist in a physical APP source.`);
   };
 }
@@ -18369,6 +18420,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 +18431,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 +18462,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}`;
@@ -23130,9 +23208,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 +23236,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" : "",