@rex0220/kintone-sql-tools 3.21.0 → 3.22.0

package/dist-cli/ksql.js

@@ -13927,7 +13927,12 @@ async function execute(sql, client, options = {}) {
     cacheContext
   );
   metrics.elapsedMs = Date.now() - startedAt;
-  return { ...attachSearchAbortWarning(result, collector), metrics };
+  const finalResult = { ...attachSearchAbortWarning(result, collector), metrics };
+  if (result.type === "SELECT") {
+    const columnMeta = materializedMetaBySelectResult.get(result);
+    if (columnMeta) materializedMetaBySelectResult.set(finalResult, columnMeta);
+  }
+  return finalResult;
 }
 function createEmptyMetrics() {
   return {
@@ -14138,11 +14143,26 @@ async function executeParsedStatement(stmt, client, options, cacheContext) {
     case "VALIDATE":
       return executeExistingRecordValidation(stmt, client, options, cacheContext);
     case "SELECT":
-      return executeSelect(stmt, client, options, cacheContext);
+      return executeSelect(
+        stmt,
+        client,
+        options,
+        cacheContext,
+        void 0,
+        options.captureColumnMeta === true,
+        options.captureColumnMeta === true
+      );
     case "UNION":
-      return executeUnion(stmt, client, options, cacheContext);
+      return executeUnion(
+        stmt,
+        client,
+        options,
+        cacheContext,
+        options.captureColumnMeta === true,
+        options.captureColumnMeta === true
+      );
     case "WITH":
-      return executeWith(stmt, client, options, cacheContext);
+      return executeWith(stmt, client, options, cacheContext, void 0, options.captureColumnMeta === true);
     case "INSERT":
       return executeInsert(stmt, client, options, cacheContext);
     case "INSERT_SELECT":
@@ -15196,13 +15216,16 @@ async function assertDmlWhereCapability(stmt, client, cacheContext) {
     );
   }
 }
-async function executeSelect(stmt, client, options, cacheContext, cteCache, captureColumnMeta = false) {
+async function executeSelect(stmt, client, options, cacheContext, cteCache, captureColumnMeta = false, forLibraryCapture = false) {
   let result;
   await validateSelectGroupingPlanning(stmt, client, cacheContext, cteCache);
   if (isNoFromSelect(stmt)) {
     result = executeNoFromSelect(stmt);
     if (captureColumnMeta) {
-      materializedMetaBySelectResult.set(result, await inferSelectColumnMeta(stmt, result.columns, client, cacheContext, cteCache));
+      materializedMetaBySelectResult.set(
+        result,
+        await inferSelectColumnMeta(stmt, result.columns, client, cacheContext, cteCache, forLibraryCapture)
+      );
     }
     return result;
   }
@@ -15257,7 +15280,10 @@ async function executeSelect(stmt, client, options, cacheContext, cteCache, capt
     throwCompleteInputError(completePolicy, error);
   }
   if (captureColumnMeta) {
-    materializedMetaBySelectResult.set(result, await inferSelectColumnMeta(stmt, result.columns, client, cacheContext, cteCache));
+    materializedMetaBySelectResult.set(
+      result,
+      await inferSelectColumnMeta(stmt, result.columns, client, cacheContext, cteCache, forLibraryCapture)
+    );
   }
   return result;
 }
@@ -16025,7 +16051,7 @@ function selectNeedsSourceColumnMeta(stmt) {
     (column) => column.type === "FIELD" || column.type === "WILDCARD" || column.type === "PARENT_WILDCARD" || column.type === "CASE_COL" || column.type === "AGGREGATE" && (column.func === "MIN" || column.func === "MAX" || column.func === "MODE")
   );
 }
-async function inferSelectColumnMeta(stmt, outputColumns, client, cacheContext, materializedTables) {
+async function inferSelectColumnMeta(stmt, outputColumns, client, cacheContext, materializedTables, forLibraryCapture = false) {
   const physicalInfos = /* @__PURE__ */ new Map();
   if (selectNeedsSourceColumnMeta(stmt)) {
     await Promise.all(physicalSelectTables(stmt).map(async (table) => {
@@ -16035,6 +16061,7 @@ async function inferSelectColumnMeta(stmt, outputColumns, client, cacheContext,
     }));
   }
   const tables = [stmt.from, ...stmt.joins.map((join2) => join2.table)];
+  const canExposePublicSource = forLibraryCapture && materializedTables === void 0 && tables.every((table) => table.cteName === null);
   const resolveField2 = (ref) => {
     if (ref.tableAlias !== null) {
       if (ref.tableAlias === "_p" && stmt.from.subtableCode && stmt.from.cteName === null) {
@@ -16064,18 +16091,33 @@ async function inferSelectColumnMeta(stmt, outputColumns, client, cacheContext,
     });
     return matches.length === 1 ? matches[0] : void 0;
   };
+  const resolvePublicSourceApp = (ref) => {
+    if (!canExposePublicSource) return void 0;
+    const matches = tables.filter((table) => {
+      if (ref.tableAlias !== null && effectiveTableAlias(table) !== ref.tableAlias) return false;
+      const fieldCode = fieldCodeForTypeLookup(table, ref.field);
+      return physicalInfos.get(table.appId)?.has(fieldCode) === true || systemColumnMeta(ref.field) !== void 0;
+    });
+    return matches.length === 1 ? matches[0].appId : void 0;
+  };
+  const withPublicSource = (meta, ref) => {
+    const publicSourceApp = resolvePublicSourceApp(ref);
+    return meta && publicSourceApp !== void 0 ? { ...meta, publicSourceApp } : meta;
+  };
   const inferred = /* @__PURE__ */ new Map();
   const hasWildcard = stmt.columns.some((column) => column.type === "WILDCARD" || column.type === "PARENT_WILDCARD");
   if (stmt.columns.length === 1 && (stmt.columns[0].type === "WILDCARD" || stmt.columns[0].type === "PARENT_WILDCARD")) {
     for (const output of outputColumns) {
-      const meta = resolveField2(aggregateFieldRef(output));
+      const ref = aggregateFieldRef(output);
+      const meta = withPublicSource(resolveField2(ref), ref);
       if (meta) inferred.set(output, meta);
     }
     return inferred;
   }
   if (hasWildcard) {
     for (const output of outputColumns) {
-      const meta = resolveField2(aggregateFieldRef(output));
+      const ref = aggregateFieldRef(output);
+      const meta = withPublicSource(resolveField2(ref), ref);
       if (meta) inferred.set(output, meta);
     }
   }
@@ -16087,7 +16129,8 @@ async function inferSelectColumnMeta(stmt, outputColumns, client, cacheContext,
     if (!output) return;
     let meta;
     if (column.type === "FIELD") {
-      meta = resolveField2(aggregateFieldRef(column.field));
+      const ref = aggregateFieldRef(column.field);
+      meta = withPublicSource(resolveField2(ref), ref);
     } else if (column.type === "AGGREGATE") {
       if (column.func === "GROUP_CONCAT") {
         meta = syntheticColumnMeta("string");
@@ -16131,8 +16174,15 @@ function mergeUnionColumnMeta(left, right) {
     const a = leftMeta?.get(column);
     const rightColumn = right.columns[index];
     const b = rightColumn === void 0 ? void 0 : rightMeta?.get(rightColumn);
-    if (a && b) merged.set(column, mergeExpressionColumnMeta([a, b]));
-    else if (a || b) merged.set(column, unknownStringColumnMeta());
+    if (a && b) {
+      const combined = mergeExpressionColumnMeta([a, b]);
+      const publicSourceApp = a.publicSourceApp === b.publicSourceApp ? a.publicSourceApp : void 0;
+      const { publicSourceApp: _discarded, ...withoutPublicSource } = combined;
+      merged.set(
+        column,
+        publicSourceApp === void 0 ? withoutPublicSource : { ...withoutPublicSource, publicSourceApp }
+      );
+    } else if (a || b) merged.set(column, unknownStringColumnMeta());
   });
   return merged;
 }
@@ -16295,10 +16345,10 @@ async function executeFullScanSelect(stmt, client, options, cacheContext, cteCac
   });
   return { type: "SELECT", rows, columns, rowCount: rows.length, warnings: [...warnings] };
 }
-async function executeUnion(stmt, client, options, cacheContext) {
+async function executeUnion(stmt, client, options, cacheContext, captureColumnMeta = false, forLibraryCapture = false) {
   const [leftResult, rightResult] = await Promise.all([
-    stmt.left.type === "UNION" ? executeUnion(stmt.left, client, options, cacheContext) : executeSelect(stmt.left, client, options, cacheContext),
-    executeSelect(stmt.right, client, options, cacheContext)
+    stmt.left.type === "UNION" ? executeUnion(stmt.left, client, options, cacheContext, captureColumnMeta, forLibraryCapture) : executeSelect(stmt.left, client, options, cacheContext, void 0, captureColumnMeta, forLibraryCapture),
+    executeSelect(stmt.right, client, options, cacheContext, void 0, captureColumnMeta, forLibraryCapture)
   ]);
   const leftCols = leftResult.columns;
   const rightCols = rightResult.columns;
@@ -16311,7 +16361,11 @@ async function executeUnion(stmt, client, options, cacheContext) {
   });
   const combined = [...leftResult.rows, ...remappedRight];
   const rows = stmt.all ? combined : deduplicateRows(combined, leftCols);
-  return { type: "SELECT", rows, columns: leftCols, rowCount: rows.length };
+  const result = { type: "SELECT", rows, columns: leftCols, rowCount: rows.length };
+  if (captureColumnMeta) {
+    materializedMetaBySelectResult.set(result, mergeUnionColumnMeta(leftResult, rightResult));
+  }
+  return result;
 }
 function deduplicateRows(rows, columns) {
   const seen = /* @__PURE__ */ new Set();
@@ -16324,7 +16378,7 @@ function deduplicateRows(rows, columns) {
 }
 async function executeWith(stmt, client, options, cacheContext, seed, captureColumnMeta = false) {
   if ((seed == null || seed.size === 0) && canInlineSingleCte(stmt)) {
-    return executeSelect(buildInlinedQuery(stmt), client, options, cacheContext, void 0, captureColumnMeta);
+    return executeSelect(buildInlinedQuery(stmt), client, options, cacheContext, void 0, captureColumnMeta, false);
   }
   const cteCache = new Map(seed ?? []);
   for (const cte of stmt.ctes) {
@@ -16369,7 +16423,7 @@ async function executeQueryWithCte(query, client, options, cteCache, cacheContex
   }
   const hasCteRef = query.from.cteName != null && query.from.cteName !== NO_FROM_CTE_NAME || query.joins.some((j) => j.table.cteName != null);
   if (!hasCteRef) {
-    return executeSelect(query, client, options, cacheContext, cteCache, captureColumnMeta);
+    return executeSelect(query, client, options, cacheContext, cteCache, captureColumnMeta, false);
   }
   const result = await executeFullScanWithCte(query, client, options, cteCache, cacheContext);
   if (captureColumnMeta) {