@rex0220/kintone-sql-tools 3.35.0 → 3.36.0

package/dist-cli/ksql.js

@@ -18252,18 +18252,20 @@ function rememberSelectWhereCapability(stmt, capability) {
 }
 function isCountStarTotalCountEligible(stmt, whereCapability) {
   if (whereCapability.capability !== "EXACT_PUSHDOWN") return false;
-  if (stmt.columns.length !== 1) return false;
-  const column = stmt.columns[0];
-  if (column?.type !== "AGGREGATE" || column.func !== "COUNT" || column.distinct || column.arg.type !== "WILDCARD") {
-    return false;
-  }
+  const countColumns = stmt.columns.filter(
+    (column) => column.type === "AGGREGATE" && column.func === "COUNT" && !column.distinct && column.arg.type === "WILDCARD"
+  );
+  if (countColumns.length !== 1) return false;
+  if (stmt.columns.some(
+    (column) => column !== countColumns[0] && column.type !== "LITERAL_COL"
+  )) return false;
   return !stmt.distinct && normalizeGroupingSpec(stmt).type === "NONE" && stmt.having === null && stmt.joins.length === 0 && stmt.from.cteName === null && !stmt.from.subtableCode && stmt.limit === null && stmt.offset === null;
 }
 function isValidTotalCount(value) {
   return typeof value === "string" && /^(?:0|[1-9]\d*)$/.test(value);
 }
 async function tryCountStarWithTotalCount(stmt, client) {
-  const countColumn = stmt.columns[0];
+  const countColumn = stmt.columns.find((column) => column.type === "AGGREGATE");
   if (countColumn?.type !== "AGGREGATE") return null;
   const baseQuery = stmt.where === null ? "" : whereToKintone(stmt.where);
   const response = await client.getRecords({
@@ -18274,11 +18276,15 @@ async function tryCountStarWithTotalCount(stmt, client) {
   });
   if (response.searchAborted) throw new SearchAbortedError();
   if (!isValidTotalCount(response.totalCount)) return null;
-  const column = countColumn.alias ?? "COUNT(*)";
+  const countKey = countColumn.alias ?? "COUNT(*)";
+  const projected = project(
+    [{ [countKey]: response.totalCount }],
+    stmt.columns
+  );
   return {
     type: "SELECT",
-    rows: [{ [column]: response.totalCount }],
-    columns: [column],
+    rows: projected.rows,
+    columns: projected.columns,
     rowCount: 1,
     warnings: []
   };
@@ -18454,7 +18460,7 @@ async function executeUnion(stmt, client, options, cacheContext, captureColumnMe
         captureColumnMeta,
         forLibraryCapture
       ) : executeSelect(
-        stmt.left,
+        markCountTotalCountRoot(stmt.left),
         client,
         effectiveOptions,
         cacheContext,
@@ -18463,7 +18469,7 @@ async function executeUnion(stmt, client, options, cacheContext, captureColumnMe
         forLibraryCapture
       ),
       executeSelect(
-        stmt.right,
+        markCountTotalCountRoot(stmt.right),
         client,
         effectiveOptions,
         cacheContext,
@@ -23140,7 +23146,7 @@ function buildUnionPlan(stmt, capabilities, orderPlans, plainGroupByPlans) {
   const lines = [];
   selects.forEach((sel, i) => {
     if (i > 0) lines.push("");
-    lines.push(...buildSelectPlan(sel, `[union:${i + 1}]`, capabilities, orderPlans, plainGroupByPlans, false));
+    lines.push(...buildSelectPlan(sel, `[union:${i + 1}]`, capabilities, orderPlans, plainGroupByPlans, true));
   });
   return lines;
 }