drizzle-cube 0.1.21 → 0.1.23

package/dist/adapters/{compiler-CPsEzFP2.js → compiler-CSr2Ti96.js}

@@ -1,6 +1,6 @@
-var FR = Object.defineProperty;
-var YR = (T, E, R) => E in T ? FR(T, E, { enumerable: !0, configurable: !0, writable: !0, value: R }) : T[E] = R;
-var l = (T, E, R) => YR(T, typeof E != "symbol" ? E + "" : E, R);
+var hR = Object.defineProperty;
+var VR = (T, E, R) => E in T ? hR(T, E, { enumerable: !0, configurable: !0, writable: !0, value: R }) : T[E] = R;
+var l = (T, E, R) => VR(T, typeof E != "symbol" ? E + "" : E, R);
 const X = Symbol.for("drizzle:entityKind");
 function F(T, E) {
   if (!T || typeof T != "object")
@@ -20,9 +20,9 @@ function F(T, E) {
     }
   return !1;
 }
-var gT;
-gT = X;
-class EE {
+var QT;
+QT = X;
+class RE {
   constructor(E, R) {
     l(this, "name");
     l(this, "keyAsName");
@@ -54,14 +54,14 @@ class EE {
     return this.config.generated !== void 0 && this.config.generated.type !== "byDefault";
   }
 }
-l(EE, gT, "Column");
-const DE = Symbol.for("drizzle:Name"), ET = Symbol.for("drizzle:isPgEnum");
-function pR(T) {
-  return !!T && typeof T == "function" && ET in T && T[ET] === !0;
+l(RE, QT, "Column");
+const aE = Symbol.for("drizzle:Name"), ST = Symbol.for("drizzle:isPgEnum");
+function WR(T) {
+  return !!T && typeof T == "function" && ST in T && T[ST] === !0;
 }
-var JT;
-JT = X;
-class QE {
+var ZT;
+ZT = X;
+class zE {
   constructor(E, R, A, S = !1, e = []) {
     this._ = {
       brand: "Subquery",
@@ -76,69 +76,69 @@ class QE {
   // 	return new SQL([this]);
   // }
 }
-l(QE, JT, "Subquery");
-const dR = {
+l(zE, ZT, "Subquery");
+const XR = {
   startActiveSpan(T, E) {
     return E();
   }
-}, SE = Symbol.for("drizzle:ViewBaseConfig"), aE = Symbol.for("drizzle:Schema"), TT = Symbol.for("drizzle:Columns"), RT = Symbol.for("drizzle:ExtraConfigColumns"), PE = Symbol.for("drizzle:OriginalName"), oE = Symbol.for("drizzle:BaseName"), CE = Symbol.for("drizzle:IsAlias"), AT = Symbol.for("drizzle:ExtraConfigBuilder"), fR = Symbol.for("drizzle:IsDrizzleTable");
-var wT, xT, vT, QT, ZT, qT, jT, kT, zT, ER;
-ER = X, zT = DE, kT = PE, jT = aE, qT = TT, ZT = RT, QT = oE, vT = CE, xT = fR, wT = AT;
+}, SE = Symbol.for("drizzle:ViewBaseConfig"), oE = Symbol.for("drizzle:Schema"), eT = Symbol.for("drizzle:Columns"), IT = Symbol.for("drizzle:ExtraConfigColumns"), PE = Symbol.for("drizzle:OriginalName"), ME = Symbol.for("drizzle:BaseName"), CE = Symbol.for("drizzle:IsAlias"), OT = Symbol.for("drizzle:ExtraConfigBuilder"), bR = Symbol.for("drizzle:IsDrizzleTable");
+var qT, jT, kT, zT, ER, TR, RR, AR, SR, eR;
+eR = X, SR = aE, AR = PE, RR = oE, TR = eT, ER = IT, zT = ME, kT = CE, jT = bR, qT = OT;
 class W {
   constructor(E, R, A) {
     /**
      * @internal
      * Can be changed if the table is aliased.
      */
-    l(this, zT);
+    l(this, SR);
     /**
      * @internal
      * Used to store the original name of the table, before any aliasing.
      */
-    l(this, kT);
+    l(this, AR);
     /** @internal */
-    l(this, jT);
+    l(this, RR);
     /** @internal */
-    l(this, qT);
+    l(this, TR);
     /** @internal */
-    l(this, ZT);
+    l(this, ER);
     /**
      *  @internal
      * Used to store the table name before the transformation via the `tableCreator` functions.
      */
-    l(this, QT);
+    l(this, zT);
     /** @internal */
-    l(this, vT, !1);
+    l(this, kT, !1);
     /** @internal */
-    l(this, xT, !0);
+    l(this, jT, !0);
     /** @internal */
-    l(this, wT);
-    this[DE] = this[PE] = E, this[aE] = R, this[oE] = A;
+    l(this, qT);
+    this[aE] = this[PE] = E, this[oE] = R, this[ME] = A;
   }
 }
-l(W, ER, "Table"), /** @internal */
+l(W, eR, "Table"), /** @internal */
 l(W, "Symbol", {
-  Name: DE,
-  Schema: aE,
+  Name: aE,
+  Schema: oE,
   OriginalName: PE,
-  Columns: TT,
-  ExtraConfigColumns: RT,
-  BaseName: oE,
+  Columns: eT,
+  ExtraConfigColumns: IT,
+  BaseName: ME,
   IsAlias: CE,
-  ExtraConfigBuilder: AT
+  ExtraConfigBuilder: OT
 });
-function sR(T) {
+function nR(T) {
   return T != null && typeof T.getSQL == "function";
 }
-function hR(T) {
+function yR(T) {
   var R;
   const E = { sql: "", params: [] };
   for (const A of T)
     E.sql += A.sql, E.params.push(...A.params), (R = A.typings) != null && R.length && (E.typings || (E.typings = []), E.typings.push(...A.typings));
   return E;
 }
-var TR;
-TR = X;
+var IR;
+IR = X;
 class h {
   constructor(E) {
     l(this, "value");
@@ -148,13 +148,13 @@ class h {
     return new m([this]);
   }
 }
-l(h, TR, "StringChunk");
-var RR;
-RR = X;
+l(h, IR, "StringChunk");
+var NR;
+NR = X;
 const v = class v {
   constructor(E) {
     /** @internal */
-    l(this, "decoder", CR);
+    l(this, "decoder", iR);
     l(this, "shouldInlineParams", !1);
     /** @internal */
     l(this, "usedTables", []);
@@ -171,7 +171,7 @@ const v = class v {
     return this.queryChunks.push(...E.queryChunks), this;
   }
   toQuery(E) {
-    return dR.startActiveSpan("drizzle.buildSQL", (R) => {
+    return XR.startActiveSpan("drizzle.buildSQL", (R) => {
       const A = this.buildQueryFromSourceParams(this.queryChunks, E);
       return R == null || R.setAttributes({
         "drizzle.query.text": A.sql,
@@ -191,7 +191,7 @@ const v = class v {
       inlineParams: _,
       paramStartIndex: I
     } = A;
-    return hR(E.map((O) => {
+    return yR(E.map((O) => {
       var C;
       if (F(O, h))
         return { sql: O.value.join(""), params: [] };
@@ -201,8 +201,8 @@ const v = class v {
         return { sql: "", params: [] };
       if (Array.isArray(O)) {
         const t = [new h("(")];
-        for (const [i, o] of O.entries())
-          t.push(o), i < O.length - 1 && t.push(new h(", "));
+        for (const [i, P] of O.entries())
+          t.push(P), i < O.length - 1 && t.push(new h(", "));
         return t.push(new h(")")), this.buildQueryFromSourceParams(t, A);
       }
       if (F(O, v))
@@ -217,7 +217,7 @@ const v = class v {
           params: []
         };
       }
-      if (F(O, EE)) {
+      if (F(O, RE)) {
         const t = S.getColumnCasing(O);
         if (R.invokeSource === "indexes")
           return { sql: e(t), params: [] };
@@ -227,7 +227,7 @@ const v = class v {
           params: []
         };
       }
-      if (F(O, ZE)) {
+      if (F(O, ET)) {
         const t = O[SE].schema, i = O[SE].name;
         return {
           sql: t === void 0 || O[SE].isAlias ? e(i) : e(t) + "." + e(i),
@@ -245,12 +245,12 @@ const v = class v {
         let i = ["none"];
         return s && (i = [s(O.encoder)]), { sql: N(I.value++, t), params: [t], typings: i };
       }
-      return F(O, OE) ? { sql: N(I.value++, O), params: [O], typings: ["none"] } : F(O, v.Aliased) && O.fieldAlias !== void 0 ? { sql: e(O.fieldAlias), params: [] } : F(O, QE) ? O._.isWith ? { sql: e(O._.alias), params: [] } : this.buildQueryFromSourceParams([
+      return F(O, OE) ? { sql: N(I.value++, O), params: [O], typings: ["none"] } : F(O, v.Aliased) && O.fieldAlias !== void 0 ? { sql: e(O.fieldAlias), params: [] } : F(O, zE) ? O._.isWith ? { sql: e(O._.alias), params: [] } : this.buildQueryFromSourceParams([
         new h("("),
         O._.sql,
         new h(") "),
         new LE(O._.alias)
-      ], A) : pR(O) ? O.schema ? { sql: e(O.schema) + "." + e(O.enumName), params: [] } : { sql: e(O.enumName), params: [] } : sR(O) ? (C = O.shouldOmitSQLParens) != null && C.call(O) ? this.buildQueryFromSourceParams([O.getSQL()], A) : this.buildQueryFromSourceParams([
+      ], A) : WR(O) ? O.schema ? { sql: e(O.schema) + "." + e(O.enumName), params: [] } : { sql: e(O.enumName), params: [] } : nR(O) ? (C = O.shouldOmitSQLParens) != null && C.call(O) ? this.buildQueryFromSourceParams([O.getSQL()], A) : this.buildQueryFromSourceParams([
         new h("("),
         O.getSQL(),
         new h(")")
@@ -292,10 +292,10 @@ const v = class v {
     return E ? this : void 0;
   }
 };
-l(v, RR, "SQL");
+l(v, NR, "SQL");
 let m = v;
-var AR;
-AR = X;
+var tR;
+tR = X;
 class LE {
   constructor(E) {
     l(this, "brand");
@@ -305,27 +305,27 @@ class LE {
     return new m([this]);
   }
 }
-l(LE, AR, "Name");
-function VR(T) {
+l(LE, tR, "Name");
+function KR(T) {
   return typeof T == "object" && T !== null && "mapToDriverValue" in T && typeof T.mapToDriverValue == "function";
 }
-const CR = {
+const iR = {
   mapFromDriverValue: (T) => T
-}, LR = {
+}, DR = {
   mapToDriverValue: (T) => T
 };
 ({
-  ...CR,
-  ...LR
+  ...iR,
+  ...DR
 });
-var SR;
-SR = X;
+var sR;
+sR = X;
 class IE {
   /**
    * @param value - Parameter value
    * @param encoder - Encoder to convert the value to a driver parameter
    */
-  constructor(E, R = LR) {
+  constructor(E, R = DR) {
     l(this, "brand");
     this.value = E, this.encoder = R;
   }
@@ -333,7 +333,7 @@ class IE {
     return new m([this]);
   }
 }
-l(IE, SR, "Param");
+l(IE, sR, "Param");
 function L(T, ...E) {
   const R = [];
   (E.length > 0 || T.length > 0 && T[0] !== "") && R.push(new h(T[0]));
@@ -395,8 +395,8 @@ function L(T, ...E) {
   let E = A;
   T.Aliased = E;
 })(m || (m = {}));
-var eR;
-eR = X;
+var CR;
+CR = X;
 class OE {
   constructor(E) {
     this.name = E;
@@ -405,16 +405,16 @@ class OE {
     return new m([this]);
   }
 }
-l(OE, eR, "Placeholder");
-const WR = Symbol.for("drizzle:IsDrizzleView");
-var IR, NR, tR;
-tR = X, NR = SE, IR = WR;
-class ZE {
+l(OE, CR, "Placeholder");
+const $R = Symbol.for("drizzle:IsDrizzleView");
+var LR, _R, rR;
+rR = X, _R = SE, LR = $R;
+class ET {
   constructor({ name: E, schema: R, selectedFields: A, query: S }) {
     /** @internal */
-    l(this, NR);
+    l(this, _R);
     /** @internal */
-    l(this, IR, !0);
+    l(this, LR, !0);
     this[SE] = {
       name: E,
       originalName: E,
@@ -429,20 +429,20 @@ class ZE {
     return new m([this]);
   }
 }
-l(ZE, tR, "View");
-EE.prototype.getSQL = function() {
+l(ET, rR, "View");
+RE.prototype.getSQL = function() {
   return new m([this]);
 };
 W.prototype.getSQL = function() {
   return new m([this]);
 };
-QE.prototype.getSQL = function() {
+zE.prototype.getSQL = function() {
   return new m([this]);
 };
 function $(T, E) {
-  return VR(E) && !sR(T) && !F(T, IE) && !F(T, OE) && !F(T, EE) && !F(T, W) && !F(T, ZE) ? new IE(T, E) : T;
+  return KR(E) && !nR(T) && !F(T, IE) && !F(T, OE) && !F(T, RE) && !F(T, W) && !F(T, ET) ? new IE(T, E) : T;
 }
-const qE = (T, E) => L`${T} = ${$(E, T)}`, XR = (T, E) => L`${T} <> ${$(E, T)}`;
+const _E = (T, E) => L`${T} = ${$(E, T)}`, NT = (T, E) => L`${T} <> ${$(E, T)}`;
 function b(...T) {
   const E = T.filter(
     (R) => R !== void 0
@@ -454,7 +454,7 @@ function b(...T) {
       new h(")")
     ]);
 }
-function bR(...T) {
+function UE(...T) {
   const E = T.filter(
     (R) => R !== void 0
   );
@@ -465,26 +465,26 @@ function bR(...T) {
       new h(")")
     ]);
 }
-const ST = (T, E) => L`${T} > ${$(E, T)}`, RE = (T, E) => L`${T} >= ${$(E, T)}`, eT = (T, E) => L`${T} < ${$(E, T)}`, AE = (T, E) => L`${T} <= ${$(E, T)}`;
-function IT(T, E) {
+const GE = (T, E) => L`${T} > ${$(E, T)}`, j = (T, E) => L`${T} >= ${$(E, T)}`, lE = (T, E) => L`${T} < ${$(E, T)}`, k = (T, E) => L`${T} <= ${$(E, T)}`;
+function cE(T, E) {
   return Array.isArray(E) ? E.length === 0 ? L`false` : L`${T} in ${E.map((R) => $(R, T))}` : L`${T} in ${$(E, T)}`;
 }
-function yR(T, E) {
+function tT(T, E) {
   return Array.isArray(E) ? E.length === 0 ? L`true` : L`${T} not in ${E.map((R) => $(R, T))}` : L`${T} not in ${$(E, T)}`;
 }
-function KR(T) {
+function sT(T) {
   return L`${T} is null`;
 }
-function $R(T) {
+function CT(T) {
   return L`${T} is not null`;
 }
-function OT(T) {
+function LT(T) {
   return L`${T} asc`;
 }
 function gR(T) {
   return L`${T} desc`;
 }
-function ME(T) {
+function uE(T) {
   return L`count(${T || L.raw("*")})`.mapWith(Number);
 }
 function JR(T) {
@@ -493,13 +493,13 @@ function JR(T) {
 function Q(T) {
   return L`sum(${T})`.mapWith(String);
 }
-function wE(T) {
-  return L`max(${T})`.mapWith(F(T, EE) ? T : String);
+function qE(T) {
+  return L`max(${T})`.mapWith(F(T, RE) ? T : String);
 }
-function xE(T) {
-  return L`min(${T})`.mapWith(F(T, EE) ? T : String);
+function jE(T) {
+  return L`min(${T})`.mapWith(F(T, RE) ? T : String);
 }
-class jE {
+class TT {
   /**
    * Helper method to build pattern for string matching
    * Can be overridden by specific adapters if needed
@@ -518,7 +518,7 @@ class jE {
     }
   }
 }
-class wR extends jE {
+class wR extends TT {
   getEngineType() {
     return "postgres";
   }
@@ -553,16 +553,25 @@ class wR extends jE {
    * Extracted from executor.ts:807-813 and multi-cube-builder.ts:468-474
    */
   buildStringCondition(E, R, A) {
-    const S = this.buildPattern(R, A);
     switch (R) {
       case "contains":
-        return L`${E} ILIKE ${S}`;
+        return L`${E} ILIKE ${`%${A}%`}`;
       case "notContains":
-        return L`${E} NOT ILIKE ${S}`;
+        return L`${E} NOT ILIKE ${`%${A}%`}`;
       case "startsWith":
-        return L`${E} ILIKE ${S}`;
+        return L`${E} ILIKE ${`${A}%`}`;
       case "endsWith":
-        return L`${E} ILIKE ${S}`;
+        return L`${E} ILIKE ${`%${A}`}`;
+      case "like":
+        return L`${E} LIKE ${A}`;
+      case "notLike":
+        return L`${E} NOT LIKE ${A}`;
+      case "ilike":
+        return L`${E} ILIKE ${A}`;
+      case "regex":
+        return L`${E} ~* ${A}`;
+      case "notRegex":
+        return L`${E} !~* ${A}`;
       default:
         throw new Error(`Unsupported string operator: ${R}`);
     }
@@ -633,7 +642,7 @@ class wR extends jE {
     return E;
   }
 }
-class xR extends jE {
+class xR extends TT {
   getEngineType() {
     return "mysql";
   }
@@ -670,16 +679,25 @@ class xR extends jE {
    * For guaranteed case-insensitive matching, we use LOWER() functions
    */
   buildStringCondition(E, R, A) {
-    const S = this.buildPattern(R, A.toLowerCase());
     switch (R) {
       case "contains":
-        return L`LOWER(${E}) LIKE ${S}`;
+        return L`LOWER(${E}) LIKE ${`%${A.toLowerCase()}%`}`;
       case "notContains":
-        return L`LOWER(${E}) NOT LIKE ${S}`;
+        return L`LOWER(${E}) NOT LIKE ${`%${A.toLowerCase()}%`}`;
       case "startsWith":
-        return L`LOWER(${E}) LIKE ${S}`;
+        return L`LOWER(${E}) LIKE ${`${A.toLowerCase()}%`}`;
       case "endsWith":
-        return L`LOWER(${E}) LIKE ${S}`;
+        return L`LOWER(${E}) LIKE ${`%${A.toLowerCase()}`}`;
+      case "like":
+        return L`${E} LIKE ${A}`;
+      case "notLike":
+        return L`${E} NOT LIKE ${A}`;
+      case "ilike":
+        return L`LOWER(${E}) LIKE ${A.toLowerCase()}`;
+      case "regex":
+        return L`${E} REGEXP ${A}`;
+      case "notRegex":
+        return L`${E} NOT REGEXP ${A}`;
       default:
         throw new Error(`Unsupported string operator: ${R}`);
     }
@@ -749,7 +767,7 @@ class xR extends jE {
     return E;
   }
 }
-class vR extends jE {
+class vR extends TT {
   getEngineType() {
     return "sqlite";
   }
@@ -791,16 +809,25 @@ class vR extends jE {
    * SQLite LIKE is case-insensitive by default, but LOWER() ensures consistency
    */
   buildStringCondition(E, R, A) {
-    const S = this.buildPattern(R, A.toLowerCase());
     switch (R) {
       case "contains":
-        return L`LOWER(${E}) LIKE ${S}`;
+        return L`LOWER(${E}) LIKE ${`%${A.toLowerCase()}%`}`;
       case "notContains":
-        return L`LOWER(${E}) NOT LIKE ${S}`;
+        return L`LOWER(${E}) NOT LIKE ${`%${A.toLowerCase()}%`}`;
       case "startsWith":
-        return L`LOWER(${E}) LIKE ${S}`;
+        return L`LOWER(${E}) LIKE ${`${A.toLowerCase()}%`}`;
       case "endsWith":
-        return L`LOWER(${E}) LIKE ${S}`;
+        return L`LOWER(${E}) LIKE ${`%${A.toLowerCase()}`}`;
+      case "like":
+        return L`${E} LIKE ${A}`;
+      case "notLike":
+        return L`${E} NOT LIKE ${A}`;
+      case "ilike":
+        return L`LOWER(${E}) LIKE ${A.toLowerCase()}`;
+      case "regex":
+        return L`${E} GLOB ${A}`;
+      case "notRegex":
+        return L`${E} NOT GLOB ${A}`;
       default:
         throw new Error(`Unsupported string operator: ${R}`);
     }
@@ -888,7 +915,7 @@ function QR(T) {
       throw new Error(`Unsupported database engine: ${T}`);
   }
 }
-class kE {
+class RT {
   constructor(E, R, A) {
     l(this, "databaseAdapter");
     this.db = E, this.schema = R;
@@ -896,24 +923,11 @@ class kE {
     this.databaseAdapter = QR(S);
   }
 }
-class ZR extends kE {
+class ZR extends RT {
   async execute(E, R) {
-    if (E && typeof E == "object") {
-      if (typeof E.execute == "function") {
-        const S = await E.execute();
-        return Array.isArray(S) ? S.map((e) => this.convertNumericFields(e, R)) : S;
-      }
-      if (this.db && typeof this.db.execute == "function")
-        try {
-          const S = await this.db.execute(E);
-          return Array.isArray(S) ? S.map((e) => this.convertNumericFields(e, R)) : S;
-        } catch (S) {
-          if (typeof E.getSQL == "function") {
-            const e = E.getSQL(), N = await this.db.execute(e);
-            return Array.isArray(N) ? N.map((s) => this.convertNumericFields(s, R)) : N;
-          }
-          throw S;
-        }
+    if (E && typeof E == "object" && typeof E.execute == "function") {
+      const S = await E.execute();
+      return Array.isArray(S) ? S.map((e) => this.convertNumericFields(e, R)) : S;
     }
     if (!this.db.execute)
       throw new Error("PostgreSQL database instance must have an execute method");
@@ -961,10 +975,10 @@ class ZR extends kE {
     return "postgres";
   }
 }
-function NT(T, E) {
+function _T(T, E) {
   return new ZR(T, E, "postgres");
 }
-class qR extends kE {
+class qR extends RT {
   async execute(E, R) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
       const S = await E.execute();
@@ -1005,7 +1019,7 @@ class qR extends kE {
 function jR(T, E) {
   return new qR(T, E, "mysql");
 }
-class kR extends kE {
+class kR extends RT {
   async execute(E, R) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
       const A = await E.execute();
@@ -1051,26 +1065,26 @@ class kR extends kE {
     return "sqlite";
   }
 }
-function tT(T, E) {
+function rT(T, E) {
   return new kR(T, E, "sqlite");
 }
-function sT(T, E, R) {
+function nT(T, E, R) {
   if (R)
     switch (R) {
       case "postgres":
-        return NT(T, E);
+        return _T(T, E);
       case "mysql":
         return jR(T, E);
       case "sqlite":
-        return tT(T, E);
+        return rT(T, E);
     }
   if (T.all && T.run)
-    return tT(T, E);
+    return rT(T, E);
   if (T.execute)
-    return NT(T, E);
+    return _T(T, E);
   throw new Error("Unable to determine database engine type. Please specify engineType parameter.");
 }
-function CT(T) {
+function iT(T) {
   return typeof T == "function" ? T() : T;
 }
 function zR(T, E) {
@@ -1127,7 +1141,7 @@ class EA {
           S[N.dimension] = L`${C}`.as(N.dimension);
         }
       }
-    return Object.keys(S).length === 0 && (S.count = ME()), S;
+    return Object.keys(S).length === 0 && (S.count = uE()), S;
   }
   /**
    * Build measure expression for HAVING clause, handling CTE references correctly
@@ -1145,9 +1159,9 @@ class EA {
           case "avg":
             return this.databaseAdapter.buildAvg(s);
           case "min":
-            return xE(s);
+            return jE(s);
           case "max":
-            return wE(s);
+            return qE(s);
           case "number":
             return Q(s);
           default:
@@ -1173,7 +1187,7 @@ class EA {
     }
     switch (E.type) {
       case "count":
-        return ME(A);
+        return uE(A);
       case "countDistinct":
         return JR(A);
       case "sum":
@@ -1181,13 +1195,13 @@ class EA {
       case "avg":
         return this.databaseAdapter.buildAvg(A);
       case "min":
-        return xE(A);
+        return jE(A);
       case "max":
-        return wE(A);
+        return qE(A);
       case "number":
         return A;
       default:
-        return ME(A);
+        return uE(A);
     }
   }
   /**
@@ -1241,12 +1255,12 @@ class EA {
     if ("and" in E || "or" in E) {
       const i = E;
       if (i.and) {
-        const o = i.and.map((M) => this.processFilter(M, R, A, S, e)).filter((M) => M !== null);
-        return o.length > 0 ? b(...o) : null;
+        const P = i.and.map((M) => this.processFilter(M, R, A, S, e)).filter((M) => M !== null);
+        return P.length > 0 ? b(...P) : null;
       }
       if (i.or) {
-        const o = i.or.map((M) => this.processFilter(M, R, A, S, e)).filter((M) => M !== null);
-        return o.length > 0 ? bR(...o) : null;
+        const P = i.or.map((M) => this.processFilter(M, R, A, S, e)).filter((M) => M !== null);
+        return P.length > 0 ? UE(...P) : null;
       }
     }
     const N = E, [s, _] = N.member.split("."), I = R.get(s);
@@ -1283,16 +1297,16 @@ class EA {
         if (e.length > 1) {
           if ((S == null ? void 0 : S.type) === "time") {
             const s = e.map((_) => this.normalizeDate(_) || _);
-            return IT(E, s);
+            return cE(E, s);
           }
-          return IT(E, e);
+          return cE(E, e);
         } else if (e.length === 1) {
           const s = (S == null ? void 0 : S.type) === "time" && this.normalizeDate(N) || N;
-          return qE(E, s);
+          return _E(E, s);
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
-        return e.length > 1 ? yR(E, e) : e.length === 1 ? XR(E, N) : null;
+        return e.length > 1 ? tT(E, e) : e.length === 1 ? NT(E, N) : null;
       case "contains":
         return this.databaseAdapter.buildStringCondition(E, "contains", N);
       case "notContains":
@@ -1302,35 +1316,69 @@ class EA {
       case "endsWith":
         return this.databaseAdapter.buildStringCondition(E, "endsWith", N);
       case "gt":
-        return ST(E, N);
+        return GE(E, N);
       case "gte":
-        return RE(E, N);
+        return j(E, N);
       case "lt":
-        return eT(E, N);
+        return lE(E, N);
       case "lte":
-        return AE(E, N);
+        return k(E, N);
       case "set":
-        return $R(E);
+        return CT(E);
       case "notSet":
-        return KR(E);
+        return sT(E);
       case "inDateRange":
         if (e.length >= 2) {
           const s = this.normalizeDate(e[0]), _ = this.normalizeDate(e[1]);
           if (s && _)
             return b(
-              RE(E, s),
-              AE(E, _)
+              j(E, s),
+              k(E, _)
             );
         }
         return null;
       case "beforeDate": {
         const s = this.normalizeDate(N);
-        return s ? eT(E, s) : null;
+        return s ? lE(E, s) : null;
       }
       case "afterDate": {
         const s = this.normalizeDate(N);
-        return s ? ST(E, s) : null;
+        return s ? GE(E, s) : null;
       }
+      case "between":
+        return e.length >= 2 ? b(
+          j(E, e[0]),
+          k(E, e[1])
+        ) : null;
+      case "notBetween":
+        return e.length >= 2 ? UE(
+          lE(E, e[0]),
+          GE(E, e[1])
+        ) : null;
+      case "in":
+        return e.length > 0 ? cE(E, e) : null;
+      case "notIn":
+        return e.length > 0 ? tT(E, e) : null;
+      case "like":
+        return this.databaseAdapter.buildStringCondition(E, "like", N);
+      case "notLike":
+        return this.databaseAdapter.buildStringCondition(E, "notLike", N);
+      case "ilike":
+        return this.databaseAdapter.buildStringCondition(E, "ilike", N);
+      case "regex":
+        return this.databaseAdapter.buildStringCondition(E, "regex", N);
+      case "notRegex":
+        return this.databaseAdapter.buildStringCondition(E, "notRegex", N);
+      case "isEmpty":
+        return UE(
+          sT(E),
+          _E(E, "")
+        );
+      case "isNotEmpty":
+        return b(
+          CT(E),
+          NT(E, "")
+        );
       default:
         return null;
     }
@@ -1343,16 +1391,16 @@ class EA {
     if (Array.isArray(R) && R.length >= 2) {
       const A = this.normalizeDate(R[0]), S = this.normalizeDate(R[1]);
       return !A || !S ? null : b(
-        RE(E, A),
-        AE(E, S)
+        j(E, A),
+        k(E, S)
       );
     }
     if (typeof R == "string") {
       const A = this.parseRelativeDateRange(R);
       if (A)
         return b(
-          RE(E, A.start),
-          AE(E, A.end)
+          j(E, A.start),
+          k(E, A.end)
         );
       const S = this.normalizeDate(R);
       if (!S) return null;
@@ -1360,8 +1408,8 @@ class EA {
       e.setUTCHours(0, 0, 0, 0);
       const N = new Date(S);
       return N.setUTCHours(23, 59, 59, 999), b(
-        RE(E, e),
-        AE(E, N)
+        j(E, e),
+        k(E, N)
       );
     }
     return null;
@@ -1420,8 +1468,8 @@ class EA {
       return { start: C, end: t };
     }
     if (A === "last quarter") {
-      const C = Math.floor(e / 3), t = C === 0 ? 3 : C - 1, i = C === 0 ? S - 1 : S, o = new Date(Date.UTC(i, t * 3, 1, 0, 0, 0, 0)), M = new Date(Date.UTC(i, t * 3 + 3, 0, 23, 59, 59, 999));
-      return { start: o, end: M };
+      const C = Math.floor(e / 3), t = C === 0 ? 3 : C - 1, i = C === 0 ? S - 1 : S, P = new Date(Date.UTC(i, t * 3, 1, 0, 0, 0, 0)), M = new Date(Date.UTC(i, t * 3 + 3, 0, 23, 59, 59, 999));
+      return { start: P, end: M };
     }
     if (A === "last year") {
       const C = new Date(Date.UTC(S - 1, 0, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S - 1, 11, 31, 23, 59, 59, 999));
@@ -1478,16 +1526,16 @@ class EA {
         const [C, t] = O.split("."), i = s.get(C);
         if (i && i.dimensions && i.dimensions[t])
           if ((_ = S == null ? void 0 : S.preAggregationCTEs) == null ? void 0 : _.some((M) => M.cube.name === C)) {
-            const M = S.preAggregationCTEs.find((G) => G.cube.name === C), P = M.joinKeys.find((G) => G.targetColumn === t);
-            if (P && P.sourceColumnObj)
-              e.push(P.sourceColumnObj);
+            const M = S.preAggregationCTEs.find((G) => G.cube.name === C), o = M.joinKeys.find((G) => G.targetColumn === t);
+            if (o && o.sourceColumnObj)
+              e.push(o.sourceColumnObj);
             else {
               const G = L`${L.identifier(M.cteAlias)}.${L.identifier(t)}`;
               e.push(G);
             }
           } else {
-            const M = i.dimensions[t], P = x(M.sql, A);
-            e.push(P);
+            const M = i.dimensions[t], o = x(M.sql, A);
+            e.push(o);
           }
       }
     if (R.timeDimensions)
@@ -1495,10 +1543,10 @@ class EA {
         const [C, t] = O.dimension.split("."), i = s.get(C);
         if (i && i.dimensions && i.dimensions[t])
           if ((I = S == null ? void 0 : S.preAggregationCTEs) == null ? void 0 : I.some((M) => M.cube.name === C)) {
-            const M = S.preAggregationCTEs.find((G) => G.cube.name === C), P = M.joinKeys.find((G) => G.targetColumn === t);
-            if (P && P.sourceColumnObj) {
+            const M = S.preAggregationCTEs.find((G) => G.cube.name === C), o = M.joinKeys.find((G) => G.targetColumn === t);
+            if (o && o.sourceColumnObj) {
               const G = this.buildTimeDimensionExpression(
-                P.sourceColumnObj,
+                o.sourceColumnObj,
                 O.granularity,
                 A
               );
@@ -1508,12 +1556,12 @@ class EA {
               e.push(G);
             }
           } else {
-            const M = i.dimensions[t], P = this.buildTimeDimensionExpression(
+            const M = i.dimensions[t], o = this.buildTimeDimensionExpression(
               M.sql,
               O.granularity,
               A
             );
-            e.push(P);
+            e.push(o);
           }
       }
     return e;
@@ -1532,7 +1580,7 @@ class EA {
       for (const [N, s] of Object.entries(E.order)) {
         if (!S.includes(N))
           throw new Error(`Cannot order by '${N}': field is not selected in the query`);
-        const _ = s === "desc" ? gR(L.identifier(N)) : OT(L.identifier(N));
+        const _ = s === "desc" ? gR(L.identifier(N)) : LT(L.identifier(N));
         A.push(_);
       }
     if (E.timeDimensions && E.timeDimensions.length > 0) {
@@ -1540,7 +1588,7 @@ class EA {
         (_, I) => _.dimension.localeCompare(I.dimension)
       );
       for (const _ of s)
-        N.has(_.dimension) || A.push(OT(L.identifier(_.dimension)));
+        N.has(_.dimension) || A.push(LT(L.identifier(_.dimension)));
     }
     return A;
   }
@@ -1766,7 +1814,7 @@ class TA {
   buildJoinCondition(E, R, A) {
     const S = [];
     for (const e of E.on) {
-      const N = R ? L`${L.identifier(R)}.${L.identifier(e.source.name)}` : e.source, s = A ? L`${L.identifier(A)}.${L.identifier(e.target.name)}` : e.target, _ = e.as || qE;
+      const N = R ? L`${L.identifier(R)}.${L.identifier(e.source.name)}` : e.source, s = A ? L`${L.identifier(A)}.${L.identifier(e.target.name)}` : e.target, _ = e.as || _E;
       S.push(_(N, s));
     }
     return b(...S);
@@ -1785,7 +1833,7 @@ class TA {
       const { cube: s, path: _ } = e.shift(), I = E.get(s);
       if (I != null && I.joins)
         for (const [, O] of Object.entries(I.joins)) {
-          const t = CT(O.targetCube).name;
+          const t = iT(O.targetCube).name;
           if (N.has(t))
             continue;
           const i = [..._, {
@@ -1839,12 +1887,12 @@ class TA {
     if (!E.joins)
       return null;
     for (const [, A] of Object.entries(E.joins))
-      if (CT(A.targetCube).name === R && A.relationship === "hasMany")
+      if (iT(A.targetCube).name === R && A.relationship === "hasMany")
         return A;
     return null;
   }
 }
-class UE {
+class HE {
   constructor(E) {
     l(this, "queryBuilder");
     l(this, "queryPlanner");
@@ -1858,7 +1906,7 @@ class UE {
    */
   async execute(E, R, A) {
     try {
-      const S = HR(E, R);
+      const S = pR(E, R);
       if (!S.isValid)
         throw new Error(`Query validation failed: ${S.errors.join(", ")}`);
       const e = {
@@ -1868,14 +1916,14 @@ class UE {
       }, N = this.queryPlanner.createQueryPlan(E, R, e), s = this.buildUnifiedQuery(N, R, e), _ = this.queryBuilder.collectNumericFields(E, R), I = await this.dbExecutor.execute(s, _), O = Array.isArray(I) ? I.map((t) => {
         const i = { ...t };
         if (R.timeDimensions) {
-          for (const o of R.timeDimensions)
-            if (o.dimension in i) {
-              let M = i[o.dimension];
+          for (const P of R.timeDimensions)
+            if (P.dimension in i) {
+              let M = i[P.dimension];
               if (typeof M == "string" && M.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
-                const P = M.replace(" ", "T"), G = !P.endsWith("Z") && !P.includes("+") ? P + "Z" : P;
+                const o = M.replace(" ", "T"), G = !o.endsWith("Z") && !o.includes("+") ? o + "Z" : o;
                 M = new Date(G);
               }
-              M = this.databaseAdapter.convertTimeDimensionResult(M), i[o.dimension] = M;
+              M = this.databaseAdapter.convertTimeDimensionResult(M), i[P.dimension] = M;
             }
         }
         return i;
@@ -1901,14 +1949,14 @@ class UE {
   buildPreAggregationCTE(E, R, A, S) {
     var M;
     const e = E.cube, N = e.sql(A), s = {};
-    for (const P of E.joinKeys)
-      if (P.targetColumnObj) {
-        s[P.targetColumn] = P.targetColumnObj;
+    for (const o of E.joinKeys)
+      if (o.targetColumnObj) {
+        s[o.targetColumn] = o.targetColumnObj;
         for (const [G, a] of Object.entries(e.dimensions || {}))
-          a.sql === P.targetColumnObj && G !== P.targetColumn && (s[G] = L`${P.targetColumnObj}`.as(G));
+          a.sql === o.targetColumnObj && G !== o.targetColumn && (s[G] = L`${o.targetColumnObj}`.as(G));
       }
-    for (const P of E.measures) {
-      const [, G] = P.split(".");
+    for (const o of E.measures) {
+      const [, G] = o.split(".");
       if (e.measures && e.measures[G]) {
         const a = e.measures[G], H = this.queryBuilder.buildMeasureExpression(a, A);
         s[G] = L`${H}`.as(G);
@@ -1916,18 +1964,18 @@ class UE {
     }
     const _ = e.name;
     if (R.dimensions)
-      for (const P of R.dimensions) {
-        const [G, a] = P.split(".");
+      for (const o of R.dimensions) {
+        const [G, a] = o.split(".");
         if (G === _ && e.dimensions && e.dimensions[a]) {
           const H = e.dimensions[a], u = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, A);
           s[a] = L`${u}`.as(a);
         }
       }
     if (R.timeDimensions)
-      for (const P of R.timeDimensions) {
-        const [G, a] = P.dimension.split(".");
+      for (const o of R.timeDimensions) {
+        const [G, a] = o.dimension.split(".");
         if (G === _ && e.dimensions && e.dimensions[a]) {
-          const H = e.dimensions[a], u = this.queryBuilder.buildTimeDimensionExpression(H.sql, P.granularity, A);
+          const H = e.dimensions[a], u = this.queryBuilder.buildTimeDimensionExpression(H.sql, o.granularity, A);
           s[a] = L`${u}`.as(a);
         }
       }
@@ -1936,20 +1984,20 @@ class UE {
     let I = A.db.select(s).from(N.from);
     const O = S ? {
       ...S,
-      preAggregationCTEs: (M = S.preAggregationCTEs) == null ? void 0 : M.filter((P) => P.cube.name !== e.name)
+      preAggregationCTEs: (M = S.preAggregationCTEs) == null ? void 0 : M.filter((o) => o.cube.name !== e.name)
     } : void 0, C = this.queryBuilder.buildWhereConditions(e, R, A, O), t = [];
     if (R.timeDimensions)
-      for (const P of R.timeDimensions) {
-        const [G, a] = P.dimension.split(".");
-        if (G === _ && e.dimensions && e.dimensions[a] && P.dateRange) {
-          const H = e.dimensions[a], u = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, A), B = this.queryBuilder.buildDateRangeCondition(u, P.dateRange);
+      for (const o of R.timeDimensions) {
+        const [G, a] = o.dimension.split(".");
+        if (G === _ && e.dimensions && e.dimensions[a] && o.dateRange) {
+          const H = e.dimensions[a], u = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, A), B = this.queryBuilder.buildDateRangeCondition(u, o.dateRange);
           B && t.push(B);
         }
       }
     if (R.filters) {
-      for (const P of R.filters)
-        if (!("and" in P) && !("or" in P) && "member" in P && "operator" in P) {
-          const G = P, [a, H] = G.member.split(".");
+      for (const o of R.filters)
+        if (!("and" in o) && !("or" in o) && "member" in o && "operator" in o) {
+          const G = o, [a, H] = G.member.split(".");
           if (a === _ && e.dimensions && e.dimensions[H]) {
             const u = e.dimensions[H];
             if (G.operator === "inDateRange") {
@@ -1961,29 +2009,29 @@ class UE {
     }
     const i = [];
     if (N.where && i.push(N.where), i.push(...C, ...t), i.length > 0) {
-      const P = i.length === 1 ? i[0] : b(...i);
-      I = I.where(P);
+      const o = i.length === 1 ? i[0] : b(...i);
+      I = I.where(o);
     }
-    const o = [];
-    for (const P of E.joinKeys)
-      P.targetColumnObj && o.push(P.targetColumnObj);
+    const P = [];
+    for (const o of E.joinKeys)
+      o.targetColumnObj && P.push(o.targetColumnObj);
     if (R.dimensions)
-      for (const P of R.dimensions) {
-        const [G, a] = P.split(".");
+      for (const o of R.dimensions) {
+        const [G, a] = o.split(".");
         if (G === _ && e.dimensions && e.dimensions[a]) {
           const H = e.dimensions[a], u = x(H.sql, A);
-          o.push(u);
+          P.push(u);
         }
       }
     if (R.timeDimensions)
-      for (const P of R.timeDimensions) {
-        const [G, a] = P.dimension.split(".");
+      for (const o of R.timeDimensions) {
+        const [G, a] = o.dimension.split(".");
         if (G === _ && e.dimensions && e.dimensions[a]) {
-          const H = e.dimensions[a], u = this.queryBuilder.buildTimeDimensionExpression(H.sql, P.granularity, A);
-          o.push(u);
+          const H = e.dimensions[a], u = this.queryBuilder.buildTimeDimensionExpression(H.sql, o.granularity, A);
+          P.push(u);
         }
       }
-    return o.length > 0 && (I = I.groupBy(...o)), A.db.$with(E.cteAlias).as(I);
+    return P.length > 0 && (I = I.groupBy(...P)), A.db.$with(E.cteAlias).as(I);
   }
   // Removed unused getActualJoinTargetColumn method
   /**
@@ -1997,7 +2045,7 @@ class UE {
     const e = [];
     for (const s of S.joinKeys) {
       const _ = s.sourceColumnObj || L.identifier(s.sourceColumn), I = L`${L.identifier(R)}.${L.identifier(s.targetColumn)}`;
-      e.push(qE(_, I));
+      e.push(_E(_, I));
     }
     return e.length === 1 ? e[0] : b(...e);
   }
@@ -2005,7 +2053,7 @@ class UE {
    * Build unified query that works for both single and multi-cube queries
    */
   buildUnifiedQuery(E, R, A) {
-    var M, P, G;
+    var M, o, G;
     const S = [], e = /* @__PURE__ */ new Map();
     if (E.preAggregationCTEs && E.preAggregationCTEs.length > 0)
       for (const a of E.preAggregationCTEs) {
@@ -2037,10 +2085,10 @@ class UE {
                   K = this.databaseAdapter.buildAvg(g);
                   break;
                 case "min":
-                  K = xE(g);
+                  K = jE(g);
                   break;
                 case "max":
-                  K = wE(g);
+                  K = qE(g);
                   break;
                 case "number":
                   K = Q(g);
@@ -2056,12 +2104,12 @@ class UE {
           if (B === H) {
             const V = this.getCubesFromPlan(E).get(H), g = V && ((M = V.dimensions) == null ? void 0 : M[Y]), K = u.startsWith(H + ".");
             if (g || K) {
-              let nE = a.joinKeys.find((iE) => iE.targetColumn === Y);
-              if (!nE && ((P = V == null ? void 0 : V.dimensions) != null && P[Y])) {
-                const iE = V.dimensions[Y].sql;
-                nE = a.joinKeys.find((mR) => mR.targetColumnObj === iE);
+              let iE = a.joinKeys.find((DE) => DE.targetColumn === Y);
+              if (!iE && ((o = V == null ? void 0 : V.dimensions) != null && o[Y])) {
+                const DE = V.dimensions[Y].sql;
+                iE = a.joinKeys.find((fR) => fR.targetColumnObj === DE);
               }
-              nE ? _[u] = L`${L.identifier(a.cteAlias)}.${L.identifier(Y)}`.as(u) : K && ((G = V == null ? void 0 : V.dimensions) != null && G[Y]) && (_[u] = L`${L.identifier(a.cteAlias)}.${L.identifier(Y)}`.as(u));
+              iE ? _[u] = L`${L.identifier(a.cteAlias)}.${L.identifier(Y)}`.as(u) : K && ((G = V == null ? void 0 : V.dimensions) != null && G[Y]) && (_[u] = L`${L.identifier(a.cteAlias)}.${L.identifier(Y)}`.as(u));
             }
           }
         }
@@ -2147,8 +2195,8 @@ class UE {
       const a = i.length === 1 ? i[0] : b(...i);
       I = I.having(a);
     }
-    const o = this.queryBuilder.buildOrderBy(R);
-    return o.length > 0 && (I = I.orderBy(...o)), I = this.queryBuilder.applyLimitAndOffset(I, R), I;
+    const P = this.queryBuilder.buildOrderBy(R);
+    return P.length > 0 && (I = I.orderBy(...P)), I = this.queryBuilder.applyLimitAndOffset(I, R), I;
   }
   /**
    * Convert query plan to cube map for QueryBuilder methods
@@ -2239,8 +2287,8 @@ class UE {
 }
 const r = (T) => T.flatMap(RA), RA = (T) => NE(SA(T)).map(AA), AA = (T) => T.replace(/ +/g, " ").trim(), SA = (T) => ({
   type: "mandatory_block",
-  items: zE(T, 0)[0]
-}), zE = (T, E, R) => {
+  items: AT(T, 0)[0]
+}), AT = (T, E, R) => {
   const A = [];
   for (; T[E]; ) {
     const [S, e] = eA(T, E);
@@ -2280,10 +2328,10 @@ const r = (T) => T.flatMap(RA), RA = (T) => NE(SA(T)).map(AA), AA = (T) => T.rep
     return [R, E];
   }
 }, OA = (T, E) => {
-  const [R, A] = zE(T, E, "}");
+  const [R, A] = AT(T, E, "}");
   return [{ type: "mandatory_block", items: R }, A];
 }, NA = (T, E) => {
-  const [R, A] = zE(T, E, "]");
+  const [R, A] = AT(T, E, "]");
   return [{ type: "optional_block", items: R }, A];
 }, NE = (T) => {
   if (typeof T == "string")
@@ -2306,19 +2354,19 @@ var D;
 (function(T) {
   T.QUOTED_IDENTIFIER = "QUOTED_IDENTIFIER", T.IDENTIFIER = "IDENTIFIER", T.STRING = "STRING", T.VARIABLE = "VARIABLE", T.RESERVED_DATA_TYPE = "RESERVED_DATA_TYPE", T.RESERVED_PARAMETERIZED_DATA_TYPE = "RESERVED_PARAMETERIZED_DATA_TYPE", T.RESERVED_KEYWORD = "RESERVED_KEYWORD", T.RESERVED_FUNCTION_NAME = "RESERVED_FUNCTION_NAME", T.RESERVED_PHRASE = "RESERVED_PHRASE", T.RESERVED_SET_OPERATION = "RESERVED_SET_OPERATION", T.RESERVED_CLAUSE = "RESERVED_CLAUSE", T.RESERVED_SELECT = "RESERVED_SELECT", T.RESERVED_JOIN = "RESERVED_JOIN", T.ARRAY_IDENTIFIER = "ARRAY_IDENTIFIER", T.ARRAY_KEYWORD = "ARRAY_KEYWORD", T.CASE = "CASE", T.END = "END", T.WHEN = "WHEN", T.ELSE = "ELSE", T.THEN = "THEN", T.LIMIT = "LIMIT", T.BETWEEN = "BETWEEN", T.AND = "AND", T.OR = "OR", T.XOR = "XOR", T.OPERATOR = "OPERATOR", T.COMMA = "COMMA", T.ASTERISK = "ASTERISK", T.PROPERTY_ACCESS_OPERATOR = "PROPERTY_ACCESS_OPERATOR", T.OPEN_PAREN = "OPEN_PAREN", T.CLOSE_PAREN = "CLOSE_PAREN", T.LINE_COMMENT = "LINE_COMMENT", T.BLOCK_COMMENT = "BLOCK_COMMENT", T.DISABLE_COMMENT = "DISABLE_COMMENT", T.NUMBER = "NUMBER", T.NAMED_PARAMETER = "NAMED_PARAMETER", T.QUOTED_PARAMETER = "QUOTED_PARAMETER", T.NUMBERED_PARAMETER = "NUMBERED_PARAMETER", T.POSITIONAL_PARAMETER = "POSITIONAL_PARAMETER", T.CUSTOM_PARAMETER = "CUSTOM_PARAMETER", T.DELIMITER = "DELIMITER", T.EOF = "EOF";
 })(D = D || (D = {}));
-const _R = (T) => ({
+const aR = (T) => ({
   type: D.EOF,
   raw: "«EOF»",
   text: "«EOF»",
   start: T
-}), z = _R(1 / 0), j = (T) => (E) => E.type === T.type && E.text === T.text, Z = {
-  ARRAY: j({ text: "ARRAY", type: D.RESERVED_DATA_TYPE }),
-  BY: j({ text: "BY", type: D.RESERVED_KEYWORD }),
-  SET: j({ text: "SET", type: D.RESERVED_CLAUSE }),
-  STRUCT: j({ text: "STRUCT", type: D.RESERVED_DATA_TYPE }),
-  WINDOW: j({ text: "WINDOW", type: D.RESERVED_CLAUSE }),
-  VALUES: j({ text: "VALUES", type: D.RESERVED_CLAUSE })
-}, rR = (T) => T === D.RESERVED_DATA_TYPE || T === D.RESERVED_KEYWORD || T === D.RESERVED_FUNCTION_NAME || T === D.RESERVED_PHRASE || T === D.RESERVED_CLAUSE || T === D.RESERVED_SELECT || T === D.RESERVED_SET_OPERATION || T === D.RESERVED_JOIN || T === D.ARRAY_KEYWORD || T === D.CASE || T === D.END || T === D.WHEN || T === D.ELSE || T === D.THEN || T === D.LIMIT || T === D.BETWEEN || T === D.AND || T === D.OR || T === D.XOR, sA = (T) => T === D.AND || T === D.OR || T === D.XOR, CA = [
+}), TE = aR(1 / 0), z = (T) => (E) => E.type === T.type && E.text === T.text, Z = {
+  ARRAY: z({ text: "ARRAY", type: D.RESERVED_DATA_TYPE }),
+  BY: z({ text: "BY", type: D.RESERVED_KEYWORD }),
+  SET: z({ text: "SET", type: D.RESERVED_CLAUSE }),
+  STRUCT: z({ text: "STRUCT", type: D.RESERVED_DATA_TYPE }),
+  WINDOW: z({ text: "WINDOW", type: D.RESERVED_CLAUSE }),
+  VALUES: z({ text: "VALUES", type: D.RESERVED_CLAUSE })
+}, oR = (T) => T === D.RESERVED_DATA_TYPE || T === D.RESERVED_KEYWORD || T === D.RESERVED_FUNCTION_NAME || T === D.RESERVED_PHRASE || T === D.RESERVED_CLAUSE || T === D.RESERVED_SELECT || T === D.RESERVED_SET_OPERATION || T === D.RESERVED_JOIN || T === D.ARRAY_KEYWORD || T === D.CASE || T === D.END || T === D.WHEN || T === D.ELSE || T === D.THEN || T === D.LIMIT || T === D.BETWEEN || T === D.AND || T === D.OR || T === D.XOR, sA = (T) => T === D.AND || T === D.OR || T === D.XOR, CA = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/aead_encryption_functions
   "KEYS.NEW_KEYSET",
   "KEYS.ADD_KEY_FROM_RAW_BYTES",
@@ -3024,9 +3072,9 @@ const _R = (T) => ({
   "WITH CONNECTION",
   "WITH PARTITION COLUMNS",
   "REMOTE WITH CONNECTION"
-]), LT = r([
+]), DT = r([
   "CREATE [OR REPLACE] [TEMP|TEMPORARY|SNAPSHOT|EXTERNAL] TABLE [IF NOT EXISTS]"
-]), GE = r([
+]), BE = r([
   // - create:
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language
   "CREATE [OR REPLACE] [MATERIALIZED] VIEW [IF NOT EXISTS]",
@@ -3133,11 +3181,11 @@ const _R = (T) => ({
   "{ROWS | RANGE} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), PA = {
+]), oA = {
   name: "bigquery",
   tokenizerOptions: {
     reservedSelect: rA,
-    reservedClauses: [...nA, ...GE, ...LT],
+    reservedClauses: [...nA, ...BE, ...DT],
     reservedSetOperations: iA,
     reservedJoins: DA,
     reservedPhrases: aA,
@@ -3161,18 +3209,18 @@ const _R = (T) => ({
     variableTypes: [{ regex: String.raw`@@\w+` }],
     lineCommentTypes: ["--", "#"],
     operators: ["&", "|", "^", "~", ">>", "<<", "||", "=>"],
-    postProcess: oA
+    postProcess: PA
   },
   formatOptions: {
-    onelineClauses: [...LT, ...GE],
-    tabularOnelineClauses: GE
+    onelineClauses: [...DT, ...BE],
+    tabularOnelineClauses: BE
   }
 };
-function oA(T) {
+function PA(T) {
   return MA(UA(T));
 }
 function MA(T) {
-  let E = z;
+  let E = TE;
   return T.map((R) => R.text === "OFFSET" && E.text === "[" ? (E = R, Object.assign(Object.assign({}, R), { type: D.RESERVED_FUNCTION_NAME })) : (E = R, R));
 }
 function UA(T) {
@@ -3184,8 +3232,8 @@ function UA(T) {
       const e = GA(T, A + 1), N = T.slice(A, e + 1);
       R.push({
         type: D.IDENTIFIER,
-        raw: N.map(_T("raw")).join(""),
-        text: N.map(_T("text")).join(""),
+        raw: N.map(aT("raw")).join(""),
+        text: N.map(aT("text")).join(""),
         start: S.start
       }), A = e;
     } else
@@ -3193,7 +3241,7 @@ function UA(T) {
   }
   return R;
 }
-const _T = (T) => (E) => E.type === D.IDENTIFIER || E.type === D.COMMA ? E[T] + " " : E[T];
+const aT = (T) => (E) => E.type === D.IDENTIFIER || E.type === D.COMMA ? E[T] + " " : E[T];
 function GA(T, E) {
   let R = 0;
   for (let A = E; A < T.length; A++) {
@@ -3995,9 +4043,9 @@ const lA = [
   "WHEN [NOT] MATCHED [THEN]",
   "UPDATE SET",
   "INSERT"
-]), rT = r([
+]), oT = r([
   "CREATE [GLOBAL TEMPORARY | EXTERNAL] TABLE [IF NOT EXISTS]"
-]), lE = r([
+]), mE = r([
   // - create:
   "CREATE [OR REPLACE] VIEW",
   // - update:
@@ -4213,7 +4261,7 @@ const lA = [
   name: "db2",
   tokenizerOptions: {
     reservedSelect: HA,
-    reservedClauses: [...BA, ...rT, ...lE],
+    reservedClauses: [...BA, ...oT, ...mE],
     reservedSetOperations: mA,
     reservedJoins: FA,
     reservedPhrases: YA,
@@ -4250,8 +4298,8 @@ const lA = [
     ]
   },
   formatOptions: {
-    onelineClauses: [...rT, ...lE],
-    tabularOnelineClauses: lE
+    onelineClauses: [...oT, ...mE],
+    tabularOnelineClauses: mE
   }
 }, dA = [
   // https://www.ibm.com/docs/en/i/7.5?topic=functions-aggregate
@@ -5149,7 +5197,7 @@ const lA = [
   "INSERT",
   // Data definition - table
   "FOR SYSTEM NAME"
-]), nT = r(["CREATE [OR REPLACE] TABLE"]), cE = r([
+]), PT = r(["CREATE [OR REPLACE] TABLE"]), FE = r([
   // - create:
   "CREATE [OR REPLACE] [RECURSIVE] VIEW",
   // - update:
@@ -5259,7 +5307,7 @@ const lA = [
   name: "db2i",
   tokenizerOptions: {
     reservedSelect: VA,
-    reservedClauses: [...WA, ...nT, ...cE],
+    reservedClauses: [...WA, ...PT, ...FE],
     reservedSetOperations: XA,
     reservedJoins: bA,
     reservedPhrases: yA,
@@ -5279,8 +5327,8 @@ const lA = [
     operators: ["**", "¬=", "¬>", "¬<", "!>", "!<", "||", "=>"]
   },
   formatOptions: {
-    onelineClauses: [...nT, ...cE],
-    tabularOnelineClauses: cE
+    onelineClauses: [...PT, ...FE],
+    tabularOnelineClauses: FE
   }
 }, $A = [
   // Functions from DuckDB (excluding those that start with an underscore):
@@ -6131,9 +6179,9 @@ const lA = [
   "SET",
   // other:
   "RETURNING"
-]), iT = r([
+]), MT = r([
   "CREATE [OR REPLACE] [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"
-]), uE = r([
+]), YE = r([
   // TABLE
   // - update:
   "UPDATE",
@@ -6233,7 +6281,7 @@ const lA = [
   name: "duckdb",
   tokenizerOptions: {
     reservedSelect: wA,
-    reservedClauses: [...xA, ...iT, ...uE],
+    reservedClauses: [...xA, ...MT, ...YE],
     reservedSetOperations: vA,
     reservedJoins: QA,
     reservedPhrases: ZA,
@@ -6300,8 +6348,8 @@ const lA = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::"],
-    onelineClauses: [...iT, ...uE],
-    tabularOnelineClauses: uE
+    onelineClauses: [...MT, ...YE],
+    tabularOnelineClauses: YE
   }
 }, jA = [
   // https://cwiki.apache.org/confluence/display/Hive/LanguageManual+UDF
@@ -6881,9 +6929,9 @@ const lA = [
   //   https://cwiki.apache.org/confluence/display/Hive/LanguageManual+DML#LanguageManualDML-Loadingfilesintotables
   "LOAD DATA [LOCAL] INPATH",
   "[OVERWRITE] INTO TABLE"
-]), DT = r([
+]), UT = r([
   "CREATE [TEMPORARY] [EXTERNAL] TABLE [IF NOT EXISTS]"
-]), HE = r([
+]), pE = r([
   // - create:
   "CREATE [MATERIALIZED] VIEW [IF NOT EXISTS]",
   // - update:
@@ -6918,7 +6966,7 @@ const lA = [
   name: "hive",
   tokenizerOptions: {
     reservedSelect: ES,
-    reservedClauses: [...TS, ...DT, ...HE],
+    reservedClauses: [...TS, ...UT, ...pE],
     reservedSetOperations: RS,
     reservedJoins: AS,
     reservedPhrases: SS,
@@ -6932,16 +6980,16 @@ const lA = [
     operators: ["%", "~", "^", "|", "&", "<=>", "==", "!", "||"]
   },
   formatOptions: {
-    onelineClauses: [...DT, ...HE],
-    tabularOnelineClauses: HE
+    onelineClauses: [...UT, ...pE],
+    tabularOnelineClauses: pE
   }
 };
-function rE(T) {
+function nE(T) {
   return T.map((E, R) => {
-    const A = T[R + 1] || z;
+    const A = T[R + 1] || TE;
     if (Z.SET(E) && A.text === "(")
       return Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME });
-    const S = T[R - 1] || z;
+    const S = T[R - 1] || TE;
     return Z.VALUES(E) && S.text === "=" ? Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME }) : E;
   });
 }
@@ -7473,9 +7521,9 @@ const IS = [
   "SET",
   // other
   "RETURNING"
-]), aT = r([
+]), GT = r([
   "CREATE [OR REPLACE] [TEMPORARY] TABLE [IF NOT EXISTS]"
-]), BE = r([
+]), dE = r([
   // - create:
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // - update:
@@ -7704,7 +7752,7 @@ const IS = [
   name: "mariadb",
   tokenizerOptions: {
     reservedSelect: tS,
-    reservedClauses: [...sS, ...aT, ...BE],
+    reservedClauses: [...sS, ...GT, ...dE],
     reservedSetOperations: CS,
     reservedJoins: LS,
     reservedPhrases: _S,
@@ -7744,11 +7792,11 @@ const IS = [
       "*.*"
       // Not actually an operator
     ],
-    postProcess: rE
+    postProcess: nE
   },
   formatOptions: {
-    onelineClauses: [...aT, ...BE],
-    tabularOnelineClauses: BE
+    onelineClauses: [...GT, ...dE],
+    tabularOnelineClauses: dE
   }
 }, nS = [
   // https://dev.mysql.com/doc/refman/8.0/en/keywords.html
@@ -8456,7 +8504,7 @@ const IS = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], aS = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), PS = r([
+], aS = r(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), oS = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -8476,7 +8524,7 @@ const IS = [
   "ON DUPLICATE KEY UPDATE",
   // - update:
   "SET"
-]), PT = r(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), mE = r([
+]), lT = r(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), fE = r([
   // - create:
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // - update:
@@ -8657,7 +8705,7 @@ const IS = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), oS = r(["UNION [ALL | DISTINCT]"]), MS = r([
+]), PS = r(["UNION [ALL | DISTINCT]"]), MS = r([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -8674,8 +8722,8 @@ const IS = [
   name: "mysql",
   tokenizerOptions: {
     reservedSelect: aS,
-    reservedClauses: [...PS, ...PT, ...mE],
-    reservedSetOperations: oS,
+    reservedClauses: [...oS, ...lT, ...fE],
+    reservedSetOperations: PS,
     reservedJoins: MS,
     reservedPhrases: US,
     supportsXor: !0,
@@ -8716,11 +8764,11 @@ const IS = [
       "*.*"
       // Not actually an operator
     ],
-    postProcess: rE
+    postProcess: nE
   },
   formatOptions: {
-    onelineClauses: [...PT, ...mE],
-    tabularOnelineClauses: mE
+    onelineClauses: [...lT, ...fE],
+    tabularOnelineClauses: fE
   }
 }, lS = [
   // https://docs.pingcap.com/tidb/stable/keywords
@@ -9307,7 +9355,7 @@ const IS = [
   "ON DUPLICATE KEY UPDATE",
   // - update:
   "SET"
-]), oT = r(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), FE = r([
+]), cT = r(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), hE = r([
   // https://docs.pingcap.com/tidb/stable/sql-statement-create-view
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // https://docs.pingcap.com/tidb/stable/sql-statement-update
@@ -9439,7 +9487,7 @@ const IS = [
   name: "tidb",
   tokenizerOptions: {
     reservedSelect: HS,
-    reservedClauses: [...BS, ...oT, ...FE],
+    reservedClauses: [...BS, ...cT, ...hE],
     reservedSetOperations: mS,
     reservedJoins: FS,
     reservedPhrases: YS,
@@ -9481,11 +9529,11 @@ const IS = [
       "*.*"
       // Not actually an operator
     ],
-    postProcess: rE
+    postProcess: nE
   },
   formatOptions: {
-    onelineClauses: [...oT, ...FE],
-    tabularOnelineClauses: FE
+    onelineClauses: [...cT, ...hE],
+    tabularOnelineClauses: hE
   }
 }, dS = [
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/functions.html
@@ -9959,7 +10007,7 @@ const IS = [
   "NEST",
   "UNNEST",
   "RETURNING"
-]), MT = r([
+]), uT = r([
   // - update:
   "UPDATE",
   // - delete:
@@ -10003,7 +10051,7 @@ const IS = [
   name: "n1ql",
   tokenizerOptions: {
     reservedSelect: VS,
-    reservedClauses: [...WS, ...MT],
+    reservedClauses: [...WS, ...uT],
     reservedSetOperations: XS,
     reservedJoins: bS,
     reservedPhrases: yS,
@@ -10022,7 +10070,7 @@ const IS = [
     operators: ["%", "==", ":", "||"]
   },
   formatOptions: {
-    onelineClauses: MT
+    onelineClauses: uT
   }
 }, $S = [
   // https://docs.oracle.com/cd/B19306_01/appdev.102/b14261/reservewords.htm
@@ -10656,9 +10704,9 @@ const IS = [
   "UPDATE SET",
   // other
   "RETURNING"
-]), UT = r([
+]), HT = r([
   "CREATE [GLOBAL TEMPORARY | PRIVATE TEMPORARY | SHARDED | DUPLICATED | IMMUTABLE BLOCKCHAIN | BLOCKCHAIN | IMMUTABLE] TABLE"
-]), YE = r([
+]), VE = r([
   // - create:
   "CREATE [OR REPLACE] [NO FORCE | FORCE] [EDITIONING | EDITIONABLE | EDITIONABLE EDITIONING | NONEDITIONABLE] VIEW",
   "CREATE MATERIALIZED VIEW",
@@ -10702,7 +10750,7 @@ const IS = [
   name: "plsql",
   tokenizerOptions: {
     reservedSelect: wS,
-    reservedClauses: [...xS, ...UT, ...YE],
+    reservedClauses: [...xS, ...HT, ...VE],
     reservedSetOperations: vS,
     reservedJoins: QS,
     reservedPhrases: ZS,
@@ -10738,13 +10786,13 @@ const IS = [
   },
   formatOptions: {
     alwaysDenseOperators: ["@"],
-    onelineClauses: [...UT, ...YE],
-    tabularOnelineClauses: YE
+    onelineClauses: [...HT, ...VE],
+    tabularOnelineClauses: VE
   }
 };
 function jS(T) {
-  let E = z;
-  return T.map((R) => Z.SET(R) && Z.BY(E) ? Object.assign(Object.assign({}, R), { type: D.RESERVED_KEYWORD }) : (rR(R.type) && (E = R), R));
+  let E = TE;
+  return T.map((R) => Z.SET(R) && Z.BY(E) ? Object.assign(Object.assign({}, R), { type: D.RESERVED_KEYWORD }) : (oR(R.type) && (E = R), R));
 }
 const kS = [
   // https://www.postgresql.org/docs/14/functions.html
@@ -11606,9 +11654,9 @@ const kS = [
   "SET",
   // other
   "RETURNING"
-]), GT = r([
+]), BT = r([
   "CREATE [GLOBAL | LOCAL] [TEMPORARY | TEMP | UNLOGGED] TABLE [IF NOT EXISTS]"
-]), pE = r([
+]), WE = r([
   // - create
   "CREATE [OR REPLACE] [TEMP | TEMPORARY] [RECURSIVE] VIEW",
   "CREATE [MATERIALIZED] VIEW [IF NOT EXISTS]",
@@ -11833,7 +11881,7 @@ const kS = [
   name: "postgresql",
   tokenizerOptions: {
     reservedSelect: Te,
-    reservedClauses: [...Re, ...GT, ...pE],
+    reservedClauses: [...Re, ...BT, ...WE],
     reservedSetOperations: Ae,
     reservedJoins: Se,
     reservedPhrases: ee,
@@ -11950,8 +11998,8 @@ const kS = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::", ":"],
-    onelineClauses: [...GT, ...pE],
-    tabularOnelineClauses: pE
+    onelineClauses: [...BT, ...WE],
+    tabularOnelineClauses: WE
   }
 }, Oe = [
   // https://docs.aws.amazon.com/redshift/latest/dg/c_Aggregate_Functions.html
@@ -12527,9 +12575,9 @@ const kS = [
   "VALUES",
   // - update:
   "SET"
-]), lT = r([
+]), mT = r([
   "CREATE [TEMPORARY | TEMP | LOCAL TEMPORARY | LOCAL TEMP] TABLE [IF NOT EXISTS]"
-]), dE = r([
+]), XE = r([
   // - create:
   "CREATE [OR REPLACE | MATERIALIZED] VIEW",
   // - update:
@@ -12638,7 +12686,7 @@ const kS = [
   name: "redshift",
   tokenizerOptions: {
     reservedSelect: se,
-    reservedClauses: [...Ce, ...lT, ...dE],
+    reservedClauses: [...Ce, ...mT, ...XE],
     reservedSetOperations: Le,
     reservedJoins: _e,
     reservedPhrases: re,
@@ -12667,8 +12715,8 @@ const kS = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::"],
-    onelineClauses: [...lT, ...dE],
-    tabularOnelineClauses: dE
+    onelineClauses: [...mT, ...XE],
+    tabularOnelineClauses: XE
   }
 }, ie = [
   // https://deepkb.com/CO_000013/en/kb/IMPORT-fbfa59f0-2bf1-31fe-bb7b-0f9efe9932c6/spark-sql-keywords
@@ -13288,7 +13336,7 @@ const kS = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], Pe = r(["SELECT [ALL | DISTINCT]"]), oe = r([
+], oe = r(["SELECT [ALL | DISTINCT]"]), Pe = r([
   // queries
   "WITH",
   "FROM",
@@ -13313,7 +13361,7 @@ const kS = [
   //   https://spark.apache.org/docs/latest/sql-ref-syntax-dml-load.html
   "LOAD DATA [LOCAL] INPATH",
   "[OVERWRITE] INTO TABLE"
-]), cT = r(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), fE = r([
+]), FT = r(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), bE = r([
   // - create:
   "CREATE [OR REPLACE] [GLOBAL TEMPORARY | TEMPORARY] VIEW [IF NOT EXISTS]",
   // - drop table:
@@ -13390,8 +13438,8 @@ const kS = [
 ]), le = {
   name: "spark",
   tokenizerOptions: {
-    reservedSelect: Pe,
-    reservedClauses: [...oe, ...cT, ...fE],
+    reservedSelect: oe,
+    reservedClauses: [...Pe, ...FT, ...bE],
     reservedSetOperations: Me,
     reservedJoins: Ue,
     reservedPhrases: Ge,
@@ -13413,13 +13461,13 @@ const kS = [
     postProcess: ce
   },
   formatOptions: {
-    onelineClauses: [...cT, ...fE],
-    tabularOnelineClauses: fE
+    onelineClauses: [...FT, ...bE],
+    tabularOnelineClauses: bE
   }
 };
 function ce(T) {
   return T.map((E, R) => {
-    const A = T[R - 1] || z, S = T[R + 1] || z;
+    const A = T[R - 1] || TE, S = T[R + 1] || TE;
     return Z.WINDOW(E) && S.type === D.OPEN_PAREN ? Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME }) : E.text === "ITEMS" && E.type === D.RESERVED_KEYWORD && !(A.text === "COLLECTION" && S.text === "TERMINATED") ? Object.assign(Object.assign({}, E), { type: D.IDENTIFIER, text: E.raw }) : E;
   });
 }
@@ -13740,7 +13788,7 @@ const ue = [
   "VALUES",
   // - update:
   "SET"
-]), uT = r(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), hE = r([
+]), YT = r(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), yE = r([
   // - create:
   "CREATE [TEMPORARY | TEMP] VIEW [IF NOT EXISTS]",
   // - update:
@@ -13773,7 +13821,7 @@ const ue = [
   name: "sqlite",
   tokenizerOptions: {
     reservedSelect: me,
-    reservedClauses: [...Fe, ...uT, ...hE],
+    reservedClauses: [...Fe, ...YT, ...yE],
     reservedSetOperations: Ye,
     reservedJoins: pe,
     reservedPhrases: de,
@@ -13792,8 +13840,8 @@ const ue = [
     operators: ["%", "~", "&", "|", "<<", ">>", "==", "->", "->>", "||"]
   },
   formatOptions: {
-    onelineClauses: [...uT, ...hE],
-    tabularOnelineClauses: hE
+    onelineClauses: [...YT, ...yE],
+    tabularOnelineClauses: yE
   }
 }, he = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#_6_9_set_function_specification
@@ -14149,7 +14197,7 @@ const ue = [
   "VALUES",
   // - update:
   "SET"
-]), HT = r(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), VE = r([
+]), pT = r(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), KE = r([
   // - create:
   "CREATE [RECURSIVE] VIEW",
   // - update:
@@ -14191,7 +14239,7 @@ const ue = [
   name: "sql",
   tokenizerOptions: {
     reservedSelect: Xe,
-    reservedClauses: [...be, ...HT, ...VE],
+    reservedClauses: [...be, ...pT, ...KE],
     reservedSetOperations: ye,
     reservedJoins: Ke,
     reservedPhrases: $e,
@@ -14207,8 +14255,8 @@ const ue = [
     operators: ["||"]
   },
   formatOptions: {
-    onelineClauses: [...HT, ...VE],
-    tabularOnelineClauses: VE
+    onelineClauses: [...pT, ...KE],
+    tabularOnelineClauses: KE
   }
 }, Je = [
   // https://github.com/trinodb/trino/tree/432d2897bdef99388c1a47188743a061c4ac1f34/docs/src/main/sphinx/functions
@@ -14948,7 +14996,7 @@ const ue = [
   "PATTERN",
   "SUBSET",
   "DEFINE"
-]), BT = r(["CREATE TABLE [IF NOT EXISTS]"]), WE = r([
+]), dT = r(["CREATE TABLE [IF NOT EXISTS]"]), $E = r([
   // - create:
   "CREATE [OR REPLACE] [MATERIALIZED] VIEW",
   // - update:
@@ -15024,7 +15072,7 @@ const ue = [
   name: "trino",
   tokenizerOptions: {
     reservedSelect: ve,
-    reservedClauses: [...Qe, ...BT, ...WE],
+    reservedClauses: [...Qe, ...dT, ...$E],
     reservedSetOperations: Ze,
     reservedJoins: qe,
     reservedPhrases: je,
@@ -15059,8 +15107,8 @@ const ue = [
     ]
   },
   formatOptions: {
-    onelineClauses: [...BT, ...WE],
-    tabularOnelineClauses: WE
+    onelineClauses: [...dT, ...$E],
+    tabularOnelineClauses: $E
   }
 }, ze = [
   // https://docs.microsoft.com/en-us/sql/t-sql/functions/functions?view=sql-server-ver15
@@ -15602,7 +15650,7 @@ const ue = [
   "UPDATE SET",
   // Data definition
   "CREATE [OR ALTER] {PROC | PROCEDURE}"
-]), mT = r(["CREATE TABLE"]), XE = r([
+]), fT = r(["CREATE TABLE"]), gE = r([
   // - create:
   "CREATE [OR ALTER] [MATERIALIZED] VIEW",
   // - update:
@@ -15795,7 +15843,7 @@ const ue = [
   name: "transactsql",
   tokenizerOptions: {
     reservedSelect: RI,
-    reservedClauses: [...AI, ...mT, ...XE],
+    reservedClauses: [...AI, ...fT, ...gE],
     reservedSetOperations: SI,
     reservedJoins: eI,
     reservedPhrases: II,
@@ -15831,8 +15879,8 @@ const ue = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::"],
-    onelineClauses: [...mT, ...XE],
-    tabularOnelineClauses: XE
+    onelineClauses: [...fT, ...gE],
+    tabularOnelineClauses: gE
   }
 }, NI = [
   // List of all keywords taken from:
@@ -16398,9 +16446,9 @@ const ue = [
   // Data definition
   "CREATE [OR REPLACE] [TEMPORARY] PROCEDURE [IF NOT EXISTS]",
   "CREATE [OR REPLACE] [EXTERNAL] FUNCTION"
-]), FT = r([
+]), hT = r([
   "CREATE [ROWSTORE] [REFERENCE | TEMPORARY | GLOBAL TEMPORARY] TABLE [IF NOT EXISTS]"
-]), bE = r([
+]), JE = r([
   // - create:
   "CREATE VIEW",
   // - update:
@@ -16599,7 +16647,7 @@ const ue = [
   name: "singlestoredb",
   tokenizerOptions: {
     reservedSelect: CI,
-    reservedClauses: [...LI, ...FT, ...bE],
+    reservedClauses: [...LI, ...hT, ...JE],
     reservedSetOperations: _I,
     reservedJoins: rI,
     reservedPhrases: nI,
@@ -16638,12 +16686,12 @@ const ue = [
       "*.*"
       // Not actually an operator
     ],
-    postProcess: rE
+    postProcess: nE
   },
   formatOptions: {
     alwaysDenseOperators: ["::", "::$", "::%"],
-    onelineClauses: [...FT, ...bE],
-    tabularOnelineClauses: bE
+    onelineClauses: [...hT, ...JE],
+    tabularOnelineClauses: JE
   }
 }, DI = [
   // https://docs.snowflake.com/en/sql-reference-functions.html
@@ -17349,7 +17397,7 @@ const ue = [
   "WITH",
   // These are definitely keywords, but haven't found a definite list in the docs
   "COMMENT"
-], PI = [
+], oI = [
   "NUMBER",
   "DECIMAL",
   "NUMERIC",
@@ -17386,7 +17434,7 @@ const ue = [
   "ARRAY",
   "GEOGRAPHY",
   "GEOMETRY"
-], oI = r(["SELECT [ALL | DISTINCT]"]), MI = r([
+], PI = r(["SELECT [ALL | DISTINCT]"]), MI = r([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -17414,10 +17462,10 @@ const ue = [
   "WHEN MATCHED [AND]",
   "THEN {UPDATE SET | DELETE}",
   "WHEN NOT MATCHED THEN INSERT"
-]), YT = r([
+]), VT = r([
   "CREATE [OR REPLACE] [VOLATILE] TABLE [IF NOT EXISTS]",
   "CREATE [OR REPLACE] [LOCAL | GLOBAL] {TEMP|TEMPORARY} TABLE [IF NOT EXISTS]"
-]), yE = r([
+]), wE = r([
   // - create:
   "CREATE [OR REPLACE] [SECURE] [RECURSIVE] VIEW [IF NOT EXISTS]",
   // - update:
@@ -17668,13 +17716,13 @@ const ue = [
 ]), cI = {
   name: "snowflake",
   tokenizerOptions: {
-    reservedSelect: oI,
-    reservedClauses: [...MI, ...YT, ...yE],
+    reservedSelect: PI,
+    reservedClauses: [...MI, ...VT, ...wE],
     reservedSetOperations: UI,
     reservedJoins: GI,
     reservedPhrases: lI,
     reservedKeywords: aI,
-    reservedDataTypes: PI,
+    reservedDataTypes: oI,
     reservedFunctionNames: DI,
     stringTypes: ["$$", "''-qq-bs"],
     identTypes: ['""-qq'],
@@ -17705,12 +17753,12 @@ const ue = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::"],
-    onelineClauses: [...YT, ...yE],
-    tabularOnelineClauses: yE
+    onelineClauses: [...VT, ...wE],
+    tabularOnelineClauses: wE
   }
 }, uI = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  bigquery: PA,
+  bigquery: oA,
   db2: pA,
   db2i: KA,
   duckdb: qA,
@@ -17729,17 +17777,17 @@ const ue = [
   tidb: pS,
   transactsql: OI,
   trino: ke
-}, Symbol.toStringTag, { value: "Module" })), eE = (T) => T[T.length - 1], nR = (T) => T.sort((E, R) => R.length - E.length || E.localeCompare(R)), tE = (T) => T.replace(/\s+/gu, " "), KE = (T) => /\n/.test(T), y = (T) => T.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), pT = /\s+/uy, q = (T) => new RegExp(`(?:${T})`, "uy"), HI = (T) => T.split("").map((E) => / /gu.test(E) ? "\\s+" : `[${E.toUpperCase()}${E.toLowerCase()}]`).join(""), BI = (T) => T + "(?:-" + T + ")*", mI = ({ prefixes: T, requirePrefix: E }) => `(?:${T.map(HI).join("|")}${E ? "" : "|"})`, FI = (T) => new RegExp(`(?:${T.map(y).join("|")}).*?(?=\r
+}, Symbol.toStringTag, { value: "Module" })), eE = (T) => T[T.length - 1], PR = (T) => T.sort((E, R) => R.length - E.length || E.localeCompare(R)), tE = (T) => T.replace(/\s+/gu, " "), xE = (T) => /\n/.test(T), y = (T) => T.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), WT = /\s+/uy, q = (T) => new RegExp(`(?:${T})`, "uy"), HI = (T) => T.split("").map((E) => / /gu.test(E) ? "\\s+" : `[${E.toUpperCase()}${E.toLowerCase()}]`).join(""), BI = (T) => T + "(?:-" + T + ")*", mI = ({ prefixes: T, requirePrefix: E }) => `(?:${T.map(HI).join("|")}${E ? "" : "|"})`, FI = (T) => new RegExp(`(?:${T.map(y).join("|")}).*?(?=\r
 |\r|
-|$)`, "uy"), dT = (T, E = []) => {
+|$)`, "uy"), XT = (T, E = []) => {
   const R = T === "open" ? 0 : 1, A = ["()", ...E].map((S) => S[R]);
   return q(A.map(y).join("|"));
-}, fT = (T) => q(`${nR(T).map(y).join("|")}`), YI = ({ rest: T, dashes: E }) => T || E ? `(?![${T || ""}${E ? "-" : ""}])` : "", J = (T, E = {}) => {
+}, bT = (T) => q(`${PR(T).map(y).join("|")}`), YI = ({ rest: T, dashes: E }) => T || E ? `(?![${T || ""}${E ? "-" : ""}])` : "", J = (T, E = {}) => {
   if (T.length === 0)
     return /^\b$/u;
-  const R = YI(E), A = nR(T).map(y).join("|").replace(/ /gu, "\\s+");
+  const R = YI(E), A = PR(T).map(y).join("|").replace(/ /gu, "\\s+");
   return new RegExp(`(?:${A})${R}\\b`, "iuy");
-}, $E = (T, E) => {
+}, vE = (T, E) => {
   if (!T.length)
     return;
   const R = T.map(y).join("|");
@@ -17752,7 +17800,7 @@ const ue = [
     "{": "}"
   }, E = "{left}(?:(?!{right}').)*?{right}", R = Object.entries(T).map(([N, s]) => E.replace(/{left}/g, y(N)).replace(/{right}/g, y(s))), A = y(Object.keys(T).join(""));
   return `[Qq]'(?:${String.raw`(?<tag>[^\s${A}])(?:(?!\k<tag>').)*?\k<tag>`}|${R.join("|")})'`;
-}, hT = {
+}, yT = {
   // - backtick quoted (using `` to escape)
   "``": "(?:`[^`]*`)+",
   // - Transact-SQL square bracket quoted (using ]] to escape)
@@ -17777,11 +17825,11 @@ const ue = [
   "{}": String.raw`(?:\{[^\}]*\})`,
   // Oracle q'' strings: q'<text>' q'|text|' ...
   "q''": pI()
-}, iR = (T) => typeof T == "string" ? hT[T] : "regex" in T ? T.regex : mI(T) + hT[T.quote], dI = (T) => q(T.map((E) => "regex" in E ? E.regex : iR(E)).join("|")), DR = (T) => T.map(iR).join("|"), VT = (T) => q(DR(T)), fI = (T = {}) => q(aR(T)), aR = ({ first: T, rest: E, dashes: R, allowFirstCharNumber: A } = {}) => {
+}, MR = (T) => typeof T == "string" ? yT[T] : "regex" in T ? T.regex : mI(T) + yT[T.quote], dI = (T) => q(T.map((E) => "regex" in E ? E.regex : MR(E)).join("|")), UR = (T) => T.map(MR).join("|"), KT = (T) => q(UR(T)), fI = (T = {}) => q(GR(T)), GR = ({ first: T, rest: E, dashes: R, allowFirstCharNumber: A } = {}) => {
   const S = "\\p{Alphabetic}\\p{Mark}_", e = "\\p{Decimal_Number}", N = y(T ?? ""), s = y(E ?? ""), _ = A ? `[${S}${e}${N}][${S}${e}${s}]*` : `[${S}${N}][${S}${e}${s}]*`;
   return R ? BI(_) : _;
 };
-function PR(T, E) {
+function lR(T, E) {
   const R = T.slice(0, E).split(/\n/);
   return { line: R.length, col: R[R.length - 1].length + 1 };
 }
@@ -17811,7 +17859,7 @@ class hI {
     return R;
   }
   createParseError() {
-    const E = this.input.slice(this.index, this.index + 10), { line: R, col: A } = PR(this.input, this.index);
+    const E = this.input.slice(this.index, this.index + 10), { line: R, col: A } = lR(this.input, this.index);
     return new Error(`Parse error: Unexpected "${E}" at line ${R} column ${A}.
 ${this.dialectInfo()}`);
   }
@@ -17820,8 +17868,8 @@ ${this.dialectInfo()}`);
 If possible, please select a more specific dialect (like sqlite, postgresql, etc).` : `SQL dialect used: "${this.dialectName}".`;
   }
   getWhitespace() {
-    pT.lastIndex = this.index;
-    const E = pT.exec(this.input);
+    WT.lastIndex = this.index;
+    const E = WT.exec(this.input);
     if (E)
       return this.index += E[0].length, E[0];
   }
@@ -17847,19 +17895,19 @@ If possible, please select a more specific dialect (like sqlite, postgresql, etc
     }
   }
 }
-const WT = /\/\*/uy, VI = /[\s\S]/uy, WI = /\*\//uy;
+const $T = /\/\*/uy, VI = /[\s\S]/uy, WI = /\*\//uy;
 class XI {
   constructor() {
     this.lastIndex = 0;
   }
   exec(E) {
     let R = "", A, S = 0;
-    if (A = this.matchSection(WT, E))
+    if (A = this.matchSection($T, E))
       R += A, S++;
     else
       return null;
     for (; S > 0; )
-      if (A = this.matchSection(WT, E))
+      if (A = this.matchSection($T, E))
         R += A, S++;
       else if (A = this.matchSection(WI, E))
         R += A, S--;
@@ -17906,7 +17954,7 @@ class bI {
       },
       {
         type: D.QUOTED_IDENTIFIER,
-        regex: VT(E.identTypes)
+        regex: KT(E.identTypes)
       },
       {
         type: D.NUMBER,
@@ -18021,7 +18069,7 @@ class bI {
         type: D.VARIABLE,
         regex: E.variableTypes ? dI(E.variableTypes) : void 0
       },
-      { type: D.STRING, regex: VT(E.stringTypes) },
+      { type: D.STRING, regex: KT(E.stringTypes) },
       {
         type: D.IDENTIFIER,
         regex: fI(E.identChars)
@@ -18030,15 +18078,15 @@ class bI {
       { type: D.COMMA, regex: /[,]/y },
       {
         type: D.OPEN_PAREN,
-        regex: dT("open", E.extraParens)
+        regex: XT("open", E.extraParens)
       },
       {
         type: D.CLOSE_PAREN,
-        regex: dT("close", E.extraParens)
+        regex: XT("close", E.extraParens)
       },
       {
         type: D.OPERATOR,
-        regex: fT([
+        regex: bT([
           // standard operators
           "+",
           "-",
@@ -18056,7 +18104,7 @@ class bI {
       { type: D.ASTERISK, regex: /[*]/uy },
       {
         type: D.PROPERTY_ACCESS_OPERATOR,
-        regex: fT([".", ...(A = E.propertyAccessOperators) !== null && A !== void 0 ? A : []])
+        regex: bT([".", ...(A = E.propertyAccessOperators) !== null && A !== void 0 ? A : []])
       }
     ]);
   }
@@ -18074,12 +18122,12 @@ class bI {
     return this.validRules([
       {
         type: D.NAMED_PARAMETER,
-        regex: $E(_.named, aR(E.paramChars || E.identChars)),
+        regex: vE(_.named, GR(E.paramChars || E.identChars)),
         key: (I) => I.slice(1)
       },
       {
         type: D.QUOTED_PARAMETER,
-        regex: $E(_.quoted, DR(E.identTypes)),
+        regex: vE(_.quoted, UR(E.identTypes)),
         key: (I) => (({ tokenKey: O, quoteChar: C }) => O.replace(new RegExp(y("\\" + C), "gu"), C))({
           tokenKey: I.slice(2, -1),
           quoteChar: I.slice(-1)
@@ -18087,7 +18135,7 @@ class bI {
       },
       {
         type: D.NUMBERED_PARAMETER,
-        regex: $E(_.numbered, "[0-9]+"),
+        regex: vE(_.numbered, "[0-9]+"),
         key: (I) => I.slice(1)
       },
       {
@@ -18109,9 +18157,9 @@ class bI {
     return E.filter((R) => !!R.regex);
   }
 }
-const p = (T) => tE(T.toUpperCase()), XT = /* @__PURE__ */ new Map(), yI = (T) => {
-  let E = XT.get(T);
-  return E || (E = KI(T), XT.set(T, E)), E;
+const p = (T) => tE(T.toUpperCase()), gT = /* @__PURE__ */ new Map(), yI = (T) => {
+  let E = gT.get(T);
+  return E || (E = KI(T), gT.set(T, E)), E;
 }, KI = (T) => ({
   tokenizer: new bI(T.tokenizerOptions, T.name),
   formatOptions: $I(T.formatOptions)
@@ -18126,7 +18174,7 @@ const p = (T) => tE(T.toUpperCase()), XT = /* @__PURE__ */ new Map(), yI = (T) =
 function gI(T) {
   return T.indentStyle === "tabularLeft" || T.indentStyle === "tabularRight" ? " ".repeat(10) : T.useTabs ? "	" : " ".repeat(T.tabWidth);
 }
-function k(T) {
+function EE(T) {
   return T.indentStyle === "tabularLeft" || T.indentStyle === "tabularRight";
 }
 class JI {
@@ -18156,7 +18204,7 @@ var wI = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : t
 function xI(T) {
   return T && T.__esModule && Object.prototype.hasOwnProperty.call(T, "default") ? T.default : T;
 }
-var oR = { exports: {} };
+var cR = { exports: {} };
 (function(T) {
   (function(E, R) {
     T.exports ? T.exports = R() : E.nearley = R();
@@ -18190,38 +18238,38 @@ var oR = { exports: {} };
     }
     A.prototype.process = function(I) {
       for (var O = this.states, C = this.wants, t = this.completed, i = 0; i < O.length; i++) {
-        var o = O[i];
-        if (o.isComplete) {
-          if (o.finish(), o.data !== N.fail) {
-            for (var M = o.wantedBy, P = M.length; P--; ) {
-              var G = M[P];
-              this.complete(G, o);
+        var P = O[i];
+        if (P.isComplete) {
+          if (P.finish(), P.data !== N.fail) {
+            for (var M = P.wantedBy, o = M.length; o--; ) {
+              var G = M[o];
+              this.complete(G, P);
             }
-            if (o.reference === this.index) {
-              var a = o.rule.name;
-              (this.completed[a] = this.completed[a] || []).push(o);
+            if (P.reference === this.index) {
+              var a = P.rule.name;
+              (this.completed[a] = this.completed[a] || []).push(P);
             }
           }
         } else {
-          var a = o.rule.symbols[o.dot];
+          var a = P.rule.symbols[P.dot];
           if (typeof a != "string") {
-            this.scannable.push(o);
+            this.scannable.push(P);
             continue;
           }
           if (C[a]) {
-            if (C[a].push(o), t.hasOwnProperty(a))
-              for (var H = t[a], P = 0; P < H.length; P++) {
-                var u = H[P];
-                this.complete(o, u);
+            if (C[a].push(P), t.hasOwnProperty(a))
+              for (var H = t[a], o = 0; o < H.length; o++) {
+                var u = H[o];
+                this.complete(P, u);
               }
           } else
-            C[a] = [o], this.predict(a);
+            C[a] = [P], this.predict(a);
         }
       }
     }, A.prototype.predict = function(I) {
       for (var O = this.grammar.byName[I] || [], C = 0; C < O.length; C++) {
-        var t = O[C], i = this.wants[I], o = new R(t, 0, this.index, i);
-        this.states.push(o);
+        var t = O[C], i = this.wants[I], P = new R(t, 0, this.index, i);
+        this.states.push(P);
       }
     }, A.prototype.complete = function(I, O) {
       var C = I.nextState(O);
@@ -18237,8 +18285,8 @@ var oR = { exports: {} };
     S.fromCompiled = function(t, O) {
       var C = t.Lexer;
       t.ParserStart && (O = t.ParserStart, t = t.ParserRules);
-      var t = t.map(function(o) {
-        return new E(o.name, o.symbols, o.postprocess);
+      var t = t.map(function(P) {
+        return new E(P.name, P.symbols, P.postprocess);
       }), i = new S(t, O);
       return i.lexer = C, i;
     };
@@ -18268,18 +18316,18 @@ var oR = { exports: {} };
         ), i = C.indexOf(`
 `, this.index);
         i === -1 && (i = C.length);
-        var o = this.index - this.lastLineBreak, M = String(this.line).length;
-        return O += " at line " + this.line + " col " + o + `:
+        var P = this.index - this.lastLineBreak, M = String(this.line).length;
+        return O += " at line " + this.line + " col " + P + `:
 
 `, O += t.map(function(G, a) {
-          return P(this.line - t.length + a + 1, M) + " " + G;
+          return o(this.line - t.length + a + 1, M) + " " + G;
         }, this).join(`
 `), O += `
-` + P("", M + o) + `^
+` + o("", M + P) + `^
 `, O;
       } else
         return O + " at index " + (this.index - 1);
-      function P(G, a) {
+      function o(G, a) {
         var H = String(G);
         return Array(a - H.length + 1).join(" ") + H;
       }
@@ -18296,8 +18344,8 @@ var oR = { exports: {} };
       for (var i in C || {})
         this.options[i] = C[i];
       this.lexer = this.options.lexer, this.lexerState = void 0;
-      var o = new A(t, 0);
-      this.table = [o], o.wants[t.start] = [], o.predict(t.start), o.process(), this.current = 0;
+      var P = new A(t, 0);
+      this.table = [P], P.wants[t.start] = [], P.predict(t.start), P.process(), this.current = 0;
     }
     N.fail = {}, N.prototype.feed = function(I) {
       var O = this.lexer;
@@ -18314,12 +18362,12 @@ var oR = { exports: {} };
         }
         var i = this.table[this.current];
         this.options.keepHistory || delete this.table[this.current - 1];
-        var o = this.current + 1, M = new A(this.grammar, o);
+        var P = this.current + 1, M = new A(this.grammar, P);
         this.table.push(M);
-        for (var P = C.text !== void 0 ? C.text : C.value, G = O.constructor === e ? C.value : C, a = i.scannable, H = a.length; H--; ) {
+        for (var o = C.text !== void 0 ? C.text : C.value, G = O.constructor === e ? C.value : C, a = i.scannable, H = a.length; H--; ) {
           var u = a[H], B = u.rule.symbols[u.dot];
-          if (B.test ? B.test(G) : B.type ? B.type === C.type : B.literal === P) {
-            var Y = u.nextState({ data: G, token: C, isToken: !0, reference: o - 1 });
+          if (B.test ? B.test(G) : B.type ? B.type === C.type : B.literal === o) {
+            var Y = u.nextState({ data: G, token: C, isToken: !0, reference: P - 1 });
             M.states.push(Y);
           }
         }
@@ -18339,29 +18387,29 @@ var oR = { exports: {} };
     }, N.prototype.reportErrorCommon = function(I, O) {
       var C = [];
       C.push(I);
-      var t = this.table.length - 2, i = this.table[t], o = i.states.filter(function(P) {
-        var G = P.rule.symbols[P.dot];
+      var t = this.table.length - 2, i = this.table[t], P = i.states.filter(function(o) {
+        var G = o.rule.symbols[o.dot];
         return G && typeof G != "string";
       });
-      if (o.length === 0)
+      if (P.length === 0)
         C.push("Unexpected " + O + `. I did not expect any more input. Here is the state of my parse table:
 `), this.displayStateStack(i.states, C);
       else {
         C.push("Unexpected " + O + `. Instead, I was expecting to see one of the following:
 `);
-        var M = o.map(function(P) {
-          return this.buildFirstStateStack(P, []) || [P];
+        var M = P.map(function(o) {
+          return this.buildFirstStateStack(o, []) || [o];
         }, this);
-        M.forEach(function(P) {
-          var G = P[0], a = G.rule.symbols[G.dot], H = this.getSymbolDisplay(a);
-          C.push("A " + H + " based on:"), this.displayStateStack(P, C);
+        M.forEach(function(o) {
+          var G = o[0], a = G.rule.symbols[G.dot], H = this.getSymbolDisplay(a);
+          C.push("A " + H + " based on:"), this.displayStateStack(o, C);
         }, this);
       }
       return C.push(""), C.join(`
 `);
     }, N.prototype.displayStateStack = function(I, O) {
       for (var C, t = 0, i = 0; i < I.length; i++) {
-        var o = I[i], M = o.rule.toString(o.dot);
+        var P = I[i], M = P.rule.toString(P.dot);
         M === C ? t++ : (t > 0 && O.push("    ^ " + t + " more lines identical to this"), t = 0, O.push("    " + M)), C = M;
       }
     }, N.prototype.getSymbolDisplay = function(I) {
@@ -18429,57 +18477,57 @@ var oR = { exports: {} };
       Rule: E
     };
   });
-})(oR);
-var vI = oR.exports;
+})(cR);
+var vI = cR.exports;
 const QI = /* @__PURE__ */ xI(vI);
 function ZI(T) {
   return T.map(qI).map(jI).map(kI).map(zI).map(EO);
 }
 const qI = (T, E, R) => {
-  if (rR(T.type)) {
+  if (oR(T.type)) {
     const A = TO(R, E);
     if (A && A.type === D.PROPERTY_ACCESS_OPERATOR)
       return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
-    const S = TE(R, E);
+    const S = AE(R, E);
     if (S && S.type === D.PROPERTY_ACCESS_OPERATOR)
       return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
   }
   return T;
 }, jI = (T, E, R) => {
   if (T.type === D.RESERVED_FUNCTION_NAME) {
-    const A = TE(R, E);
-    if (!A || !MR(A))
+    const A = AE(R, E);
+    if (!A || !uR(A))
       return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
   }
   return T;
 }, kI = (T, E, R) => {
   if (T.type === D.RESERVED_DATA_TYPE) {
-    const A = TE(R, E);
-    if (A && MR(A))
+    const A = AE(R, E);
+    if (A && uR(A))
       return Object.assign(Object.assign({}, T), { type: D.RESERVED_PARAMETERIZED_DATA_TYPE });
   }
   return T;
 }, zI = (T, E, R) => {
   if (T.type === D.IDENTIFIER) {
-    const A = TE(R, E);
-    if (A && UR(A))
+    const A = AE(R, E);
+    if (A && HR(A))
       return Object.assign(Object.assign({}, T), { type: D.ARRAY_IDENTIFIER });
   }
   return T;
 }, EO = (T, E, R) => {
   if (T.type === D.RESERVED_DATA_TYPE) {
-    const A = TE(R, E);
-    if (A && UR(A))
+    const A = AE(R, E);
+    if (A && HR(A))
       return Object.assign(Object.assign({}, T), { type: D.ARRAY_KEYWORD });
   }
   return T;
-}, TO = (T, E) => TE(T, E, -1), TE = (T, E, R = 1) => {
+}, TO = (T, E) => AE(T, E, -1), AE = (T, E, R = 1) => {
   let A = 1;
   for (; T[E + A * R] && RO(T[E + A * R]); )
     A++;
   return T[E + A * R];
-}, MR = (T) => T.type === D.OPEN_PAREN && T.text === "(", UR = (T) => T.type === D.OPEN_PAREN && T.text === "[", RO = (T) => T.type === D.BLOCK_COMMENT || T.type === D.LINE_COMMENT;
-class GR {
+}, uR = (T) => T.type === D.OPEN_PAREN && T.text === "(", HR = (T) => T.type === D.OPEN_PAREN && T.text === "[", RO = (T) => T.type === D.BLOCK_COMMENT || T.type === D.LINE_COMMENT;
+class BR {
   constructor(E) {
     this.tokenize = E, this.index = 0, this.tokens = [], this.input = "";
   }
@@ -18492,7 +18540,7 @@ class GR {
   save() {
   }
   formatError(E) {
-    const { line: R, col: A } = PR(this.input, E.start);
+    const { line: R, col: A } = lR(this.input, E.start);
     return `Parse error at token: ${E.text} at line ${R} column ${A}`;
   }
   has(E) {
@@ -18503,15 +18551,15 @@ var U;
 (function(T) {
   T.statement = "statement", T.clause = "clause", T.set_operation = "set_operation", T.function_call = "function_call", T.parameterized_data_type = "parameterized_data_type", T.array_subscript = "array_subscript", T.property_access = "property_access", T.parenthesis = "parenthesis", T.between_predicate = "between_predicate", T.case_expression = "case_expression", T.case_when = "case_when", T.case_else = "case_else", T.limit_clause = "limit_clause", T.all_columns_asterisk = "all_columns_asterisk", T.literal = "literal", T.identifier = "identifier", T.keyword = "keyword", T.data_type = "data_type", T.parameter = "parameter", T.operator = "operator", T.comma = "comma", T.line_comment = "line_comment", T.block_comment = "block_comment", T.disable_comment = "disable_comment";
 })(U = U || (U = {}));
-function gE(T) {
+function QE(T) {
   return T[0];
 }
-const c = new GR((T) => []), w = ([[T]]) => T, d = (T) => ({
+const c = new BR((T) => []), w = ([[T]]) => T, d = (T) => ({
   type: U.keyword,
   tokenType: T.type,
   text: T.text,
   raw: T.raw
-}), bT = (T) => ({
+}), JT = (T) => ({
   type: U.data_type,
   text: T.text,
   raw: T.raw
@@ -18566,7 +18614,7 @@ const c = new GR((T) => []), w = ([[T]]) => T, d = (T) => ({
     { name: "limit_clause$ebnf$1$subexpression$1$ebnf$1", symbols: ["free_form_sql"] },
     { name: "limit_clause$ebnf$1$subexpression$1$ebnf$1", symbols: ["limit_clause$ebnf$1$subexpression$1$ebnf$1", "free_form_sql"], postprocess: (T) => T[0].concat([T[1]]) },
     { name: "limit_clause$ebnf$1$subexpression$1", symbols: [c.has("COMMA") ? { type: "COMMA" } : COMMA, "limit_clause$ebnf$1$subexpression$1$ebnf$1"] },
-    { name: "limit_clause$ebnf$1", symbols: ["limit_clause$ebnf$1$subexpression$1"], postprocess: gE },
+    { name: "limit_clause$ebnf$1", symbols: ["limit_clause$ebnf$1$subexpression$1"], postprocess: QE },
     { name: "limit_clause$ebnf$1", symbols: [], postprocess: () => null },
     {
       name: "limit_clause",
@@ -18641,7 +18689,7 @@ const c = new GR((T) => []), w = ([[T]]) => T, d = (T) => ({
     },
     { name: "expression_chain_$ebnf$1", symbols: ["expression_with_comments_"] },
     { name: "expression_chain_$ebnf$1", symbols: ["expression_chain_$ebnf$1", "expression_with_comments_"], postprocess: (T) => T[0].concat([T[1]]) },
-    { name: "expression_chain_", symbols: ["expression_chain_$ebnf$1"], postprocess: gE },
+    { name: "expression_chain_", symbols: ["expression_chain_$ebnf$1"], postprocess: QE },
     { name: "expression_chain$ebnf$1", symbols: [] },
     { name: "expression_chain$ebnf$1", symbols: ["expression_chain$ebnf$1", "_expression_with_comments"], postprocess: (T) => T[0].concat([T[1]]) },
     {
@@ -18795,7 +18843,7 @@ const c = new GR((T) => []), w = ([[T]]) => T, d = (T) => ({
         expr2: [f(N, { leading: e })]
       })
     },
-    { name: "case_expression$ebnf$1", symbols: ["expression_chain_"], postprocess: gE },
+    { name: "case_expression$ebnf$1", symbols: ["expression_chain_"], postprocess: QE },
     { name: "case_expression$ebnf$1", symbols: [], postprocess: () => null },
     { name: "case_expression$ebnf$2", symbols: [] },
     { name: "case_expression$ebnf$2", symbols: ["case_expression$ebnf$2", "case_clause"], postprocess: (T) => T[0].concat([T[1]]) },
@@ -18861,14 +18909,14 @@ const c = new GR((T) => []), w = ([[T]]) => T, d = (T) => ({
     {
       name: "data_type",
       symbols: ["data_type$subexpression$1"],
-      postprocess: ([[T]]) => bT(T)
+      postprocess: ([[T]]) => JT(T)
     },
     {
       name: "data_type",
       symbols: [c.has("RESERVED_PARAMETERIZED_DATA_TYPE") ? { type: "RESERVED_PARAMETERIZED_DATA_TYPE" } : RESERVED_PARAMETERIZED_DATA_TYPE, "_", "parenthesis"],
       postprocess: ([T, E, R]) => ({
         type: U.parameterized_data_type,
-        dataType: f(bT(T), { trailing: E }),
+        dataType: f(JT(T), { trailing: E }),
         parenthesis: R
       })
     },
@@ -18924,9 +18972,9 @@ const c = new GR((T) => []), w = ([[T]]) => T, d = (T) => ({
 }, { Parser: eO, Grammar: IO } = QI;
 function OO(T) {
   let E = {};
-  const R = new GR((S) => [
+  const R = new BR((S) => [
     ...ZI(T.tokenize(S, E)),
-    _R(S.length)
+    aR(S.length)
   ]), A = new eO(IO.fromCompiled(SO), { lexer: R });
   return {
     parse: (S, e) => {
@@ -18943,7 +18991,7 @@ var n;
 (function(T) {
   T[T.SPACE = 0] = "SPACE", T[T.NO_SPACE = 1] = "NO_SPACE", T[T.NO_NEWLINE = 2] = "NO_NEWLINE", T[T.NEWLINE = 3] = "NEWLINE", T[T.MANDATORY_NEWLINE = 4] = "MANDATORY_NEWLINE", T[T.INDENT = 5] = "INDENT", T[T.SINGLE_INDENT = 6] = "SINGLE_INDENT";
 })(n = n || (n = {}));
-class lR {
+class mR {
   constructor(E) {
     this.indentation = E, this.items = [];
   }
@@ -19031,17 +19079,17 @@ class lR {
   }
 }
 const NO = (T) => T === n.SPACE || T === n.SINGLE_INDENT, tO = (T) => T === n.SPACE || T === n.SINGLE_INDENT || T === n.NEWLINE;
-function yT(T, E) {
+function wT(T, E) {
   if (E === "standard")
     return T;
   let R = [];
   return T.length >= 10 && T.includes(" ") && ([T, ...R] = T.split(" ")), E === "tabularLeft" ? T = T.padEnd(9, " ") : T = T.padStart(9, " "), T + ["", ...R].join(" ");
 }
-function KT(T) {
+function xT(T) {
   return sA(T) || T === D.RESERVED_CLAUSE || T === D.RESERVED_SELECT || T === D.RESERVED_SET_OPERATION || T === D.RESERVED_JOIN || T === D.LIMIT;
 }
-const JE = "top-level", sO = "block-level";
-class cR {
+const ZE = "top-level", sO = "block-level";
+class FR {
   /**
    * @param {string} indent A string to indent with
    */
@@ -19064,7 +19112,7 @@ class cR {
    * Increases indentation by one top-level indent.
    */
   increaseTopLevel() {
-    this.indentTypes.push(JE);
+    this.indentTypes.push(ZE);
   }
   /**
    * Increases indentation by one block-level indent.
@@ -19077,7 +19125,7 @@ class cR {
    * Does nothing when the previous indent is not top-level.
    */
   decreaseTopLevel() {
-    this.indentTypes.length > 0 && eE(this.indentTypes) === JE && this.indentTypes.pop();
+    this.indentTypes.length > 0 && eE(this.indentTypes) === ZE && this.indentTypes.pop();
   }
   /**
    * Decreases indentation by one block-level indent.
@@ -19085,17 +19133,17 @@ class cR {
    * throws away these as well.
    */
   decreaseBlockLevel() {
-    for (; this.indentTypes.length > 0 && this.indentTypes.pop() === JE; )
+    for (; this.indentTypes.length > 0 && this.indentTypes.pop() === ZE; )
       ;
   }
 }
-class CO extends lR {
+class CO extends mR {
   constructor(E) {
-    super(new cR("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
+    super(new FR("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
   }
   add(...E) {
     if (E.forEach((R) => this.addToLength(R)), this.length > this.expressionWidth)
-      throw new vE();
+      throw new kE();
     super.add(...E);
   }
   addToLength(E) {
@@ -19103,14 +19151,14 @@ class CO extends lR {
       this.length += E.length, this.trailingSpace = !1;
     else {
       if (E === n.MANDATORY_NEWLINE || E === n.NEWLINE)
-        throw new vE();
+        throw new kE();
       E === n.INDENT || E === n.SINGLE_INDENT || E === n.SPACE ? this.trailingSpace || (this.length++, this.trailingSpace = !0) : (E === n.NO_NEWLINE || E === n.NO_SPACE) && this.trailingSpace && (this.trailingSpace = !1, this.length--);
     }
   }
 }
-class vE extends Error {
+class kE extends Error {
 }
-class _E {
+class rE {
   constructor({ cfg: E, dialectCfg: R, params: A, layout: S, inline: e = !1 }) {
     this.inline = !1, this.nodes = [], this.index = -1, this.cfg = E, this.dialectCfg = R, this.inline = e, this.params = A, this.layout = S;
   }
@@ -19204,7 +19252,7 @@ class _E {
   }
   formatParenthesis(E) {
     const R = this.formatInlineExpression(E.children);
-    R ? (this.layout.add(E.openParen), this.layout.add(...R.getLayoutItems()), this.layout.add(n.NO_SPACE, E.closeParen, n.SPACE)) : (this.layout.add(E.openParen, n.NEWLINE), k(this.cfg) ? (this.layout.add(n.INDENT), this.layout = this.formatSubExpression(E.children)) : (this.layout.indentation.increaseBlockLevel(), this.layout.add(n.INDENT), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseBlockLevel()), this.layout.add(n.NEWLINE, n.INDENT, E.closeParen, n.SPACE));
+    R ? (this.layout.add(E.openParen), this.layout.add(...R.getLayoutItems()), this.layout.add(n.NO_SPACE, E.closeParen, n.SPACE)) : (this.layout.add(E.openParen, n.NEWLINE), EE(this.cfg) ? (this.layout.add(n.INDENT), this.layout = this.formatSubExpression(E.children)) : (this.layout.indentation.increaseBlockLevel(), this.layout.add(n.INDENT), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseBlockLevel()), this.layout.add(n.NEWLINE, n.INDENT, E.closeParen, n.SPACE));
   }
   formatBetweenPredicate(E) {
     this.layout.add(this.showKw(E.betweenKw), n.SPACE), this.layout = this.formatSubExpression(E.expr1), this.layout.add(n.NO_SPACE, n.SPACE, this.showNonTabularKw(E.andKw), n.SPACE), this.layout = this.formatSubExpression(E.expr2), this.layout.add(n.SPACE);
@@ -19219,10 +19267,10 @@ class _E {
     this.layout.add(n.NEWLINE, n.INDENT), this.formatNode(E.elseKw), this.layout = this.formatSubExpression(E.result);
   }
   formatClause(E) {
-    this.isOnelineClause(E) ? this.formatClauseInOnelineStyle(E) : k(this.cfg) ? this.formatClauseInTabularStyle(E) : this.formatClauseInIndentedStyle(E);
+    this.isOnelineClause(E) ? this.formatClauseInOnelineStyle(E) : EE(this.cfg) ? this.formatClauseInTabularStyle(E) : this.formatClauseInIndentedStyle(E);
   }
   isOnelineClause(E) {
-    return k(this.cfg) ? this.dialectCfg.tabularOnelineClauses[E.nameKw.text] : this.dialectCfg.onelineClauses[E.nameKw.text];
+    return EE(this.cfg) ? this.dialectCfg.tabularOnelineClauses[E.nameKw.text] : this.dialectCfg.onelineClauses[E.nameKw.text];
   }
   formatClauseInIndentedStyle(E) {
     this.layout.add(n.NEWLINE, n.INDENT, this.showKw(E.nameKw), n.NEWLINE), this.layout.indentation.increaseTopLevel(), this.layout.add(n.INDENT), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseTopLevel();
@@ -19239,7 +19287,7 @@ class _E {
   formatLimitClause(E) {
     this.withComments(E.limitKw, () => {
       this.layout.add(n.NEWLINE, n.INDENT, this.showKw(E.limitKw));
-    }), this.layout.indentation.increaseTopLevel(), k(this.cfg) ? this.layout.add(n.SPACE) : this.layout.add(n.NEWLINE, n.INDENT), E.offset ? (this.layout = this.formatSubExpression(E.offset), this.layout.add(n.NO_SPACE, ",", n.SPACE), this.layout = this.formatSubExpression(E.count)) : this.layout = this.formatSubExpression(E.count), this.layout.indentation.decreaseTopLevel();
+    }), this.layout.indentation.increaseTopLevel(), EE(this.cfg) ? this.layout.add(n.SPACE) : this.layout.add(n.NEWLINE, n.INDENT), E.offset ? (this.layout = this.formatSubExpression(E.offset), this.layout.add(n.NO_SPACE, ",", n.SPACE), this.layout = this.formatSubExpression(E.count)) : this.layout = this.formatSubExpression(E.count), this.layout.indentation.decreaseTopLevel();
   }
   formatAllColumnsAsterisk(E) {
     this.layout.add("*", n.SPACE);
@@ -19268,7 +19316,7 @@ class _E {
     });
   }
   formatLineComment(E) {
-    KE(E.precedingWhitespace || "") ? this.layout.add(n.NEWLINE, n.INDENT, E.text, n.MANDATORY_NEWLINE, n.INDENT) : this.layout.getLayoutItems().length > 0 ? this.layout.add(n.NO_NEWLINE, n.SPACE, E.text, n.MANDATORY_NEWLINE, n.INDENT) : this.layout.add(E.text, n.MANDATORY_NEWLINE, n.INDENT);
+    xE(E.precedingWhitespace || "") ? this.layout.add(n.NEWLINE, n.INDENT, E.text, n.MANDATORY_NEWLINE, n.INDENT) : this.layout.getLayoutItems().length > 0 ? this.layout.add(n.NO_NEWLINE, n.SPACE, E.text, n.MANDATORY_NEWLINE, n.INDENT) : this.layout.add(E.text, n.MANDATORY_NEWLINE, n.INDENT);
   }
   formatBlockComment(E) {
     E.type === U.block_comment && this.isMultilineBlockComment(E) ? (this.splitBlockComment(E.text).forEach((R) => {
@@ -19276,7 +19324,7 @@ class _E {
     }), this.layout.add(n.NEWLINE, n.INDENT)) : this.layout.add(E.text, n.SPACE);
   }
   isMultilineBlockComment(E) {
-    return KE(E.text) || KE(E.precedingWhitespace || "");
+    return xE(E.text) || xE(E.precedingWhitespace || "");
   }
   isDocComment(E) {
     const R = E.split(/\n/);
@@ -19318,7 +19366,7 @@ class _E {
     return this.isDocComment(E) ? E.split(/\n/).map((R) => /^\s*\*/.test(R) ? " " + R.replace(/^\s*/, "") : R) : E.split(/\n/).map((R) => R.replace(/^\s*/, ""));
   }
   formatSubExpression(E) {
-    return new _E({
+    return new rE({
       cfg: this.cfg,
       dialectCfg: this.dialectCfg,
       params: this.params,
@@ -19329,7 +19377,7 @@ class _E {
   formatInlineExpression(E) {
     const R = this.params.getPositionalParameterIndex();
     try {
-      return new _E({
+      return new rE({
         cfg: this.cfg,
         dialectCfg: this.dialectCfg,
         params: this.params,
@@ -19337,7 +19385,7 @@ class _E {
         inline: !0
       }).format(E);
     } catch (A) {
-      if (A instanceof vE) {
+      if (A instanceof kE) {
         this.params.setPositionalParameterIndex(R);
         return;
       } else
@@ -19357,19 +19405,19 @@ class _E {
     }
   }
   formatJoin(E) {
-    k(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(n.NEWLINE, n.INDENT, this.showKw(E), n.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(n.NEWLINE, n.INDENT, this.showKw(E), n.SPACE);
+    EE(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(n.NEWLINE, n.INDENT, this.showKw(E), n.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(n.NEWLINE, n.INDENT, this.showKw(E), n.SPACE);
   }
   formatKeyword(E) {
     this.layout.add(this.showKw(E), n.SPACE);
   }
   formatLogicalOperator(E) {
-    this.cfg.logicalOperatorNewline === "before" ? k(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(n.NEWLINE, n.INDENT, this.showKw(E), n.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(n.NEWLINE, n.INDENT, this.showKw(E), n.SPACE) : this.layout.add(this.showKw(E), n.NEWLINE, n.INDENT);
+    this.cfg.logicalOperatorNewline === "before" ? EE(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(n.NEWLINE, n.INDENT, this.showKw(E), n.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(n.NEWLINE, n.INDENT, this.showKw(E), n.SPACE) : this.layout.add(this.showKw(E), n.NEWLINE, n.INDENT);
   }
   formatDataType(E) {
     this.layout.add(this.showDataType(E), n.SPACE);
   }
   showKw(E) {
-    return KT(E.tokenType) ? yT(this.showNonTabularKw(E), this.cfg.indentStyle) : this.showNonTabularKw(E);
+    return xT(E.tokenType) ? wT(this.showNonTabularKw(E), this.cfg.indentStyle) : this.showNonTabularKw(E);
   }
   // Like showKw(), but skips tabular formatting
   showNonTabularKw(E) {
@@ -19383,7 +19431,7 @@ class _E {
     }
   }
   showFunctionKw(E) {
-    return KT(E.tokenType) ? yT(this.showNonTabularFunctionKw(E), this.cfg.indentStyle) : this.showNonTabularFunctionKw(E);
+    return xT(E.tokenType) ? wT(this.showNonTabularFunctionKw(E), this.cfg.indentStyle) : this.showNonTabularFunctionKw(E);
   }
   // Like showFunctionKw(), but skips tabular formatting
   showNonTabularFunctionKw(E) {
@@ -19440,11 +19488,11 @@ class LO {
 `.repeat(this.cfg.linesBetweenQueries + 1));
   }
   formatStatement(E) {
-    const R = new _E({
+    const R = new rE({
       cfg: this.cfg,
       dialectCfg: this.dialect.formatOptions,
       params: this.params,
-      layout: new lR(new cR(gI(this.cfg)))
+      layout: new mR(new FR(gI(this.cfg)))
     }).format(E.children);
     return E.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? R.add(n.NEWLINE, ";") : R.add(n.NO_NEWLINE, ";")), R.toString();
   }
@@ -19483,7 +19531,7 @@ var iO = function(T, E) {
       E.indexOf(A[S]) < 0 && Object.prototype.propertyIsEnumerable.call(T, A[S]) && (R[A[S]] = T[A[S]]);
   return R;
 };
-const uR = {
+const YR = {
   bigquery: "bigquery",
   db2: "db2",
   db2i: "db2i",
@@ -19504,7 +19552,7 @@ const uR = {
   tsql: "transactsql",
   singlestoredb: "singlestoredb",
   snowflake: "snowflake"
-}, DO = Object.keys(uR), aO = {
+}, DO = Object.keys(YR), aO = {
   tabWidth: 2,
   useTabs: !1,
   keywordCase: "preserve",
@@ -19517,12 +19565,12 @@ const uR = {
   linesBetweenQueries: 1,
   denseOperators: !1,
   newlineBeforeSemicolon: !1
-}, PO = (T, E = {}) => {
+}, oO = (T, E = {}) => {
   if (typeof E.language == "string" && !DO.includes(E.language))
     throw new sE(`Unsupported SQL dialect: ${E.language}`);
-  const R = uR[E.language || "sql"];
-  return oO(T, Object.assign(Object.assign({}, E), { dialect: uI[R] }));
-}, oO = (T, E) => {
+  const R = YR[E.language || "sql"];
+  return PO(T, Object.assign(Object.assign({}, E), { dialect: uI[R] }));
+}, PO = (T, E) => {
   var { dialect: R } = E, A = iO(E, ["dialect"]);
   if (typeof T != "string")
     throw new Error("Invalid query argument. Expected string, instead got " + typeof T);
@@ -19601,12 +19649,12 @@ async function HO(T, E, R) {
     N = await R.generateSQL(t, T, E);
   }
   const s = Array.from(S).map((t) => {
-    var i, o;
+    var i, P;
     return {
       cube: t,
       query: {
         measures: ((i = T.measures) == null ? void 0 : i.filter((M) => M.startsWith(t + "."))) || [],
-        dimensions: ((o = T.dimensions) == null ? void 0 : o.filter((M) => M.startsWith(t + "."))) || [],
+        dimensions: ((P = T.dimensions) == null ? void 0 : P.filter((M) => M.startsWith(t + "."))) || [],
         filters: T.filters || [],
         timeDimensions: T.timeDimensions || [],
         order: T.order || {},
@@ -19660,9 +19708,9 @@ function BO(T, E, R) {
     slowQuery: !1
   };
 }
-function $T(T, E) {
+function vT(T, E) {
   try {
-    return PO(T, {
+    return oO(T, {
       language: {
         postgres: "postgresql",
         mysql: "mysql",
@@ -19702,7 +19750,7 @@ class cO {
     l(this, "metadataCache");
     l(this, "metadataCacheTimestamp");
     l(this, "METADATA_CACHE_TTL", 5 * 60 * 1e3);
-    E != null && E.databaseExecutor ? this.dbExecutor = E.databaseExecutor : E != null && E.drizzle && (this.dbExecutor = sT(
+    E != null && E.databaseExecutor ? this.dbExecutor = E.databaseExecutor : E != null && E.drizzle && (this.dbExecutor = nT(
       E.drizzle,
       E.schema,
       E.engineType
@@ -19725,7 +19773,7 @@ class cO {
    * Set Drizzle instance and schema directly
    */
   setDrizzle(E, R, A) {
-    this.dbExecutor = sT(E, R, A);
+    this.dbExecutor = nT(E, R, A);
   }
   /**
    * Check if database executor is configured
@@ -19763,7 +19811,7 @@ class cO {
   async execute(E, R) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    return new UE(this.dbExecutor).execute(this.cubes, E, R);
+    return new HE(this.dbExecutor).execute(this.cubes, E, R);
   }
   /**
    * Execute a multi-cube query
@@ -19839,9 +19887,9 @@ class cO {
       throw new Error(`Cube '${E}' not found`);
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const N = await new UE(this.dbExecutor).generateSQL(S, R, A), s = this.dbExecutor.getEngineType();
+    const N = await new HE(this.dbExecutor).generateSQL(S, R, A), s = this.dbExecutor.getEngineType();
     return {
-      sql: $T(N.sql, s),
+      sql: vT(N.sql, s),
       params: N.params
     };
   }
@@ -19851,9 +19899,9 @@ class cO {
   async generateMultiCubeSQL(E, R) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const S = await new UE(this.dbExecutor).generateMultiCubeSQL(this.cubes, E, R), e = this.dbExecutor.getEngineType();
+    const S = await new HE(this.dbExecutor).generateMultiCubeSQL(this.cubes, E, R), e = this.dbExecutor.getEngineType();
     return {
-      sql: $T(S.sql, e),
+      sql: vT(S.sql, e),
       params: S.params
     };
   }
@@ -19894,10 +19942,10 @@ class cO {
    * Ensures all referenced cubes and fields exist
    */
   validateQuery(E) {
-    return HR(this.cubes, E);
+    return pR(this.cubes, E);
   }
 }
-function HR(T, E) {
+function pR(T, E) {
   const R = [], A = /* @__PURE__ */ new Set();
   if (E.measures)
     for (const S of E.measures) {
@@ -19946,17 +19994,17 @@ function HR(T, E) {
     }
   if (E.filters)
     for (const S of E.filters)
-      BR(S, T, R, A);
+      dR(S, T, R, A);
   return A.size === 0 && R.push("Query must reference at least one cube through measures, dimensions, or filters"), {
     isValid: R.length === 0,
     errors: R
   };
 }
-function BR(T, E, R, A) {
+function dR(T, E, R, A) {
   if ("and" in T || "or" in T) {
     const s = T.and || T.or || [];
     for (const _ of s)
-      BR(_, E, R, A);
+      dR(_, E, R, A);
     return;
   }
   if (!("member" in T)) {