@rex0220/kintone-sql-tools 3.34.1 → 3.36.0

package/dist-cli/ksql.js

@@ -116,6 +116,7 @@ var KEYWORDS = /* @__PURE__ */ new Map([
   ["TODAY", "TODAY" /* TODAY */],
   ["NOW", "NOW" /* NOW */],
   ["LOGINUSER", "LOGINUSER" /* LOGINUSER */],
+  ["PRIMARY_ORGANIZATION", "PRIMARY_ORGANIZATION" /* PRIMARY_ORGANIZATION */],
   ["CASE", "CASE" /* CASE */],
   ["WHEN", "WHEN" /* WHEN */],
   ["THEN", "THEN" /* THEN */],
@@ -804,7 +805,8 @@ var RELATIVE_DATE_FUNCTION_NAMES = /* @__PURE__ */ new Set([
 var LEGACY_KINTONE_FUNCTION_NAMES = /* @__PURE__ */ new Set([
   "TODAY",
   "NOW",
-  "LOGINUSER"
+  "LOGINUSER",
+  "PRIMARY_ORGANIZATION"
 ]);
 var SERVER_ONLY_WHERE_FUNCTION_NAMES = /* @__PURE__ */ new Set([
   ...LEGACY_KINTONE_FUNCTION_NAMES,
@@ -917,7 +919,8 @@ var PARSER_WINDOW_FUNCTION_TOKEN_MAP = Object.freeze({
 var PARSER_CONTEXTUAL_FUNCTION_TOKEN_MAP = Object.freeze({
   ["TODAY" /* TODAY */]: "TODAY",
   ["NOW" /* NOW */]: "NOW",
-  ["LOGINUSER" /* LOGINUSER */]: "LOGINUSER"
+  ["LOGINUSER" /* LOGINUSER */]: "LOGINUSER",
+  ["PRIMARY_ORGANIZATION" /* PRIMARY_ORGANIZATION */]: "PRIMARY_ORGANIZATION"
 });
 function isContextualFunctionToken(kind) {
   return PARSER_CONTEXTUAL_FUNCTION_TOKEN_MAP[kind] !== void 0;
@@ -974,6 +977,7 @@ var FUNC_CALL_PREFIX_KINDS = /* @__PURE__ */ new Set([
   "TODAY" /* TODAY */,
   "NOW" /* NOW */,
   "LOGINUSER" /* LOGINUSER */,
+  "PRIMARY_ORGANIZATION" /* PRIMARY_ORGANIZATION */,
   "UPPER" /* UPPER */,
   "LOWER" /* LOWER */,
   "TRIM" /* TRIM */,
@@ -1219,6 +1223,12 @@ var Parser = class {
         tok
       );
     }
+    if (contextualFunction === "PRIMARY_ORGANIZATION") {
+      throw new ParseError(
+        `${context} \u306E\u53F3\u8FBA\u3067 PRIMARY_ORGANIZATION() \u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\uFF08\u5B9F\u884C\u74B0\u5883\u5171\u901A\u306E\u512A\u5148\u7D44\u7E54\u89E3\u6C7A\u306F\u672A\u5BFE\u5FDC\u3067\u3059\uFF09`,
+        tok
+      );
+    }
     if (contextualFunction !== void 0) {
       return this.parseSqlValue();
     }
@@ -3095,6 +3105,23 @@ var Parser = class {
         if (this.peek().kind === "," /* COMMA */) {
           throw new ParseError(mixedLoginUserMessage, this.peek());
         }
+      } else if (tok.kind === "PRIMARY_ORGANIZATION" /* PRIMARY_ORGANIZATION */) {
+        const mixedPrimaryOrganizationMessage = "PRIMARY_ORGANIZATION() \u306F IN / NOT IN \u30EA\u30B9\u30C8\u306E\u5358\u72EC\u8981\u7D20\u3068\u3057\u3066\u306E\u307F\u4F7F\u7528\u3067\u304D\u307E\u3059";
+        if (values.length > 0) {
+          throw new ParseError(mixedPrimaryOrganizationMessage, tok);
+        }
+        this.expect(
+          "(" /* LPAREN */,
+          "PRIMARY_ORGANIZATION \u306E\u76F4\u5F8C\u306B\u306F\u7A7A\u5F15\u6570\u306E () \u304C\u5FC5\u8981\u3067\u3059"
+        );
+        this.expect(
+          ")" /* RPAREN */,
+          "PRIMARY_ORGANIZATION \u306E\u76F4\u5F8C\u306B\u306F\u7A7A\u5F15\u6570\u306E () \u304C\u5FC5\u8981\u3067\u3059"
+        );
+        values.push({ type: "KINTONE_FUNC", name: "PRIMARY_ORGANIZATION" });
+        if (this.peek().kind === "," /* COMMA */) {
+          throw new ParseError(mixedPrimaryOrganizationMessage, this.peek());
+        }
       } else {
         throw new ParseError(invalidValueMessage, tok);
       }
@@ -5078,6 +5105,7 @@ function convertKintoneFunc(v) {
     case "TODAY":
     case "NOW":
     case "LOGINUSER":
+    case "PRIMARY_ORGANIZATION":
       return `${v.name}()`;
   }
   return convertRelativeDateFunction(v);
@@ -6416,6 +6444,65 @@ function isSelectObject(value) {
   return value !== null && typeof value === "object" && value.type === "SELECT";
 }
 
+// src/core/primaryOrganizationDmlValidation.ts
+var PrimaryOrganizationDmlValidationError = class extends Error {
+  constructor() {
+    super(
+      "ArgumentError: PRIMARY_ORGANIZATION() \u306F DML \u306E WHERE \u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093"
+    );
+    this.name = "ArgumentError";
+  }
+};
+function validatePrimaryOrganizationDmlStatement(stmt) {
+  const target = stmt.type === "EXPLAIN" ? stmt.query : stmt;
+  switch (target.type) {
+    case "UPDATE":
+    case "DELETE":
+    case "UPSERT":
+    case "UPSERT_SELECT":
+    case "INSERT_SELECT":
+      if (hasPrimaryOrganizationInWhere(target)) {
+        throw new PrimaryOrganizationDmlValidationError();
+      }
+      return;
+    default:
+      return;
+  }
+}
+function hasPrimaryOrganizationInWhere(node) {
+  let found = false;
+  walkObjects2(node, (obj) => {
+    if (found || !Object.prototype.hasOwnProperty.call(obj, "where")) return;
+    if (containsPrimaryOrganization(obj.where)) found = true;
+  });
+  return found;
+}
+function containsPrimaryOrganization(node) {
+  let found = false;
+  walkObjects2(node, (obj) => {
+    if (obj.type === "KINTONE_FUNC" && obj.name === "PRIMARY_ORGANIZATION") {
+      found = true;
+    }
+  });
+  return found;
+}
+function walkObjects2(node, visit) {
+  if (Array.isArray(node)) {
+    for (const value of node) walkObjects2(value, visit);
+    return;
+  }
+  if (node === null || typeof node !== "object") return;
+  const obj = node;
+  visit(obj);
+  for (const value of Object.values(obj)) walkObjects2(value, visit);
+}
+
+// src/core/statementValidation.ts
+function validateStatementStatic(stmt) {
+  validatePrimaryOrganizationDmlStatement(stmt);
+  validateKlikeStatement(stmt);
+}
+
 // src/engine/groupingRowMeta.ts
 var groupingRowMetaKey = /* @__PURE__ */ Symbol("ksql.groupingRowMeta");
 var groupingRefCanonicalIds = /* @__PURE__ */ new WeakMap();
@@ -6751,9 +6838,9 @@ function analyzeBatch(statements) {
     }
     try {
       assertApplyScope("phase15b", stmt);
-      validateKlikeStatement(stmt);
+      validateStatementStatic(stmt);
     } catch (error) {
-      if (error instanceof KlikeValidationError) {
+      if (error instanceof KlikeValidationError || error instanceof PrimaryOrganizationDmlValidationError) {
         throw new BatchAnalysisError(error.message, index);
       }
       if (error instanceof Error && /^(UnsupportedError|ArgumentError): APPLY /.test(error.message)) {
@@ -8014,6 +8101,7 @@ function resolveKintoneFunc(name) {
     case "NOW":
       return now.toISOString();
     case "LOGINUSER":
+    case "PRIMARY_ORGANIZATION":
       return "";
   }
 }
@@ -10968,12 +11056,14 @@ var RELATIVE_DATE_OPERATORS = new Set(RANGE_AND_EQUALITY);
 var LEGACY_KINTONE_FUNCTION_FIELD_TYPES = /* @__PURE__ */ new Map([
   ["TODAY", /* @__PURE__ */ new Set(["DATE", "DATETIME", "CREATED_TIME", "UPDATED_TIME"])],
   ["NOW", /* @__PURE__ */ new Set(["DATETIME", "CREATED_TIME", "UPDATED_TIME"])],
-  ["LOGINUSER", /* @__PURE__ */ new Set(["CREATOR", "MODIFIER", "USER_SELECT"])]
+  ["LOGINUSER", /* @__PURE__ */ new Set(["CREATOR", "MODIFIER", "USER_SELECT"])],
+  ["PRIMARY_ORGANIZATION", /* @__PURE__ */ new Set(["ORGANIZATION_SELECT"])]
 ]);
 var LEGACY_KINTONE_FUNCTION_OPERATORS = /* @__PURE__ */ new Map([
   ["TODAY", new Set(RANGE_AND_EQUALITY)],
   ["NOW", new Set(RANGE_AND_EQUALITY)],
-  ["LOGINUSER", /* @__PURE__ */ new Set(["in", "not in"])]
+  ["LOGINUSER", /* @__PURE__ */ new Set(["in", "not in"])],
+  ["PRIMARY_ORGANIZATION", /* @__PURE__ */ new Set(["in", "not in"])]
 ]);
 var EQUALITY_IN = ["=", "!=", "in", "not in"];
 var NATIVE_OPERATORS = /* @__PURE__ */ new Map([
@@ -15666,7 +15756,7 @@ async function executeParsedStatement(stmt, client, options, cacheContext) {
   }
   assertApplyScope("phase15b", stmt);
   assertApplyExecutionScope("phase15b", stmt);
-  validateKlikeStatement(stmt);
+  validateStatementStatic(stmt);
   if (stmt.type !== "EXPLAIN") {
     await validateStatementGroupingPlanning(stmt, client, cacheContext);
   }
@@ -16137,7 +16227,7 @@ function statementHasApplyMutation(statement) {
 async function executeBatchStatement(stmt, info, client, options, cacheContext, tempTables, variables) {
   if (stmt.type === "SET_VARIABLE") {
     const resolvedStmt2 = resolveBatchVariableReferences(stmt, variables);
-    validateKlikeStatement(resolvedStmt2);
+    validateStatementStatic(resolvedStmt2);
     await assertRelativeDateExecutionPlan(resolvedStmt2, client, cacheContext);
     if (resolvedStmt2.expr.type === "ARRAY") {
       variables.set(stmt.name, {
@@ -16194,7 +16284,7 @@ async function executeBatchStatement(stmt, info, client, options, cacheContext,
   const resolvedStmt = resolveBatchVariableReferences(stmt, variables);
   assertApplyScope("phase15b", resolvedStmt);
   assertApplyExecutionScope("phase15b", resolvedStmt);
-  validateKlikeStatement(resolvedStmt);
+  validateStatementStatic(resolvedStmt);
   await assertRelativeDateExecutionPlan(resolvedStmt, client, cacheContext);
   if (resolvedStmt.type === "VALIDATE") {
     const result = await executeExistingRecordValidationCore(
@@ -18162,18 +18252,20 @@ function rememberSelectWhereCapability(stmt, capability) {
 }
 function isCountStarTotalCountEligible(stmt, whereCapability) {
   if (whereCapability.capability !== "EXACT_PUSHDOWN") return false;
-  if (stmt.columns.length !== 1) return false;
-  const column = stmt.columns[0];
-  if (column?.type !== "AGGREGATE" || column.func !== "COUNT" || column.distinct || column.arg.type !== "WILDCARD") {
-    return false;
-  }
+  const countColumns = stmt.columns.filter(
+    (column) => column.type === "AGGREGATE" && column.func === "COUNT" && !column.distinct && column.arg.type === "WILDCARD"
+  );
+  if (countColumns.length !== 1) return false;
+  if (stmt.columns.some(
+    (column) => column !== countColumns[0] && column.type !== "LITERAL_COL"
+  )) return false;
   return !stmt.distinct && normalizeGroupingSpec(stmt).type === "NONE" && stmt.having === null && stmt.joins.length === 0 && stmt.from.cteName === null && !stmt.from.subtableCode && stmt.limit === null && stmt.offset === null;
 }
 function isValidTotalCount(value) {
   return typeof value === "string" && /^(?:0|[1-9]\d*)$/.test(value);
 }
 async function tryCountStarWithTotalCount(stmt, client) {
-  const countColumn = stmt.columns[0];
+  const countColumn = stmt.columns.find((column) => column.type === "AGGREGATE");
   if (countColumn?.type !== "AGGREGATE") return null;
   const baseQuery = stmt.where === null ? "" : whereToKintone(stmt.where);
   const response = await client.getRecords({
@@ -18184,11 +18276,15 @@ async function tryCountStarWithTotalCount(stmt, client) {
   });
   if (response.searchAborted) throw new SearchAbortedError();
   if (!isValidTotalCount(response.totalCount)) return null;
-  const column = countColumn.alias ?? "COUNT(*)";
+  const countKey = countColumn.alias ?? "COUNT(*)";
+  const projected = project(
+    [{ [countKey]: response.totalCount }],
+    stmt.columns
+  );
   return {
     type: "SELECT",
-    rows: [{ [column]: response.totalCount }],
-    columns: [column],
+    rows: projected.rows,
+    columns: projected.columns,
     rowCount: 1,
     warnings: []
   };
@@ -18364,7 +18460,7 @@ async function executeUnion(stmt, client, options, cacheContext, captureColumnMe
         captureColumnMeta,
         forLibraryCapture
       ) : executeSelect(
-        stmt.left,
+        markCountTotalCountRoot(stmt.left),
         client,
         effectiveOptions,
         cacheContext,
@@ -18373,7 +18469,7 @@ async function executeUnion(stmt, client, options, cacheContext, captureColumnMe
         forLibraryCapture
       ),
       executeSelect(
-        stmt.right,
+        markCountTotalCountRoot(stmt.right),
         client,
         effectiveOptions,
         cacheContext,
@@ -21950,7 +22046,7 @@ function parseSql(sql, enableImport = false) {
     const tokens = new Lexer(sql).tokenize();
     const stmt = new Parser(tokens, { import: enableImport }).parse();
     assertApplyScope("phase15b", stmt);
-    validateKlikeStatement(stmt);
+    validateStatementStatic(stmt);
     return stmt;
   } catch (e) {
     if (e instanceof LexError || e instanceof ParseError) {
@@ -22553,7 +22649,7 @@ async function buildBatchExplainPlans(sql, client, injectedVariables, cacheConte
     for (let i = 0; i < statements.length; i++) {
       const stmt = statements[i];
       const planStmt = stmt.type === "SET_VARIABLE" ? stmt.expr.type === "SCALAR_SUBQUERY" ? { ...stmt, expr: resolveBatchVariableReferences(stmt.expr, variables) } : stmt : resolveBatchVariableReferences(stmt, variables);
-      validateKlikeStatement(planStmt);
+      validateStatementStatic(planStmt);
       const relativeDatePlan = await resolveRelativeDateExecutionPlan(planStmt, client, invocationCacheContext);
       const whereAnalysis = await buildExplainWhereAnalysis(
         planStmt,
@@ -23050,7 +23146,7 @@ function buildUnionPlan(stmt, capabilities, orderPlans, plainGroupByPlans) {
   const lines = [];
   selects.forEach((sel, i) => {
     if (i > 0) lines.push("");
-    lines.push(...buildSelectPlan(sel, `[union:${i + 1}]`, capabilities, orderPlans, plainGroupByPlans, false));
+    lines.push(...buildSelectPlan(sel, `[union:${i + 1}]`, capabilities, orderPlans, plainGroupByPlans, true));
   });
   return lines;
 }
@@ -23506,13 +23602,13 @@ var OperationCancelledError = class extends Error {
 function parseSqlStatement(sql, capabilities = {}) {
   const tokens = new Lexer(sql).tokenize();
   const stmt = new Parser(tokens, capabilities).parse();
-  validateKlikeStatement(stmt);
+  validateStatementStatic(stmt);
   return stmt;
 }
 function parseSqlStatements(sql, capabilities = {}) {
   const tokens = new Lexer(sql).tokenize();
   const statements = new Parser(tokens, capabilities).parseStatements();
-  statements.forEach(validateKlikeStatement);
+  statements.forEach(validateStatementStatic);
   return statements;
 }