@rex0220/kintone-sql-tools 1.11.0 → 1.12.1

package/dist-cli/ksql.js

@@ -4007,6 +4007,11 @@ function applyFilter(rows, where) {
   if (where === null) return rows;
   return rows.filter((row) => evalWhere(where, row));
 }
+function hasAggregateColumns(columns) {
+  return columns.some(
+    (c) => c.type === "AGGREGATE" || c.type === "ARITH_AGG_COL" || c.type === "STRFUNC_COL" && hasAggregateInStringFuncExpr2(c.expr)
+  );
+}
 function applyGroupBy(rows, groupByKeys, columns) {
   const groups = /* @__PURE__ */ new Map();
   for (const row of rows) {
@@ -4015,6 +4020,9 @@ function applyGroupBy(rows, groupByKeys, columns) {
     if (bucket) bucket.push(row);
     else groups.set(key, [row]);
   }
+  if (groups.size === 0 && groupByKeys.length === 0 && hasAggregateColumns(columns)) {
+    groups.set("", []);
+  }
   const result = [];
   for (const groupRows of groups.values()) {
     const outRow = { ...groupRows[0] };
@@ -4430,10 +4438,7 @@ function runFullScan(input) {
     rows = applyJoin(rows, rightRows, join2);
   }
   rows = applyFilter(rows, stmt.where);
-  const hasAggregate = stmt.columns.some(
-    (c) => c.type === "AGGREGATE" || c.type === "ARITH_AGG_COL" || c.type === "STRFUNC_COL" && hasAggregateInStringFuncExpr2(c.expr)
-  );
-  if (stmt.groupBy.length > 0 || hasAggregate) {
+  if (stmt.groupBy.length > 0 || hasAggregateColumns(stmt.columns)) {
     rows = applyGroupBy(rows, stmt.groupBy, stmt.columns);
   }
   rows = applyHaving(rows, stmt.having);
@@ -6903,7 +6908,7 @@ function normalizeAppKey(v) {
 }
 function extractAppIds(sql) {
   const out = /* @__PURE__ */ new Set();
-  for (const m of sql.matchAll(/\bAPP(\d+)\b/gi)) out.add(Number(m[1]));
+  for (const t of collectAppProfileTokens(sql)) out.add(t.appId);
   return [...out];
 }
 function isSqlIdentContinue(ch) {

package/dist-mcp/ksql-mcp.js

@@ -34909,6 +34909,11 @@ function applyFilter(rows, where) {
   if (where === null) return rows;
   return rows.filter((row) => evalWhere(where, row));
 }
+function hasAggregateColumns(columns) {
+  return columns.some(
+    (c) => c.type === "AGGREGATE" || c.type === "ARITH_AGG_COL" || c.type === "STRFUNC_COL" && hasAggregateInStringFuncExpr2(c.expr)
+  );
+}
 function applyGroupBy(rows, groupByKeys, columns) {
   const groups = /* @__PURE__ */ new Map();
   for (const row of rows) {
@@ -34917,6 +34922,9 @@ function applyGroupBy(rows, groupByKeys, columns) {
     if (bucket) bucket.push(row);
     else groups.set(key, [row]);
   }
+  if (groups.size === 0 && groupByKeys.length === 0 && hasAggregateColumns(columns)) {
+    groups.set("", []);
+  }
   const result = [];
   for (const groupRows of groups.values()) {
     const outRow = { ...groupRows[0] };
@@ -35332,10 +35340,7 @@ function runFullScan(input) {
     rows = applyJoin(rows, rightRows, join);
   }
   rows = applyFilter(rows, stmt.where);
-  const hasAggregate = stmt.columns.some(
-    (c) => c.type === "AGGREGATE" || c.type === "ARITH_AGG_COL" || c.type === "STRFUNC_COL" && hasAggregateInStringFuncExpr2(c.expr)
-  );
-  if (stmt.groupBy.length > 0 || hasAggregate) {
+  if (stmt.groupBy.length > 0 || hasAggregateColumns(stmt.columns)) {
     rows = applyGroupBy(rows, stmt.groupBy, stmt.columns);
   }
   rows = applyHaving(rows, stmt.having);
@@ -37685,7 +37690,7 @@ function normalizeAppKey(v) {
 }
 function extractAppIds(sql) {
   const out = /* @__PURE__ */ new Set();
-  for (const m of sql.matchAll(/\bAPP(\d+)\b/gi)) out.add(Number(m[1]));
+  for (const t of collectAppProfileTokens(sql)) out.add(t.appId);
   return [...out];
 }
 function isSqlIdentContinue(ch) {
@@ -39270,7 +39275,7 @@ Options:
   -h, --help         Show help
 `);
 }
-var SERVER_VERSION = true ? "1.11.0" : "0.0.0-dev";
+var SERVER_VERSION = true ? "1.12.1" : "0.0.0-dev";
 function createServer(args) {
   const server = new McpServer({
     name: "ksql-mcp",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rex0220/kintone-sql-tools",
-  "version": "1.11.0",
+  "version": "1.12.1",
   "description": "kintone SQL plugin, CLI, and MCP tools (ksql)",
   "publishConfig": {
     "access": "public"