@rex0220/kintone-sql-tools 3.48.0 → 3.50.0

package/dist-cli/ksql.js

@@ -1053,6 +1053,12 @@ var ParseError = class extends Error {
     this.name = "ParseError";
   }
 };
+var WINDOW_RESULT_IN_EXPRESSION_MESSAGE = [
+  "\u30A6\u30A3\u30F3\u30C9\u30A6\u95A2\u6570\u306E\u7D50\u679C\u306F\u540C\u3058 SELECT \u306E\u5F0F\u3067\u306F\u4F7F\u3048\u307E\u305B\u3093\u3002",
+  "  \xD7 SELECT ROUND(SUM(x) OVER (), 1) AS a FROM t",
+  "  \u25CB WITH w AS (SELECT SUM(x) OVER () AS \u7DCF\u8A08 FROM t) SELECT ROUND(\u7DCF\u8A08, 1) AS a FROM w",
+  "\u30A6\u30A3\u30F3\u30C9\u30A6\u7D50\u679C\u3092\u5217\u3068\u3057\u3066\u51FA\u3057\u3001\u305D\u308C\u3092\u4F7F\u3046\u5F0F\u306F\u6B21\u306E\u6BB5\uFF08CTE \u307E\u305F\u306F\u4E00\u6642\u30C6\u30FC\u30D6\u30EB\uFF09\u306B\u66F8\u3044\u3066\u304F\u3060\u3055\u3044"
+].join("\n");
 var Parser = class {
   constructor(tokens, capabilities = {}) {
     this.tokens = tokens;
@@ -1972,7 +1978,7 @@ var Parser = class {
     }
     if (this.tryAggregateFunc() === null && this.hasNestedAggregateWindowInSelectColumn()) {
       throw new ParseError(
-        "\u30A6\u30A3\u30F3\u30C9\u30A6\u95A2\u6570\u306E\u7D50\u679C\u3092\u5F0F\u306B\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002CTE \u3067\u4E00\u5EA6\u5B9F\u4F53\u5316\u3057\u3066\u304F\u3060\u3055\u3044",
+        WINDOW_RESULT_IN_EXPRESSION_MESSAGE,
         this.peek()
       );
     }
@@ -2169,7 +2175,7 @@ var Parser = class {
     this.expect(")" /* RPAREN */);
     if (this.isArithOp(this.peek().kind)) {
       throw new ParseError(
-        "\u30A6\u30A3\u30F3\u30C9\u30A6\u95A2\u6570\u306E\u7D50\u679C\u3092\u5F0F\u306B\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002CTE \u3067\u4E00\u5EA6\u5B9F\u4F53\u5316\u3057\u3066\u304F\u3060\u3055\u3044",
+        WINDOW_RESULT_IN_EXPRESSION_MESSAGE,
         this.peek()
       );
     }
@@ -19343,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 () => {
@@ -19378,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) => {
@@ -19465,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) => {
@@ -22984,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,
@@ -22996,11 +23025,15 @@ 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"];
+  const columns = [...DESCRIBE_COLUMNS];
   const rows = fields.map((f) => ({
     "\u30D5\u30A3\u30FC\u30EB\u30C9\u30B3\u30FC\u30C9": f.code,
     "\u30E9\u30D9\u30EB": f.label,
-    "\u30BF\u30A4\u30D7": f.fieldType
+    "\u30BF\u30A4\u30D7": f.fieldType,
+    "\u30EB\u30C3\u30AF\u30A2\u30C3\u30D7": f.hasLookup === true ? "YES" : "",
+    "\u30B3\u30D4\u30FC\u5143": f.isLookupCopyTarget === true ? "YES" : "",
+    "\u91CD\u8907\u7981\u6B62": f.isUnique === true ? "YES" : "",
+    "\u8A08\u7B97\u5F0F": f.isCalculated === true ? "YES" : ""
   }));
   return { type: "SELECT", rows, columns, rowCount: rows.length };
 }
@@ -25634,6 +25667,10 @@ function flattenFields(properties, lookupCopyFields, inSubtable = false, subtabl
       minLength: normalizeConstraintValue(field.minLength),
       maxLength: normalizeConstraintValue(field.maxLength),
       defaultValue: field.defaultValue,
+      hasLookup: Object.prototype.hasOwnProperty.call(field, "lookup"),
+      isLookupCopyTarget: lookupCopyFields.has(field.code),
+      isUnique: field.unique === true,
+      isCalculated: field.type === "CALC" || typeof field.expression === "string" && field.expression.length > 0,
       inSubtable,
       ...subtableCode ? { subtableCode } : {},
       writable: !lookupCopyFields.has(field.code) && !NON_WRITABLE_FIELD_TYPES3.has(field.type)