@rex0220/kintone-sql-tools 3.49.0 → 3.50.0

package/dist-cli/ksql.js

@@ -19349,6 +19349,13 @@ async function executeFullScanSelect(stmt, client, options, cacheContext, cteCac
   );
   return { type: "SELECT", rows, columns, rowCount: rows.length, warnings: [...warnings] };
 }
+function assertUnionColumnCount(leftColumns, rightColumns) {
+  if (leftColumns.length === rightColumns.length) return;
+  throw new Error(
+    `ArgumentError: UNION \u306E\u5DE6\u53F3\u3067\u5217\u6570\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093\uFF08\u5DE6 ${leftColumns.length} \u5217 / \u53F3 ${rightColumns.length} \u5217\uFF09\u3002
+UNION \u306F\u5217\u3092\u4F4D\u7F6E\u3067\u5BFE\u5FDC\u3055\u305B\u308B\u305F\u3081\u3001\u4E21\u8FBA\u306E\u5217\u6570\u3092\u63C3\u3048\u3066\u304F\u3060\u3055\u3044`
+  );
+}
 async function executeUnion(stmt, client, options, cacheContext, captureColumnMeta = false, forLibraryCapture = false) {
   const completePolicy = buildCompleteInputPolicy(stmt, options, null);
   return withCompleteInputPolicy(completePolicy, async () => {
@@ -19384,6 +19391,7 @@ async function executeUnion(stmt, client, options, cacheContext, captureColumnMe
     ]);
     const leftCols = leftResult.columns;
     const rightCols = rightResult.columns;
+    assertUnionColumnCount(leftCols, rightCols);
     const remappedRight = rightResult.rows.map((row) => {
       const mapped = {};
       leftCols.forEach((col, i) => {
@@ -19471,6 +19479,7 @@ async function executeQueryWithCte(query, client, options, cteCache, cacheContex
     ]);
     const leftCols = leftResult.columns;
     const rightCols = rightResult.columns;
+    assertUnionColumnCount(leftCols, rightCols);
     const remapped = rightResult.rows.map((row) => {
       const mapped = {};
       leftCols.forEach((col, i) => {
@@ -22990,9 +22999,23 @@ async function executeUpsertSelect(stmt, client, options, cacheContext, cteCache
     updatedCount: toUpdate.length
   };
 }
+var SHOW_APPS_COLUMNS = Object.freeze([
+  "\u30A2\u30D7\u30EAID",
+  "\u30A2\u30D7\u30EA\u540D",
+  "\u8AAC\u660E"
+]);
+var DESCRIBE_COLUMNS = Object.freeze([
+  "\u30D5\u30A3\u30FC\u30EB\u30C9\u30B3\u30FC\u30C9",
+  "\u30E9\u30D9\u30EB",
+  "\u30BF\u30A4\u30D7",
+  "\u30EB\u30C3\u30AF\u30A2\u30C3\u30D7",
+  "\u30B3\u30D4\u30FC\u5143",
+  "\u91CD\u8907\u7981\u6B62",
+  "\u8A08\u7B97\u5F0F"
+]);
 async function executeShowApps(client) {
   const apps = await client.getApps();
-  const columns = ["\u30A2\u30D7\u30EAID", "\u30A2\u30D7\u30EA\u540D", "\u8AAC\u660E"];
+  const columns = [...SHOW_APPS_COLUMNS];
   const rows = apps.map((a) => ({
     "\u30A2\u30D7\u30EAID": String(a.appId),
     "\u30A2\u30D7\u30EA\u540D": a.name,
@@ -23002,15 +23025,7 @@ async function executeShowApps(client) {
 }
 async function executeDescribe(stmt, client, cacheContext) {
   const fields = await getFieldsCached(stmt.appId, client, cacheContext);
-  const columns = [
-    "\u30D5\u30A3\u30FC\u30EB\u30C9\u30B3\u30FC\u30C9",
-    "\u30E9\u30D9\u30EB",
-    "\u30BF\u30A4\u30D7",
-    "\u30EB\u30C3\u30AF\u30A2\u30C3\u30D7",
-    "\u30B3\u30D4\u30FC\u5143",
-    "\u91CD\u8907\u7981\u6B62",
-    "\u8A08\u7B97\u5F0F"
-  ];
+  const columns = [...DESCRIBE_COLUMNS];
   const rows = fields.map((f) => ({
     "\u30D5\u30A3\u30FC\u30EB\u30C9\u30B3\u30FC\u30C9": f.code,
     "\u30E9\u30D9\u30EB": f.label,