@rex0220/kintone-sql-tools 1.0.3 → 1.1.1

package/README.md

@@ -21,7 +21,7 @@ kintone アプリを SQL 風の構文で操作するツールセットです。
 ## npm（グローバル）
 
 ```bash
-npm install -g kintone-sql-tools
+npm install -g @rex0220/kintone-sql-tools
 ksql --help
 ```
 
@@ -168,6 +168,9 @@ Options:
 5. `@profile` を使った DELETE が失敗する
 - 現在 `DELETE` の `@profile` は未対応です。
 
+6. Windows で `ksql --help` 実行時にエディタが開いてしまう
+- `.js` 関連付けの影響の可能性があります。`ksql.cmd --help` または `node dist-cli/ksql.js --help` で確認してください。
+
 ## 機密情報の取り扱い
 
 - token / password は直書きせず、環境変数または `env:` 参照を推奨します。

package/dist-cli/ksql.js

@@ -3596,6 +3596,7 @@ function project(rows, columns, scalarCache) {
     return { rows: projected2, columns: cols };
   }
   const orderedKeys = [];
+  const defaultFieldKeys = buildDefaultFieldOutputKeys(columns);
   const projected = rows.map((row, rowIdx) => {
     const out = {};
     for (const [colIdx, col] of columns.entries()) {
@@ -3612,7 +3613,7 @@ function project(rows, columns, scalarCache) {
           break;
         }
         case "FIELD": {
-          const key = col.alias ?? col.field;
+          const key = col.alias ?? defaultFieldKeys.get(colIdx) ?? col.field;
           out[key] = resolveFieldRef(row, col.field);
           if (rowIdx === 0) orderedKeys.push(key);
           break;
@@ -3651,7 +3652,12 @@ function project(rows, columns, scalarCache) {
         }
         case "STRFUNC_COL": {
           const key = col.alias ?? stringFuncDefaultKey(col.expr);
-          out[key] = row[key] ?? evalStringFunc(col.expr, row);
+          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);
           break;
         }
@@ -3667,6 +3673,30 @@ function project(rows, columns, scalarCache) {
   });
   return { rows: projected, columns: orderedKeys };
 }
+function buildDefaultFieldOutputKeys(columns) {
+  const qualifierCollisionCount = /* @__PURE__ */ new Map();
+  for (const col of columns) {
+    if (col.type !== "FIELD" || col.alias) continue;
+    const unqualified = stripTableQualifier(col.field);
+    qualifierCollisionCount.set(unqualified, (qualifierCollisionCount.get(unqualified) ?? 0) + 1);
+  }
+  const keys = /* @__PURE__ */ new Map();
+  for (const [idx, col] of columns.entries()) {
+    if (col.type !== "FIELD" || col.alias) continue;
+    const unqualified = stripTableQualifier(col.field);
+    const duplicate = (qualifierCollisionCount.get(unqualified) ?? 0) > 1;
+    const hasTableQualifier = col.field.includes(".") && !col.field.startsWith("_p.");
+    keys.set(idx, duplicate && hasTableQualifier ? col.field : unqualified);
+  }
+  return keys;
+}
+function stripTableQualifier(field) {
+  if (field.startsWith("_p.")) return field;
+  const dot = field.indexOf(".");
+  if (dot <= 0) return field;
+  const unqualified = field.slice(dot + 1);
+  return unqualified || field;
+}
 function stripParentShortcutColumns(row) {
   const out = {};
   for (const [k, v] of Object.entries(row)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rex0220/kintone-sql-tools",
-  "version": "1.0.3",
+  "version": "1.1.1",
   "description": "kintone SQL plugin and CLI tools (ksql)",
   "publishConfig": {
     "access": "public"
@@ -25,7 +25,7 @@
     "prepack": "npm run build:cli",
     "start": "run-p develop upload",
     "develop": "node build.mjs --watch",
-    "upload": "rex0220-plugin-uploader -f dist/ksql-plugin-v1.0.0.zip --watch"
+    "upload": "rex0220-plugin-uploader -f dist/ksql-plugin-v1.1.1.zip --watch"
   },
   "files": [
     "dist-cli/",