@rex0220/kintone-sql-tools 2.1.0 → 2.1.1

package/dist-cli/ksql.js

@@ -4462,8 +4462,12 @@ function project(rows, columns, scalarCache) {
     const cols = projected2.length > 0 ? Object.keys(projected2[0]) : [];
     return { rows: projected2, columns: cols };
   }
-  const orderedKeys = [];
   const defaultFieldKeys = buildDefaultFieldOutputKeys(columns);
+  const hasWildcard = columns.some(
+    (col) => col.type === "WILDCARD" || col.type === "PARENT_WILDCARD"
+  );
+  const outputKeys = hasWildcard ? null : computeOutputKeys(columns, defaultFieldKeys);
+  const orderedKeys = outputKeys ?? [];
   const projected = rows.map((row, rowIdx) => {
     const out = {};
     for (const [colIdx, col] of columns.entries()) {
@@ -4480,58 +4484,58 @@ function project(rows, columns, scalarCache) {
           break;
         }
         case "FIELD": {
-          const key = col.alias ?? defaultFieldKeys.get(colIdx) ?? col.field;
+          const key = outputKeys?.[colIdx] ?? col.alias ?? defaultFieldKeys.get(colIdx) ?? col.field;
           out[key] = resolveFieldRef(row, col.field);
-          if (rowIdx === 0) orderedKeys.push(key);
+          if (outputKeys === null && rowIdx === 0) orderedKeys.push(key);
           break;
         }
         case "LITERAL_COL": {
-          const key = col.alias ?? `'${col.value}'`;
+          const key = outputKeys?.[colIdx] ?? col.alias ?? `'${col.value}'`;
           out[key] = col.value;
-          if (rowIdx === 0) orderedKeys.push(key);
+          if (outputKeys === null && rowIdx === 0) orderedKeys.push(key);
           break;
         }
         case "AGGREGATE": {
           const srcKey = aggregateSyntheticName2(col.func, col.distinct, col.arg);
-          const dstKey = col.alias ?? srcKey;
+          const dstKey = outputKeys?.[colIdx] ?? col.alias ?? srcKey;
           out[dstKey] = row[col.alias ?? srcKey] ?? row[srcKey] ?? "0";
-          if (rowIdx === 0) orderedKeys.push(dstKey);
+          if (outputKeys === null && rowIdx === 0) orderedKeys.push(dstKey);
           break;
         }
         case "ARITH_AGG_COL": {
-          const key = col.alias ?? aggArithDefaultKey(col.expr);
+          const key = outputKeys?.[colIdx] ?? col.alias ?? aggArithDefaultKey(col.expr);
           out[key] = row[key] ?? "0";
-          if (rowIdx === 0) orderedKeys.push(key);
+          if (outputKeys === null && rowIdx === 0) orderedKeys.push(key);
           break;
         }
         case "ARITH_COL": {
           const val = evalArithExpr(col.expr, row);
-          const key = col.alias ?? arithColDefaultKey(col.expr);
+          const key = outputKeys?.[colIdx] ?? col.alias ?? arithColDefaultKey(col.expr);
           out[key] = String(val);
-          if (rowIdx === 0) orderedKeys.push(key);
+          if (outputKeys === null && rowIdx === 0) orderedKeys.push(key);
           break;
         }
         case "CASE_COL": {
-          const key = col.alias ?? "case";
+          const key = outputKeys?.[colIdx] ?? col.alias ?? "case";
           out[key] = evalCaseWhen(col.expr, row);
-          if (rowIdx === 0) orderedKeys.push(key);
+          if (outputKeys === null && rowIdx === 0) orderedKeys.push(key);
           break;
         }
         case "STRFUNC_COL": {
-          const key = col.alias ?? stringFuncDefaultKey(col.expr);
+          const key = outputKeys?.[colIdx] ?? col.alias ?? stringFuncDefaultKey(col.expr);
           if (hasAggregateInStringFuncExpr2(col.expr)) {
             const srcKey = stringFuncDefaultKey(col.expr);
             out[key] = row[col.alias ?? srcKey] ?? row[srcKey] ?? evalStringFunc(col.expr, row);
           } else {
             out[key] = evalStringFunc(col.expr, row);
           }
-          if (rowIdx === 0) orderedKeys.push(key);
+          if (outputKeys === null && rowIdx === 0) orderedKeys.push(key);
           break;
         }
         case "SCALAR_SUBQUERY_COL": {
-          const key = col.alias ?? "(subquery)";
+          const key = outputKeys?.[colIdx] ?? col.alias ?? "(subquery)";
           out[key] = scalarCache?.get(colIdx) ?? "";
-          if (rowIdx === 0) orderedKeys.push(key);
+          if (outputKeys === null && rowIdx === 0) orderedKeys.push(key);
           break;
         }
       }
@@ -4540,6 +4544,31 @@ function project(rows, columns, scalarCache) {
   });
   return { rows: projected, columns: orderedKeys };
 }
