@rex0220/kintone-sql-tools 3.59.0 → 3.60.0

package/dist-cli/ksql.js

@@ -3187,7 +3187,7 @@ var Parser = class {
       return { type: "BINARY", op: "KLIKE", left: field, right: pattern };
     }
     const op = this.parseCompareOp();
-    const right = this.parseWhereSqlValue();
+    const right = this.parseWhereSqlValue(op !== "LIKE");
     return { type: "BINARY", op, left: field, right };
   }
   parseCompareOp() {
@@ -3310,8 +3310,13 @@ var Parser = class {
     return { type: "FIELD", tableAlias: qi.tableAlias, field: qi.field };
   }
   // 右辺の値
-  parseWhereSqlValue() {
+  parseWhereSqlValue(allowUnaryPlusNumberLiteral = true) {
     const tok = this.peek();
+    if (allowUnaryPlusNumberLiteral && tok.kind === "+" /* PLUS */) {
+      this.advance();
+      const number = this.expect("NUMBER" /* NUMBER */, "\u5358\u9805 + \u306E\u76F4\u5F8C\u306B\u306F\u6570\u5024\u30EA\u30C6\u30E9\u30EB\u304C\u5FC5\u8981\u3067\u3059");
+      return makeNumberLiteral(`+${number.value}`);
+    }
     if (this.allowRelativeDateFunctions && tok.kind === "IDENT" /* IDENT */ && this.peekAt(1).kind === "(" /* LPAREN */ && isRelativeDateFunctionName(tok.value.toUpperCase())) {
       return this.parseRelativeDateFunction();
     }
@@ -12330,7 +12335,8 @@ var NATIVE_OPERATORS = /* @__PURE__ */ new Map([
   ["USER_SELECT", /* @__PURE__ */ new Set(["in", "not in"])],
   ["ORGANIZATION_SELECT", /* @__PURE__ */ new Set(["in", "not in"])],
   ["GROUP_SELECT", /* @__PURE__ */ new Set(["in", "not in"])],
-  ["STATUS", new Set(EQUALITY_IN)]
+  ["STATUS", new Set(EQUALITY_IN)],
+  ["STATUS_ASSIGNEE", /* @__PURE__ */ new Set(["in", "not in"])]
 ]);
 var LOCAL_VALID_OPERATORS = /* @__PURE__ */ new Map([
   ["CREATOR", /* @__PURE__ */ new Set(["in", "not in"])],
@@ -12784,6 +12790,44 @@ function requireExactFunctionPushdown(result) {
   );
 }
 
+// src/core/optimization/joinDateTimeLiteralPolicy.ts
+function isCanonicalJoinDate(value) {
+  const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(value);
+  if (!match) return false;
+  const year = Number(match[1]);
+  const month = Number(match[2]);
+  const day = Number(match[3]);
+  if (year < 1 || year > 9999) return false;
+  const date = /* @__PURE__ */ new Date(0);
+  date.setUTCFullYear(year, month - 1, day);
+  date.setUTCHours(0, 0, 0, 0);
+  return date.getUTCFullYear() === year && date.getUTCMonth() === month - 1 && date.getUTCDate() === day;
+}
+function isCanonicalJoinTime(value) {
+  const match = /^(\d{2}):(\d{2})$/.exec(value);
+  return match !== null && Number(match[1]) <= 23 && Number(match[2]) <= 59;
+}
+function isCanonicalJoinDateTime(value) {
+  const match = /^(\d{4}-\d{2}-\d{2})T(\d{2}):(\d{2}):(\d{2})Z$/.exec(value);
+  if (!match || !isCanonicalJoinDate(match[1])) return false;
+  return Number(match[2]) <= 23 && Number(match[3]) <= 59 && Number(match[4]) <= 59;
+}
+
+// src/core/optimization/joinNumberLiteralPolicy.ts
+function isJoinNumberLiteralSupported(literal) {
+  const source = literal.raw ?? String(literal.value);
+  const decimal = parseExactDecimal(source);
+  if (decimal === null) return false;
+  if (decimal.sign === 0) return numberLiteralText(literal) === "0";
+  const fractionDigits = Math.max(decimal.scale, 0);
+  const integerDigits = Math.max(decimal.coefficient.length - decimal.scale, 0);
+  if (fractionDigits > 10 || integerDigits + fractionDigits > 30) {
+    return false;
+  }
+  const canonical = formatPlainDecimal(decimal);
+  return numberLiteralText(literal) === canonical;
+}
+
 // src/core/optimization/joinPredicatePushdown.ts
 var SELECTION_TYPES = /* @__PURE__ */ new Set([
   "DROP_DOWN",
@@ -12792,6 +12836,14 @@ var SELECTION_TYPES = /* @__PURE__ */ new Set([
   "MULTI_SELECT",
   "STATUS"
 ]);
+var USER_CODE_TYPES = /* @__PURE__ */ new Set([
+  "CREATOR",
+  "MODIFIER",
+  "USER_SELECT",
+  "ORGANIZATION_SELECT",
+  "GROUP_SELECT",
+  "STATUS_ASSIGNEE"
+]);
 var KLIKE_TYPES = /* @__PURE__ */ new Set([
   "SINGLE_LINE_TEXT",
   "LINK",
@@ -12799,7 +12851,7 @@ var KLIKE_TYPES = /* @__PURE__ */ new Set([
   "RICH_TEXT",
   "FILE"
 ]);
-var DATETIME_EQUALITY_TYPES = /* @__PURE__ */ new Set([
+var DATETIME_TYPES = /* @__PURE__ */ new Set([
   "DATETIME",
   "CREATED_TIME",
   "UPDATED_TIME"
@@ -13395,21 +13447,45 @@ function classifySupportedLeaf(predicate, owner, fieldType) {
     return isPositiveSafeInteger(predicate.right) && (predicate.op === "=" || predicate.op === "<" || predicate.op === ">" || predicate.op === "<=" || predicate.op === ">=") ? "exact" : "unsafe";
   }
   if (fieldType === "RECORD_NUMBER") {
-    return "unsafe";
+    return classifySupersetScalarOrListLiteral(predicate);
   }
   if (fieldType === "NUMBER") {
-    if (predicate.right.type !== "NUMBER") return "unsafe";
-    if (predicate.op === "=") return "superset";
-    return (predicate.op === "<" || predicate.op === ">") && isSafeIntegerLiteral(predicate.right) ? "superset" : "unsafe";
+    if ((predicate.op === "IN" || predicate.op === "NOT_IN") && predicate.right.type === "IN_LIST" && predicate.right.values.length > 0 && predicate.right.values.every(
+      (value) => value.type === "NUMBER" && isJoinNumberLiteralSupported(value)
+    )) {
+      return "exact";
+    }
+    if ((predicate.op === "=" || predicate.op === "!=" || predicate.op === "<>" || predicate.op === "<" || predicate.op === ">" || predicate.op === "<=" || predicate.op === ">=") && predicate.right.type === "NUMBER" && isJoinNumberLiteralSupported(predicate.right)) {
+      return "exact";
+    }
+    return "unsafe";
   }
-  if (fieldType === "SINGLE_LINE_TEXT") {
-    return predicate.op === "=" && predicate.right.type === "STRING" && predicate.right.value !== "" ? "superset" : "unsafe";
+  if (fieldType === "CALC") {
+    return classifySupersetScalarOrListLiteral(predicate);
   }
-  if (fieldType === "DATE" || fieldType === "TIME" || DATETIME_EQUALITY_TYPES.has(fieldType)) {
-    if (predicate.op !== "=" || predicate.right.type !== "STRING") return "unsafe";
-    if (fieldType === "DATE") return isCanonicalDate(predicate.right.value) ? "superset" : "unsafe";
-    if (fieldType === "TIME") return isCanonicalTime(predicate.right.value) ? "superset" : "unsafe";
-    return isCanonicalDateTime(predicate.right.value) ? "superset" : "unsafe";
+  if (USER_CODE_TYPES.has(fieldType)) {
+    if (predicate.op !== "IN" && predicate.op !== "NOT_IN" || predicate.right.type !== "IN_LIST" || predicate.right.values.length === 0) return "unsafe";
+    return predicate.right.values.every(
+      (value) => value.type === "STRING" && value.value !== ""
+    ) ? "exact" : "unsafe";
+  }
+  if (fieldType === "SINGLE_LINE_TEXT" || fieldType === "LINK") {
+    if ((predicate.op === "IN" || predicate.op === "NOT_IN") && predicate.right.type === "IN_LIST" && predicate.right.values.length > 0 && predicate.right.values.every(
+      (value) => value.type === "STRING" && value.value !== ""
+    )) {
+      return "exact";
+    }
+    return (predicate.op === "=" || predicate.op === "!=" || predicate.op === "<>") && predicate.right.type === "STRING" && predicate.right.value !== "" ? "exact" : "unsafe";
+  }
+  if (fieldType === "DATE" || fieldType === "TIME" || DATETIME_TYPES.has(fieldType)) {
+    if (predicate.op !== "=" && predicate.op !== "!=" && predicate.op !== "<>" && predicate.op !== "<" && predicate.op !== ">" && predicate.op !== "<=" && predicate.op !== ">=" || predicate.right.type !== "STRING") return "unsafe";
+    if (fieldType === "DATE") {
+      return isCanonicalJoinDate(predicate.right.value) ? "exact" : "unsafe";
+    }
+    if (fieldType === "TIME") {
+      return isCanonicalJoinTime(predicate.right.value) ? "exact" : "unsafe";
+    }
+    return isCanonicalJoinDateTime(predicate.right.value) ? "exact" : "unsafe";
   }
   if (SELECTION_TYPES.has(fieldType)) {
     if (predicate.op !== "IN" && predicate.op !== "NOT_IN" || predicate.right.type !== "IN_LIST" || predicate.right.values.length === 0) return "unsafe";
@@ -13421,6 +13497,19 @@ function classifySupportedLeaf(predicate, owner, fieldType) {
   }
   return "unsafe";
 }
+function classifySupersetScalarOrListLiteral(predicate) {
+  const supportedLiteral = (value) => value.type === "NUMBER" && isJoinNumberLiteralSupported(value) || value.type === "STRING" && value.value !== "";
+  if ((predicate.op === "IN" || predicate.op === "NOT_IN") && predicate.right.type === "IN_LIST") {
+    const values = predicate.right.values;
+    if (values.length > 0 && values.every(supportedLiteral) && values.every((value) => value.type === values[0].type)) {
+      return "superset";
+    }
+  }
+  if ((predicate.op === "=" || predicate.op === "!=" || predicate.op === "<>" || predicate.op === "<" || predicate.op === ">" || predicate.op === "<=" || predicate.op === ">=") && supportedLiteral(predicate.right)) {
+    return "superset";
+  }
+  return "unsafe";
+}
 function owned(source, fieldCode) {
   return Object.freeze({
     status: "OWNED",
@@ -13445,24 +13534,6 @@ function isPositiveSafeInteger(value) {
 function isSafeIntegerLiteral(value) {
   return /^-?\d+$/.test(numberLiteralText(value)) && Number.isSafeInteger(value.value);
 }
-function isCanonicalDate(value) {
-  const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(value);
-  if (!match) return false;
-  const year = Number(match[1]);
-  const month = Number(match[2]);
-  const day = Number(match[3]);
-  const date = new Date(Date.UTC(year, month - 1, day));
-  return date.getUTCFullYear() === year && date.getUTCMonth() === month - 1 && date.getUTCDate() === day;
-}
-function isCanonicalTime(value) {
-  const match = /^(\d{2}):(\d{2})$/.exec(value);
-  return match !== null && Number(match[1]) <= 23 && Number(match[2]) <= 59;
-}
-function isCanonicalDateTime(value) {
-  const match = /^(\d{4}-\d{2}-\d{2})T(\d{2}):(\d{2}):(\d{2})Z$/.exec(value);
-  if (!match || !isCanonicalDate(match[1])) return false;
-  return Number(match[2]) <= 23 && Number(match[3]) <= 59 && Number(match[4]) <= 59;
-}
 function collectKlikes2(where, out) {
   if (where === null) return;
   if (isKlike(where)) {