@rex0220/kintone-sql-tools 3.26.0 → 3.27.0

package/dist-cli/ksql.js

@@ -10453,6 +10453,28 @@ function validateDeclaredBatchVariables(statements, input) {
   return normalized;
 }
 
+// src/core/outerJoinSearchAbortGuard.ts
+function isOuterJoinSelect(value) {
+  if (value["type"] !== "SELECT" || !Array.isArray(value["joins"])) return false;
+  return value["joins"].some((join2) => {
+    if (join2 === null || typeof join2 !== "object") return false;
+    const type = join2["type"];
+    return type === "LEFT" || type === "RIGHT";
+  });
+}
+function statementContainsOuterJoin(statement) {
+  const seen = /* @__PURE__ */ new Set();
+  const visit = (value) => {
+    if (Array.isArray(value)) return value.some(visit);
+    if (value === null || typeof value !== "object" || seen.has(value)) return false;
+    seen.add(value);
+    const object = value;
+    if (isOuterJoinSelect(object)) return true;
+    return Object.values(object).some(visit);
+  };
+  return visit(statement);
+}
+
 // src/core/explainMetadata.ts
 function buildGroupingExplainMetadata(statement, canonicalItemCount) {
   const grouping = normalizeGroupingSpec(statement);
@@ -14840,7 +14862,7 @@ async function execute(sql, client, options = {}) {
   const guardedClient = wrapClientWithSearchAbort(
     countedClient,
     collector,
-    !isSelectLikeStatement(stmt)
+    !isSelectLikeStatement(stmt) || statementContainsOuterJoin(stmt)
   );
   const result = await executeParsedStatement(
     stmt,
@@ -14959,9 +14981,14 @@ function wrapClientWithMetrics(client, metrics) {
     }
   };
 }
+var SEARCH_ABORT_FAIL_CLOSED = /* @__PURE__ */ Symbol("searchAbortFailClosed");
 function wrapClientWithSearchAbort(client, collector, failClosed) {
+  if (failClosed && client[SEARCH_ABORT_FAIL_CLOSED]) {
+    return client;
+  }
   return {
     ...client,
+    ...failClosed ? { [SEARCH_ABORT_FAIL_CLOSED]: true } : {},
     getRecords: async (params) => {
       const response = await client.getRecords(params);
       if (response.searchAborted) {
@@ -15446,7 +15473,7 @@ async function executeBatch(sql, client, options = {}) {
       const statementClient = wrapClientWithSearchAbort(
         countedClient,
         searchAbortCollector,
-        info.statementType !== "SELECT" && info.statementType !== "UNION" && info.statementType !== "WITH"
+        info.statementType !== "SELECT" && info.statementType !== "UNION" && info.statementType !== "WITH" || statementContainsOuterJoin(statements[i])
       );
       const cursorScope = wrapClientWithCursorScope(statementClient);
       const outcome = await runWithDeadline(