+function computeOutputKeys(columns, defaultFieldKeys) {
+  return columns.map((col, colIdx) => {
+    switch (col.type) {
+      case "FIELD":
+        return col.alias ?? defaultFieldKeys.get(colIdx) ?? col.field;
+      case "LITERAL_COL":
+        return col.alias ?? `'${col.value}'`;
+      case "AGGREGATE":
+        return col.alias ?? aggregateSyntheticName2(col.func, col.distinct, col.arg);
+      case "ARITH_AGG_COL":
+        return col.alias ?? aggArithDefaultKey(col.expr);
+      case "ARITH_COL":
+        return col.alias ?? arithColDefaultKey(col.expr);
+      case "CASE_COL":
+        return col.alias ?? "case";
+      case "STRFUNC_COL":
+        return col.alias ?? stringFuncDefaultKey(col.expr);
+      case "SCALAR_SUBQUERY_COL":
+        return col.alias ?? "(subquery)";
+      case "WILDCARD":
+      case "PARENT_WILDCARD":
+        throw new Error("internal: computeOutputKeys received a wildcard column");
+    }
+  });
+}
 function buildDefaultFieldOutputKeys(columns) {
   const qualifierCollisionCount = /* @__PURE__ */ new Map();
   for (const col of columns) {
@@ -5930,8 +5959,9 @@ async function executeInsertSelect(stmt, client, options, cacheContext, cteCache
   const selectResult = cteCache !== void 0 && cteCache.size > 0 ? await executeQueryWithCte(stmt.select, client, options, cteCache, cacheContext) : await executeSelect(stmt.select, client, options, cacheContext);
   const { rows, columns } = selectResult;
   if (columns.length !== stmt.fields.length) {
+    const emptySourceHint = columns.length === 0 && rows.length === 0 ? "\u3002\u7D50\u679C\u304C 0 \u884C\u306E\u305F\u3081\u5217\u3092\u7279\u5B9A\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\uFF08SELECT * \u3092\u7A7A\u30BD\u30FC\u30B9\u306B\u4F7F\u3046\u3068\u5217\u3092\u6C7A\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\u660E\u793A\u5217\u3067\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\uFF09" : "";
     throw new Error(
-      `SELECT \u306E\u5217\u6570\uFF08${columns.length}\uFF09\u3068 INSERT \u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u6570\uFF08${stmt.fields.length}\uFF09\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093`
+      `SELECT \u306E\u5217\u6570\uFF08${columns.length}\uFF09\u3068 INSERT \u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u6570\uFF08${stmt.fields.length}\uFF09\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093${emptySourceHint}`
     );
   }
   if (options.confirm) {
@@ -6404,8 +6434,9 @@ async function executeUpsertSelect(stmt, client, options, cacheContext, cteCache
   const selectResult = cteCache !== void 0 && cteCache.size > 0 ? await executeQueryWithCte(stmt.select, client, options, cteCache, cacheContext) : await executeSelect(stmt.select, client, options, cacheContext);
   const { rows, columns } = selectResult;
   if (columns.length !== stmt.fields.length) {
+    const emptySourceHint = columns.length === 0 && rows.length === 0 ? "\u3002\u7D50\u679C\u304C 0 \u884C\u306E\u305F\u3081\u5217\u3092\u7279\u5B9A\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\uFF08SELECT * \u3092\u7A7A\u30BD\u30FC\u30B9\u306B\u4F7F\u3046\u3068\u5217\u3092\u6C7A\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\u660E\u793A\u5217\u3067\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\uFF09" : "";
     throw new Error(
-      `SELECT \u306E\u5217\u6570\uFF08${columns.length}\uFF09\u3068 UPSERT \u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u6570\uFF08${stmt.fields.length}\uFF09\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093`
+      `SELECT \u306E\u5217\u6570\uFF08${columns.length}\uFF09\u3068 UPSERT \u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u6570\uFF08${stmt.fields.length}\uFF09\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093${emptySourceHint}`
     );
   }
   for (const key of stmt.keyFields) {

package/dist-mcp/ksql-mcp.js

@@ -35363,8 +35363,12 @@ function project(rows, columns, scalarCache) {
     const cols = projected2.length > 0 ? Object.keys(projected2[0]) : [];
     return { rows: projected2, columns: cols };
   }
-  const orderedKeys = [];
   const defaultFieldKeys = buildDefaultFieldOutputKeys(columns);
+  const hasWildcard = columns.some(
+    (col) => col.type === "WILDCARD" || col.type === "PARENT_WILDCARD"
+  );
+  const outputKeys = hasWildcard ? null : computeOutputKeys(columns, defaultFieldKeys);
+  const orderedKeys = outputKeys ?? [];
   const projected = rows.map((row, rowIdx) => {
     const out = {};
     for (const [colIdx, col] of columns.entries()) {
@@ -35381,58 +35385,58 @@ function project(rows, columns, scalarCache) {
           break;
         }
         case "FIELD": {
-          const key = col.alias ?? defaultFieldKeys.get(colIdx) ?? col.field;
+          const key = outputKeys?.[colIdx] ?? col.alias ?? defaultFieldKeys.get(colIdx) ?? col.field;
           out[key] = resolveFieldRef(row, col.field);
-          if (rowIdx === 0) orderedKeys.push(key);
+          if (outputKeys === null && rowIdx === 0) orderedKeys.push(key);
           break;
         }
         case "LITERAL_COL": {
-          const key = col.alias ?? `'${col.value}'`;
+          const key = outputKeys?.[colIdx] ?? col.alias ?? `'${col.value}'`;
           out[key] = col.value;
-          if (rowIdx === 0) orderedKeys.push(key);
+          if (outputKeys === null && rowIdx === 0) orderedKeys.push(key);
           break;
         }
         case "AGGREGATE": {
           const srcKey = aggregateSyntheticName2(col.func, col.distinct, col.arg);
-          const dstKey = col.alias ?? srcKey;
+          const dstKey = outputKeys?.[colIdx] ?? col.alias ?? srcKey;
           out[dstKey] = row[col.alias ?? srcKey] ?? row[srcKey] ?? "0";
-          if (rowIdx === 0) orderedKeys.push(dstKey);
+          if (outputKeys === null && rowIdx === 0) orderedKeys.push(dstKey);
           break;
         }
         case "ARITH_AGG_COL": {
-          const key = col.alias ?? aggArithDefaultKey(col.expr);
+          const key = outputKeys?.[colIdx] ?? col.alias ?? aggArithDefaultKey(col.expr);
           out[key] = row[key] ?? "0";
-          if (rowIdx === 0) orderedKeys.push(key);
+          if (outputKeys === null && rowIdx === 0) orderedKeys.push(key);
           break;
         }
         case "ARITH_COL": {
           const val = evalArithExpr(col.expr, row);
-          const key = col.alias ?? arithColDefaultKey(col.expr);
+          const key = outputKeys?.[colIdx] ?? col.alias ?? arithColDefaultKey(col.expr);
           out[key] = String(val);
-          if (rowIdx === 0) orderedKeys.push(key);
+          if (outputKeys === null && rowIdx === 0) orderedKeys.push(key);
           break;
         }
         case "CASE_COL": {
-          const key = col.alias ?? "case";
+          const key = outputKeys?.[colIdx] ?? col.alias ?? "case";
           out[key] = evalCaseWhen(col.expr, row);
-          if (rowIdx === 0) orderedKeys.push(key);
+          if (outputKeys === null && rowIdx === 0) orderedKeys.push(key);
           break;
         }
         case "STRFUNC_COL": {
-          const key = col.alias ?? stringFuncDefaultKey(col.expr);
+          const key = outputKeys?.[colIdx] ?? col.alias ?? stringFuncDefaultKey(col.expr);
           if (hasAggregateInStringFuncExpr2(col.expr)) {
             const srcKey = stringFuncDefaultKey(col.expr);
             out[key] = row[col.alias ?? srcKey] ?? row[srcKey] ?? evalStringFunc(col.expr, row);
           } else {
             out[key] = evalStringFunc(col.expr, row);
           }
-          if (rowIdx === 0) orderedKeys.push(key);
+          if (outputKeys === null && rowIdx === 0) orderedKeys.push(key);
           break;
         }
         case "SCALAR_SUBQUERY_COL": {
-          const key = col.alias ?? "(subquery)";
+          const key = outputKeys?.[colIdx] ?? col.alias ?? "(subquery)";
           out[key] = scalarCache?.get(colIdx) ?? "";
-          if (rowIdx === 0) orderedKeys.push(key);
+          if (outputKeys === null && rowIdx === 0) orderedKeys.push(key);
           break;
         }
       }
@@ -35441,6 +35445,31 @@ function project(rows, columns, scalarCache) {
   });
   return { rows: projected, columns: orderedKeys };
 }
+function computeOutputKeys(columns, defaultFieldKeys) {
+  return columns.map((col, colIdx) => {
+    switch (col.type) {
+      case "FIELD":
+        return col.alias ?? defaultFieldKeys.get(colIdx) ?? col.field;
+      case "LITERAL_COL":
+        return col.alias ?? `'${col.value}'`;
+      case "AGGREGATE":
+        return col.alias ?? aggregateSyntheticName2(col.func, col.distinct, col.arg);
+      case "ARITH_AGG_COL":
+        return col.alias ?? aggArithDefaultKey(col.expr);
+      case "ARITH_COL":
+        return col.alias ?? arithColDefaultKey(col.expr);
+      case "CASE_COL":
+        return col.alias ?? "case";
+      case "STRFUNC_COL":
+        return col.alias ?? stringFuncDefaultKey(col.expr);
+      case "SCALAR_SUBQUERY_COL":
+        return col.alias ?? "(subquery)";
+      case "WILDCARD":
+      case "PARENT_WILDCARD":
+        throw new Error("internal: computeOutputKeys received a wildcard column");
+    }
+  });
+}
 function buildDefaultFieldOutputKeys(columns) {
   const qualifierCollisionCount = /* @__PURE__ */ new Map();
   for (const col of columns) {
@@ -36831,8 +36860,9 @@ async function executeInsertSelect(stmt, client, options, cacheContext, cteCache
   const selectResult = cteCache !== void 0 && cteCache.size > 0 ? await executeQueryWithCte(stmt.select, client, options, cteCache, cacheContext) : await executeSelect(stmt.select, client, options, cacheContext);
   const { rows, columns } = selectResult;
   if (columns.length !== stmt.fields.length) {
+    const emptySourceHint = columns.length === 0 && rows.length === 0 ? "\u3002\u7D50\u679C\u304C 0 \u884C\u306E\u305F\u3081\u5217\u3092\u7279\u5B9A\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\uFF08SELECT * \u3092\u7A7A\u30BD\u30FC\u30B9\u306B\u4F7F\u3046\u3068\u5217\u3092\u6C7A\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\u660E\u793A\u5217\u3067\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\uFF09" : "";
     throw new Error(
-      `SELECT \u306E\u5217\u6570\uFF08${columns.length}\uFF09\u3068 INSERT \u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u6570\uFF08${stmt.fields.length}\uFF09\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093`
+      `SELECT \u306E\u5217\u6570\uFF08${columns.length}\uFF09\u3068 INSERT \u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u6570\uFF08${stmt.fields.length}\uFF09\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093${emptySourceHint}`
     );
   }
   if (options.confirm) {
@@ -37305,8 +37335,9 @@ async function executeUpsertSelect(stmt, client, options, cacheContext, cteCache
   const selectResult = cteCache !== void 0 && cteCache.size > 0 ? await executeQueryWithCte(stmt.select, client, options, cteCache, cacheContext) : await executeSelect(stmt.select, client, options, cacheContext);
   const { rows, columns } = selectResult;
   if (columns.length !== stmt.fields.length) {
+    const emptySourceHint = columns.length === 0 && rows.length === 0 ? "\u3002\u7D50\u679C\u304C 0 \u884C\u306E\u305F\u3081\u5217\u3092\u7279\u5B9A\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\uFF08SELECT * \u3092\u7A7A\u30BD\u30FC\u30B9\u306B\u4F7F\u3046\u3068\u5217\u3092\u6C7A\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002\u660E\u793A\u5217\u3067\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\uFF09" : "";
     throw new Error(
-      `SELECT \u306E\u5217\u6570\uFF08${columns.length}\uFF09\u3068 UPSERT \u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u6570\uFF08${stmt.fields.length}\uFF09\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093`
+      `SELECT \u306E\u5217\u6570\uFF08${columns.length}\uFF09\u3068 UPSERT \u306E\u30D5\u30A3\u30FC\u30EB\u30C9\u6570\uFF08${stmt.fields.length}\uFF09\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093${emptySourceHint}`
     );
   }
   for (const key of stmt.keyFields) {
@@ -39946,7 +39977,7 @@ Options:
   -h, --help         Show help
 `);
 }
-var SERVER_VERSION = true ? "2.1.0" : "0.0.0-dev";
+var SERVER_VERSION = true ? "2.1.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": "2.1.0",
+  "version": "2.1.1",
   "description": "kintone SQL plugin, CLI, and MCP tools (ksql)",
   "publishConfig": {
     "access": "public"