drizzle-cube 0.1.59 → 0.1.62

package/dist/server/index.js

@@ -1,4 +1,4 @@
-import { sql as n, eq as x, and as p, StringChunk as xT, count as SE, sum as f, max as q, min as j, countDistinct as vT, SQL as QT, or as IE, isNotNull as yE, ne as KE, isNull as $E, notInArray as gE, inArray as OE, lt as NE, gt as tE, gte as $, lte as g, desc as ZT, asc as wE } from "drizzle-orm";
+import { sql as n, eq as x, and as m, StringChunk as xT, count as SE, sum as f, max as q, min as j, countDistinct as vT, SQL as QT, or as IE, arrayContained as ZT, arrayOverlaps as qT, arrayContains as jT, isNotNull as yE, ne as KE, isNull as gE, notInArray as $E, inArray as OE, lt as NE, gt as tE, gte as g, lte as $, desc as kT, asc as wE } from "drizzle-orm";
 class fE {
   /**
    * Default implementation returns template unchanged
@@ -25,7 +25,7 @@ class fE {
     }
   }
 }
-class qT extends fE {
+class zT extends fE {
   getEngineType() {
     return "postgres";
   }
@@ -274,7 +274,7 @@ class HT extends fE {
     return E;
   }
 }
-class jT extends fE {
+class ER extends fE {
   getEngineType() {
     return "sqlite";
   }
@@ -426,7 +426,7 @@ class jT extends fE {
     return E;
   }
 }
-class kT extends HT {
+class TR extends HT {
   getEngineType() {
     return "singlestore";
   }
@@ -439,16 +439,16 @@ class kT extends HT {
   // These limitations are typically handled at the query building level
   // rather than in the adapter, but can be addressed here if needed
 }
-function zT(R) {
+function RR(R) {
   switch (R) {
     case "postgres":
-      return new qT();
+      return new zT();
     case "mysql":
       return new HT();
     case "sqlite":
-      return new jT();
+      return new ER();
     case "singlestore":
-      return new kT();
+      return new TR();
     default:
       throw new Error(`Unsupported database engine: ${R}`);
   }
@@ -457,11 +457,11 @@ class VE {
   constructor(E, T, A) {
     this.db = E, this.schema = T;
     const e = A || this.getEngineType();
-    this.databaseAdapter = zT(e);
+    this.databaseAdapter = RR(e);
   }
   databaseAdapter;
 }
-class ER extends VE {
+class AR extends VE {
   async execute(E, T) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
       const e = await E.execute();
@@ -513,7 +513,7 @@ class ER extends VE {
   }
 }
 function JE(R, E) {
-  return new ER(R, E, "postgres");
+  return new AR(R, E, "postgres");
 }
 class BT extends VE {
   async execute(E, T) {
@@ -553,10 +553,10 @@ class BT extends VE {
     return "mysql";
   }
 }
-function TR(R, E) {
+function eR(R, E) {
   return new BT(R, E, "mysql");
 }
-class RR extends VE {
+class SR extends VE {
   async execute(E, T) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
       const A = await E.execute();
@@ -603,9 +603,9 @@ class RR extends VE {
   }
 }
 function xE(R, E) {
-  return new RR(R, E, "sqlite");
+  return new SR(R, E, "sqlite");
 }
-class AR extends BT {
+class IR extends BT {
   getEngineType() {
     return "singlestore";
   }
@@ -613,8 +613,8 @@ class AR extends BT {
   // For now, we inherit all behavior from MySQLExecutor since
   // SingleStore is largely MySQL-compatible
 }
-function eR(R, E) {
-  return new AR(R, E);
+function NR(R, E) {
+  return new IR(R, E);
 }
 function vE(R, E, T) {
   if (T)
@@ -622,11 +622,11 @@ function vE(R, E, T) {
       case "postgres":
         return JE(R, E);
       case "mysql":
-        return TR(R, E);
+        return eR(R, E);
       case "sqlite":
         return xE(R, E);
       case "singlestore":
-        return eR(R, E);
+        return NR(R, E);
     }
   if (R.all && R.run)
     return xE(R, E);
@@ -656,27 +656,27 @@ function dT(R, E) {
       return "left";
   }
 }
-function SR(R) {
+function tR(R) {
   return R && typeof R == "object" ? n`${n`${R}`}` : R;
 }
 function X(R, E) {
   const T = typeof R == "function" ? R(E) : R;
-  return SR(T);
+  return tR(T);
 }
-function zI(R, E, T) {
+function RO(R, E, T) {
   return {
     ...R,
     cubes: E,
     currentCube: T
   };
 }
-function EO(R, E) {
+function AO(R, E) {
   return {
     name: R,
     ...E
   };
 }
-function IR(R, E) {
+function sR(R, E) {
   if (R.relationship !== "belongsToMany" || !R.through)
     throw new Error("expandBelongsToManyJoin can only be called on belongsToMany relationships with through configuration");
   const { table: T, sourceKey: A, targetKey: e, securitySql: S } = R.through, I = [];
@@ -700,13 +700,13 @@ function IR(R, E) {
       {
         joinType: O,
         table: T,
-        condition: p(...I)
+        condition: m(...I)
       },
       {
         joinType: O,
         table: T,
         // This will be replaced with target cube table in query planner
-        condition: p(...t)
+        condition: m(...t)
       }
     ],
     junctionSecurityConditions: C
@@ -932,15 +932,15 @@ class b {
     return E.type === "calculated" && !!E.calculatedSql;
   }
 }
-function NR(R, E) {
+function CR(R, E) {
   const { cube: T, allCubes: A, resolvedMeasures: e } = E, S = WE(R), I = /* @__PURE__ */ new Map();
   for (const s of S) {
-    const { originalRef: r, cubeName: L, fieldName: i } = s, o = L || T.name;
-    if (!A.get(o))
+    const { originalRef: r, cubeName: L, fieldName: i } = s, D = L || T.name;
+    if (!A.get(D))
       throw new Error(
-        `Cannot substitute {${r}}: cube '${o}' not found`
+        `Cannot substitute {${r}}: cube '${D}' not found`
       );
-    const P = `${o}.${i}`, c = e.get(P);
+    const P = `${D}.${i}`, c = e.get(P);
     if (!c)
       throw new Error(
         `Cannot substitute {${r}}: measure '${P}' not resolved yet. Ensure measures are resolved in dependency order.`
@@ -985,7 +985,7 @@ function WE(R) {
   }
   return A;
 }
-function tR(R) {
+function LR(R) {
   const E = [];
   let T = 0;
   for (let I = 0; I < R.length; I++)
@@ -1018,7 +1018,7 @@ function sE(R, E) {
   }
   return Array.from(A);
 }
-class sR {
+class _R {
   constructor(E) {
     this.databaseAdapter = E;
   }
@@ -1060,17 +1060,17 @@ class sR {
     for (const N of I) {
       const [s, r] = N.split("."), L = T.get(s), i = L.measures[r];
       if (e) {
-        const o = e(N, i, L);
-        S.set(N, () => o);
+        const D = e(N, i, L);
+        S.set(N, () => D);
       } else
         S.set(N, () => this.buildMeasureExpression(i, A));
     }
     if (t.length > 0) {
       const N = O.topologicalSort(t);
       for (const s of N) {
-        const [r, L] = s.split("."), i = T.get(r), o = i.measures[L];
+        const [r, L] = s.split("."), i = T.get(r), D = i.measures[L];
         S.set(s, () => this.buildCalculatedMeasure(
-          o,
+          D,
           i,
           T,
           S,
@@ -1133,7 +1133,7 @@ class sR {
         `Calculated measure '${T.name}.${E.name}' missing calculatedSql property`
       );
     const I = this.databaseAdapter.preprocessCalculatedTemplate(E.calculatedSql);
-    return NR(I, {
+    return CR(I, {
       cube: T,
       allCubes: A,
       resolvedMeasures: e
@@ -1263,7 +1263,7 @@ class sR {
         return I ? n`(${I})` : void 0;
       }).filter(Boolean);
       if (e.length > 0) {
-        const S = e.length === 1 ? e[0] : p(...e);
+        const S = e.length === 1 ? e[0] : m(...e);
         A = this.databaseAdapter.buildCaseWhen([
           { when: S, then: A }
         ]);
@@ -1310,7 +1310,7 @@ class sR {
       for (const t of T.timeDimensions) {
         const [C, O] = t.dimension.split("."), N = I.get(C);
         if (N && N.dimensions[O] && t.dateRange) {
-          if (e?.preAggregationCTEs && e.preAggregationCTEs.some((o) => o.cube.name === C))
+          if (e?.preAggregationCTEs && e.preAggregationCTEs.some((D) => D.cube.name === C))
             continue;
           const s = N.dimensions[O], r = X(s.sql, A), L = this.buildDateRangeCondition(r, t.dateRange);
           L && S.push(L);
@@ -1339,11 +1339,11 @@ class sR {
     if ("and" in E || "or" in E) {
       const L = E;
       if (L.and) {
-        const i = L.and.map((o) => this.processFilter(o, T, A, e, S)).filter((o) => o !== null);
-        return i.length > 0 ? p(...i) : null;
+        const i = L.and.map((D) => this.processFilter(D, T, A, e, S)).filter((D) => D !== null);
+        return i.length > 0 ? m(...i) : null;
       }
       if (L.or) {
-        const i = L.or.map((o) => this.processFilter(o, T, A, e, S)).filter((o) => o !== null);
+        const i = L.or.map((D) => this.processFilter(D, T, A, e, S)).filter((D) => D !== null);
         return i.length > 0 ? IE(...i) : null;
       }
     }
@@ -1352,11 +1352,11 @@ class sR {
     const N = O.dimensions[C], s = O.measures[C], r = N || s;
     if (!r) return null;
     if (e === "where" && N) {
-      if (S?.preAggregationCTEs && S.preAggregationCTEs.some((o) => o.cube.name === t))
+      if (S?.preAggregationCTEs && S.preAggregationCTEs.some((l) => l.cube.name === t))
         return null;
-      const L = X(N.sql, A);
+      const i = ["arrayContains", "arrayOverlaps", "arrayContained"].includes(I.operator) ? typeof N.sql == "function" ? N.sql(A) : N.sql : X(N.sql, A);
       return this.buildFilterCondition(
-        L,
+        i,
         I.operator,
         I.values,
         r,
@@ -1413,7 +1413,7 @@ class sR {
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
-        return I.length > 1 ? gE(E, I) : I.length === 1 ? KE(E, t) : null;
+        return I.length > 1 ? $E(E, I) : I.length === 1 ? KE(E, t) : null;
       case "contains":
         return this.databaseAdapter.buildStringCondition(E, "contains", t);
       case "notContains":
@@ -1425,15 +1425,15 @@ class sR {
       case "gt":
         return tE(E, t);
       case "gte":
-        return $(E, t);
+        return g(E, t);
       case "lt":
         return NE(E, t);
       case "lte":
-        return g(E, t);
+        return $(E, t);
       case "set":
         return yE(E);
       case "notSet":
-        return $E(E);
+        return gE(E);
       case "inDateRange":
         if (I.length >= 2) {
           const C = this.normalizeDate(I[0]);
@@ -1444,9 +1444,9 @@ class sR {
               const s = typeof O == "number" ? new Date(O * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(O), r = new Date(s);
               r.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? O = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(r.getTime() / 1e3) : r.getTime() : O = r.toISOString();
             }
-            return p(
-              $(E, C),
-              g(E, O)
+            return m(
+              g(E, C),
+              $(E, O)
             );
           }
         }
@@ -1460,9 +1460,9 @@ class sR {
         return C ? tE(E, C) : null;
       }
       case "between":
-        return I.length >= 2 ? p(
-          $(E, I[0]),
-          g(E, I[1])
+        return I.length >= 2 ? m(
+          g(E, I[0]),
+          $(E, I[1])
         ) : null;
       case "notBetween":
         return I.length >= 2 ? IE(
@@ -1472,7 +1472,7 @@ class sR {
       case "in":
         return I.length > 0 ? OE(E, I) : null;
       case "notIn":
-        return I.length > 0 ? gE(E, I) : null;
+        return I.length > 0 ? $E(E, I) : null;
       case "like":
         return this.databaseAdapter.buildStringCondition(E, "like", t);
       case "notLike":
@@ -1485,14 +1485,22 @@ class sR {
         return this.databaseAdapter.buildStringCondition(E, "notRegex", t);
       case "isEmpty":
         return IE(
-          $E(E),
+          gE(E),
           x(E, "")
         );
       case "isNotEmpty":
-        return p(
+        return m(
           yE(E),
           KE(E, "")
         );
+      // PostgreSQL array operators - silent no-op for other databases
+      // These use Drizzle's built-in array operator functions
+      case "arrayContains":
+        return this.databaseAdapter.getEngineType() === "postgres" ? jT(E, I) : null;
+      case "arrayOverlaps":
+        return this.databaseAdapter.getEngineType() === "postgres" ? qT(E, I) : null;
+      case "arrayContained":
+        return this.databaseAdapter.getEngineType() === "postgres" ? ZT(E, I) : null;
       default:
         return null;
     }
@@ -1510,18 +1518,18 @@ class sR {
         const S = typeof e == "number" ? new Date(e * (this.databaseAdapter.getEngineType() === "sqlite" ? 1e3 : 1)) : new Date(e), I = new Date(S);
         I.setUTCHours(23, 59, 59, 999), this.databaseAdapter.isTimestampInteger() ? e = this.databaseAdapter.getEngineType() === "sqlite" ? Math.floor(I.getTime() / 1e3) : I.getTime() : e = I.toISOString();
       }
-      return p(
-        $(E, A),
-        g(E, e)
+      return m(
+        g(E, A),
+        $(E, e)
       );
     }
     if (typeof T == "string") {
       const A = this.parseRelativeDateRange(T);
       if (A) {
         let N, s;
-        return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (N = Math.floor(A.start.getTime() / 1e3), s = Math.floor(A.end.getTime() / 1e3)) : (N = A.start.getTime(), s = A.end.getTime()) : (N = A.start.toISOString(), s = A.end.toISOString()), p(
-          $(E, N),
-          g(E, s)
+        return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (N = Math.floor(A.start.getTime() / 1e3), s = Math.floor(A.end.getTime() / 1e3)) : (N = A.start.getTime(), s = A.end.getTime()) : (N = A.start.toISOString(), s = A.end.toISOString()), m(
+          g(E, N),
+          $(E, s)
         );
       }
       const e = this.normalizeDate(T);
@@ -1531,9 +1539,9 @@ class sR {
       const t = new Date(S);
       t.setUTCHours(23, 59, 59, 999);
       let C, O;
-      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (C = Math.floor(I.getTime() / 1e3), O = Math.floor(t.getTime() / 1e3)) : (C = I.getTime(), O = t.getTime()) : (C = I.toISOString(), O = t.toISOString()), p(
-        $(E, C),
-        g(E, O)
+      return this.databaseAdapter.isTimestampInteger() ? this.databaseAdapter.getEngineType() === "sqlite" ? (C = Math.floor(I.getTime() / 1e3), O = Math.floor(t.getTime() / 1e3)) : (C = I.getTime(), O = t.getTime()) : (C = I.toISOString(), O = t.toISOString()), m(
+        g(E, C),
+        $(E, O)
       );
     }
     return null;
@@ -1585,8 +1593,8 @@ class sR {
     if (O) {
       const L = parseInt(O[1], 10) * 7, i = new Date(T);
       i.setUTCDate(I - L + 1), i.setUTCHours(0, 0, 0, 0);
-      const o = new Date(T);
-      return o.setUTCHours(23, 59, 59, 999), { start: i, end: o };
+      const D = new Date(T);
+      return D.setUTCHours(23, 59, 59, 999), { start: i, end: D };
     }
     if (A === "last week") {
       const r = t === 0 ? -13 : -6 - t, L = new Date(T);
@@ -1599,8 +1607,8 @@ class sR {
       return { start: r, end: L };
     }
     if (A === "last quarter") {
-      const r = Math.floor(S / 3), L = r === 0 ? 3 : r - 1, i = r === 0 ? e - 1 : e, o = new Date(Date.UTC(i, L * 3, 1, 0, 0, 0, 0)), l = new Date(Date.UTC(i, L * 3 + 3, 0, 23, 59, 59, 999));
-      return { start: o, end: l };
+      const r = Math.floor(S / 3), L = r === 0 ? 3 : r - 1, i = r === 0 ? e - 1 : e, D = new Date(Date.UTC(i, L * 3, 1, 0, 0, 0, 0)), l = new Date(Date.UTC(i, L * 3 + 3, 0, 23, 59, 59, 999));
+      return { start: D, end: l };
     }
     if (A === "last year") {
       const r = new Date(Date.UTC(e - 1, 0, 1, 0, 0, 0, 0)), L = new Date(Date.UTC(e - 1, 11, 31, 23, 59, 59, 999));
@@ -1660,12 +1668,12 @@ class sR {
         const [O, N] = C.split("."), s = t.get(O);
         if (s && s.dimensions && s.dimensions[N])
           if (e?.preAggregationCTEs?.some((L) => L.cube.name === O)) {
-            const L = e.preAggregationCTEs.find((o) => o.cube.name === O), i = L.joinKeys.find((o) => o.targetColumn === N);
+            const L = e.preAggregationCTEs.find((D) => D.cube.name === O), i = L.joinKeys.find((D) => D.targetColumn === N);
             if (i && i.sourceColumnObj)
               S.push(i.sourceColumnObj);
             else {
-              const o = n`${n.identifier(L.cteAlias)}.${n.identifier(N)}`;
-              S.push(o);
+              const D = n`${n.identifier(L.cteAlias)}.${n.identifier(N)}`;
+              S.push(D);
             }
           } else {
             const L = s.dimensions[N], i = X(L.sql, A);
@@ -1677,17 +1685,17 @@ class sR {
         const [O, N] = C.dimension.split("."), s = t.get(O);
         if (s && s.dimensions && s.dimensions[N])
           if (e?.preAggregationCTEs?.some((L) => L.cube.name === O)) {
-            const L = e.preAggregationCTEs.find((o) => o.cube.name === O), i = L.joinKeys.find((o) => o.targetColumn === N);
+            const L = e.preAggregationCTEs.find((D) => D.cube.name === O), i = L.joinKeys.find((D) => D.targetColumn === N);
             if (i && i.sourceColumnObj) {
-              const o = this.buildTimeDimensionExpression(
+              const D = this.buildTimeDimensionExpression(
                 i.sourceColumnObj,
                 C.granularity,
                 A
               );
-              S.push(o);
+              S.push(D);
             } else {
-              const o = n`${n.identifier(L.cteAlias)}.${n.identifier(N)}`;
-              S.push(o);
+              const D = n`${n.identifier(L.cteAlias)}.${n.identifier(N)}`;
+              S.push(D);
             }
           } else {
             const L = s.dimensions[N], i = this.buildTimeDimensionExpression(
@@ -1713,7 +1721,7 @@ class sR {
       for (const [S, I] of Object.entries(E.order)) {
         if (!e.includes(S))
           throw new Error(`Cannot order by '${S}': field is not selected in the query`);
-        const t = I === "desc" ? ZT(n.identifier(S)) : wE(n.identifier(S));
+        const t = I === "desc" ? kT(n.identifier(S)) : wE(n.identifier(S));
         A.push(t);
       }
     if (E.timeDimensions && E.timeDimensions.length > 0) {
@@ -1762,7 +1770,7 @@ class sR {
     return e;
   }
 }
-class CR {
+class rR {
   /**
    * Analyze a semantic query to determine which cubes are involved
    */
@@ -1925,7 +1933,7 @@ class CR {
         if (!r)
           throw new Error(`Cube '${N}' not found`);
         if (s.relationship === "belongsToMany" && s.through) {
-          const L = IR(s, e.securityContext);
+          const L = sR(s, e.securityContext);
           S.push({
             cube: r,
             alias: `${N.toLowerCase()}_cube`,
@@ -1970,7 +1978,7 @@ class CR {
       const I = T ? n`${n.identifier(T)}.${n.identifier(S.source.name)}` : S.source, t = A ? n`${n.identifier(A)}.${n.identifier(S.target.name)}` : S.target, C = S.as || x;
       e.push(C(I, t));
     }
-    return p(...e);
+    return m(...e);
   }
   /**
    * Find join path from source cube to target cube
@@ -2087,7 +2095,7 @@ class CE {
   constructor(E) {
     if (this.dbExecutor = E, this.databaseAdapter = E.databaseAdapter, !this.databaseAdapter)
       throw new Error("DatabaseExecutor must have a databaseAdapter property");
-    this.queryBuilder = new sR(this.databaseAdapter), this.queryPlanner = new CR();
+    this.queryBuilder = new _R(this.databaseAdapter), this.queryPlanner = new rR();
   }
   queryBuilder;
   queryPlanner;
@@ -2097,7 +2105,7 @@ class CE {
    */
   async execute(E, T, A) {
     try {
-      const e = gT(E, T);
+      const e = $T(E, T);
       if (!e.isValid)
         throw new Error(`Query validation failed: ${e.errors.join(", ")}`);
       const S = {
@@ -2109,12 +2117,12 @@ class CE {
         if (T.timeDimensions) {
           for (const i of T.timeDimensions)
             if (i.dimension in L) {
-              let o = L[i.dimension];
-              if (typeof o == "string" && o.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
-                const l = o.replace(" ", "T"), P = !l.endsWith("Z") && !l.includes("+") ? l + "Z" : l;
-                o = new Date(P);
+              let D = L[i.dimension];
+              if (typeof D == "string" && D.match(/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/)) {
+                const l = D.replace(" ", "T"), P = !l.endsWith("Z") && !l.includes("+") ? l + "Z" : l;
+                D = new Date(P);
               }
-              o = this.databaseAdapter.convertTimeDimensionResult(o), L[i.dimension] = o;
+              D = this.databaseAdapter.convertTimeDimensionResult(D), L[i.dimension] = D;
             }
         }
         return L;
@@ -2201,9 +2209,9 @@ class CE {
           }
         }
     }
-    const o = [];
-    if (I.where && o.push(I.where), o.push(...L, ...i), o.length > 0) {
-      const P = o.length === 1 ? o[0] : p(...o);
+    const D = [];
+    if (I.where && D.push(I.where), D.push(...L, ...i), D.length > 0) {
+      const P = D.length === 1 ? D[0] : m(...D);
       s = s.where(P);
     }
     const l = [];
@@ -2240,7 +2248,7 @@ class CE {
       const t = I.sourceColumnObj || n.identifier(I.sourceColumn), C = n`${n.identifier(T)}.${n.identifier(I.targetColumn)}`;
       S.push(x(t, C));
     }
-    return S.length === 1 ? S[0] : p(...S);
+    return S.length === 1 ? S[0] : m(...S);
   }
   /**
    * Build unified query that works for both single and multi-cube queries
@@ -2248,9 +2256,9 @@ class CE {
   buildUnifiedQuery(E, T, A) {
     const e = [], S = /* @__PURE__ */ new Map();
     if (E.preAggregationCTEs && E.preAggregationCTEs.length > 0)
-      for (const o of E.preAggregationCTEs) {
-        const l = this.buildPreAggregationCTE(o, T, A, E);
-        l && (e.push(l), S.set(o.cube.name, o.cteAlias));
+      for (const D of E.preAggregationCTEs) {
+        const l = this.buildPreAggregationCTE(D, T, A, E);
+        l && (e.push(l), S.set(D.cube.name, D.cteAlias));
       }
     const I = E.primaryCube.sql(A), C = { ...this.queryBuilder.buildSelections(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
@@ -2259,9 +2267,9 @@ class CE {
       A
     ) };
     if (E.preAggregationCTEs)
-      for (const o of E.preAggregationCTEs) {
-        const l = o.cube.name;
-        for (const P of o.measures)
+      for (const D of E.preAggregationCTEs) {
+        const l = D.cube.name;
+        for (const P of D.measures)
           if (C[P]) {
             const [, c] = P.split("."), M = this.getCubesFromPlan(E).get(l);
             if (M && M.measures && M.measures[c]) {
@@ -2272,12 +2280,12 @@ class CE {
                 H = this.queryBuilder.buildCTECalculatedMeasure(
                   u,
                   M,
-                  o,
+                  D,
                   B,
                   A
                 );
               } else {
-                const B = n`${n.identifier(o.cteAlias)}.${n.identifier(c)}`;
+                const B = n`${n.identifier(D.cteAlias)}.${n.identifier(c)}`;
                 switch (u.type) {
                   case "count":
                   case "countDistinct":
@@ -2308,12 +2316,12 @@ class CE {
           if (c === l) {
             const u = this.getCubesFromPlan(E).get(l), H = u && u.dimensions?.[M], B = P.startsWith(l + ".");
             if (H || B) {
-              let Y = o.joinKeys.find((eE) => eE.targetColumn === M);
+              let Y = D.joinKeys.find((eE) => eE.targetColumn === M);
               if (!Y && u?.dimensions?.[M]) {
                 const eE = u.dimensions[M].sql;
-                Y = o.joinKeys.find((JT) => JT.targetColumnObj === eE);
+                Y = D.joinKeys.find((JT) => JT.targetColumnObj === eE);
               }
-              Y ? C[P] = n`${n.identifier(o.cteAlias)}.${n.identifier(M)}`.as(P) : B && u?.dimensions?.[M] && (C[P] = n`${n.identifier(o.cteAlias)}.${n.identifier(M)}`.as(P));
+              Y ? C[P] = n`${n.identifier(D.cteAlias)}.${n.identifier(M)}`.as(P) : B && u?.dimensions?.[M] && (C[P] = n`${n.identifier(D.cteAlias)}.${n.identifier(M)}`.as(P));
             }
           }
         }
@@ -2321,26 +2329,26 @@ class CE {
     const O = [];
     let N = A.db.select(C).from(I.from);
     if (e.length > 0 && (N = A.db.with(...e).select(C).from(I.from)), I.joins)
-      for (const o of I.joins)
-        switch (o.type || "left") {
+      for (const D of I.joins)
+        switch (D.type || "left") {
           case "left":
-            N = N.leftJoin(o.table, o.on);
+            N = N.leftJoin(D.table, D.on);
             break;
           case "inner":
-            N = N.innerJoin(o.table, o.on);
+            N = N.innerJoin(D.table, D.on);
             break;
           case "right":
-            N = N.rightJoin(o.table, o.on);
+            N = N.rightJoin(D.table, D.on);
             break;
           case "full":
-            N = N.fullJoin(o.table, o.on);
+            N = N.fullJoin(D.table, D.on);
             break;
         }
     if (E.joinCubes && E.joinCubes.length > 0)
-      for (const o of E.joinCubes) {
-        const l = S.get(o.cube.name);
-        if (o.junctionTable) {
-          const M = o.junctionTable, u = [];
+      for (const D of E.joinCubes) {
+        const l = S.get(D.cube.name);
+        if (D.junctionTable) {
+          const M = D.junctionTable, u = [];
           if (M.securitySql) {
             const H = M.securitySql(A.securityContext);
             Array.isArray(H) ? u.push(...H) : u.push(H);
@@ -2365,9 +2373,9 @@ class CE {
           }
         }
         let P, c;
-        l ? (P = n`${n.identifier(l)}`, c = this.buildCTEJoinCondition(o, l, E)) : (P = o.cube.sql(A).from, c = o.joinCondition);
+        l ? (P = n`${n.identifier(l)}`, c = this.buildCTEJoinCondition(D, l, E)) : (P = D.cube.sql(A).from, c = D.joinCondition);
         try {
-          switch (o.joinType || "left") {
+          switch (D.joinType || "left") {
             case "left":
               N = N.leftJoin(P, c);
               break;
@@ -2385,10 +2393,10 @@ class CE {
         }
       }
     if (I.where && O.push(I.where), E.joinCubes && E.joinCubes.length > 0)
-      for (const o of E.joinCubes) {
-        if (S.get(o.cube.name))
+      for (const D of E.joinCubes) {
+        if (S.get(D.cube.name))
           continue;
-        const P = o.cube.sql(A);
+        const P = D.cube.sql(A);
         P.where && O.push(P.where);
       }
     const s = this.queryBuilder.buildWhereConditions(
@@ -2400,8 +2408,8 @@ class CE {
       // Pass the queryPlan to handle CTE scenarios
     );
     if (s.length > 0 && O.push(...s), O.length > 0) {
-      const o = O.length === 1 ? O[0] : p(...O);
-      N = N.where(o);
+      const D = O.length === 1 ? O[0] : m(...O);
+      N = N.where(D);
     }
     const r = this.queryBuilder.buildGroupByFields(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
@@ -2421,8 +2429,8 @@ class CE {
       // Pass the queryPlan to handle CTE scenarios
     );
     if (L.length > 0) {
-      const o = L.length === 1 ? L[0] : p(...L);
-      N = N.having(o);
+      const D = L.length === 1 ? L[0] : m(...L);
+      N = N.having(D);
     }
     const i = this.queryBuilder.buildOrderBy(T);
     return i.length > 0 && (N = N.orderBy(...i)), N = this.queryBuilder.applyLimitAndOffset(N, T), N;
@@ -2514,13 +2522,13 @@ class CE {
     };
   }
 }
-const _ = (R) => R.flatMap(LR), LR = (R) => k(rR(R)).map(_R), _R = (R) => R.replace(/ +/g, " ").trim(), rR = (R) => ({
+const _ = (R) => R.flatMap(nR), nR = (R) => k(aR(R)).map(iR), iR = (R) => R.replace(/ +/g, " ").trim(), aR = (R) => ({
   type: "mandatory_block",
   items: XE(R, 0)[0]
 }), XE = (R, E, T) => {
   const A = [];
   for (; R[E]; ) {
-    const [e, S] = nR(R, E);
+    const [e, S] = oR(R, E);
     if (A.push(e), E = S, R[E] === "|")
       E++;
     else if (R[E] === "}" || R[E] === "]") {
@@ -2535,67 +2543,67 @@ const _ = (R) => R.flatMap(LR), LR = (R) => k(rR(R)).map(_R), _R = (R) => R.repl
       throw new Error(`Unexpected "${R[E]}"`);
   }
   return [A, E];
-}, nR = (R, E) => {
+}, oR = (R, E) => {
   const T = [];
   for (; ; ) {
-    const [A, e] = iR(R, E);
+    const [A, e] = DR(R, E);
     if (A)
       T.push(A), E = e;
     else
       break;
   }
   return T.length === 1 ? [T[0], E] : [{ type: "concatenation", items: T }, E];
-}, iR = (R, E) => {
+}, DR = (R, E) => {
   if (R[E] === "{")
-    return aR(R, E + 1);
+    return PR(R, E + 1);
   if (R[E] === "[")
-    return oR(R, E + 1);
+    return MR(R, E + 1);
   {
     let T = "";
     for (; R[E] && /[A-Za-z0-9_ ]/.test(R[E]); )
       T += R[E], E++;
     return [T, E];
   }
-}, aR = (R, E) => {
+}, PR = (R, E) => {
   const [T, A] = XE(R, E, "}");
   return [{ type: "mandatory_block", items: T }, A];
-}, oR = (R, E) => {
+}, MR = (R, E) => {
   const [T, A] = XE(R, E, "]");
   return [{ type: "optional_block", items: T }, A];
 }, k = (R) => {
   if (typeof R == "string")
     return [R];
   if (R.type === "concatenation")
-    return R.items.map(k).reduce(DR, [""]);
+    return R.items.map(k).reduce(UR, [""]);
   if (R.type === "mandatory_block")
     return R.items.flatMap(k);
   if (R.type === "optional_block")
     return ["", ...R.items.flatMap(k)];
   throw new Error(`Unknown node type: ${R}`);
-}, DR = (R, E) => {
+}, UR = (R, E) => {
   const T = [];
   for (const A of R)
     for (const e of E)
       T.push(A + e);
   return T;
 };
-var D;
+var o;
 (function(R) {
   R.QUOTED_IDENTIFIER = "QUOTED_IDENTIFIER", R.IDENTIFIER = "IDENTIFIER", R.STRING = "STRING", R.VARIABLE = "VARIABLE", R.RESERVED_DATA_TYPE = "RESERVED_DATA_TYPE", R.RESERVED_PARAMETERIZED_DATA_TYPE = "RESERVED_PARAMETERIZED_DATA_TYPE", R.RESERVED_KEYWORD = "RESERVED_KEYWORD", R.RESERVED_FUNCTION_NAME = "RESERVED_FUNCTION_NAME", R.RESERVED_KEYWORD_PHRASE = "RESERVED_KEYWORD_PHRASE", R.RESERVED_DATA_TYPE_PHRASE = "RESERVED_DATA_TYPE_PHRASE", R.RESERVED_SET_OPERATION = "RESERVED_SET_OPERATION", R.RESERVED_CLAUSE = "RESERVED_CLAUSE", R.RESERVED_SELECT = "RESERVED_SELECT", R.RESERVED_JOIN = "RESERVED_JOIN", R.ARRAY_IDENTIFIER = "ARRAY_IDENTIFIER", R.ARRAY_KEYWORD = "ARRAY_KEYWORD", R.CASE = "CASE", R.END = "END", R.WHEN = "WHEN", R.ELSE = "ELSE", R.THEN = "THEN", R.LIMIT = "LIMIT", R.BETWEEN = "BETWEEN", R.AND = "AND", R.OR = "OR", R.XOR = "XOR", R.OPERATOR = "OPERATOR", R.COMMA = "COMMA", R.ASTERISK = "ASTERISK", R.PROPERTY_ACCESS_OPERATOR = "PROPERTY_ACCESS_OPERATOR", R.OPEN_PAREN = "OPEN_PAREN", R.CLOSE_PAREN = "CLOSE_PAREN", R.LINE_COMMENT = "LINE_COMMENT", R.BLOCK_COMMENT = "BLOCK_COMMENT", R.DISABLE_COMMENT = "DISABLE_COMMENT", R.NUMBER = "NUMBER", R.NAMED_PARAMETER = "NAMED_PARAMETER", R.QUOTED_PARAMETER = "QUOTED_PARAMETER", R.NUMBERED_PARAMETER = "NUMBERED_PARAMETER", R.POSITIONAL_PARAMETER = "POSITIONAL_PARAMETER", R.CUSTOM_PARAMETER = "CUSTOM_PARAMETER", R.DELIMITER = "DELIMITER", R.EOF = "EOF";
-})(D = D || (D = {}));
+})(o = o || (o = {}));
 const FT = (R) => ({
-  type: D.EOF,
+  type: o.EOF,
   raw: "«EOF»",
   text: "«EOF»",
   start: R
 }), v = FT(1 / 0), w = (R) => (E) => E.type === R.type && E.text === R.text, y = {
-  ARRAY: w({ text: "ARRAY", type: D.RESERVED_DATA_TYPE }),
-  BY: w({ text: "BY", type: D.RESERVED_KEYWORD }),
-  SET: w({ text: "SET", type: D.RESERVED_CLAUSE }),
-  STRUCT: w({ text: "STRUCT", type: D.RESERVED_DATA_TYPE }),
-  WINDOW: w({ text: "WINDOW", type: D.RESERVED_CLAUSE }),
-  VALUES: w({ text: "VALUES", type: D.RESERVED_CLAUSE })
-}, mT = (R) => R === D.RESERVED_DATA_TYPE || R === D.RESERVED_KEYWORD || R === D.RESERVED_FUNCTION_NAME || R === D.RESERVED_KEYWORD_PHRASE || R === D.RESERVED_DATA_TYPE_PHRASE || R === D.RESERVED_CLAUSE || R === D.RESERVED_SELECT || R === D.RESERVED_SET_OPERATION || R === D.RESERVED_JOIN || R === D.ARRAY_KEYWORD || R === D.CASE || R === D.END || R === D.WHEN || R === D.ELSE || R === D.THEN || R === D.LIMIT || R === D.BETWEEN || R === D.AND || R === D.OR || R === D.XOR, PR = (R) => R === D.AND || R === D.OR || R === D.XOR, MR = [
+  ARRAY: w({ text: "ARRAY", type: o.RESERVED_DATA_TYPE }),
+  BY: w({ text: "BY", type: o.RESERVED_KEYWORD }),
+  SET: w({ text: "SET", type: o.RESERVED_CLAUSE }),
+  STRUCT: w({ text: "STRUCT", type: o.RESERVED_DATA_TYPE }),
+  WINDOW: w({ text: "WINDOW", type: o.RESERVED_CLAUSE }),
+  VALUES: w({ text: "VALUES", type: o.RESERVED_CLAUSE })
+}, pT = (R) => R === o.RESERVED_DATA_TYPE || R === o.RESERVED_KEYWORD || R === o.RESERVED_FUNCTION_NAME || R === o.RESERVED_KEYWORD_PHRASE || R === o.RESERVED_DATA_TYPE_PHRASE || R === o.RESERVED_CLAUSE || R === o.RESERVED_SELECT || R === o.RESERVED_SET_OPERATION || R === o.RESERVED_JOIN || R === o.ARRAY_KEYWORD || R === o.CASE || R === o.END || R === o.WHEN || R === o.ELSE || R === o.THEN || R === o.LIMIT || R === o.BETWEEN || R === o.AND || R === o.OR || R === o.XOR, cR = (R) => R === o.AND || R === o.OR || R === o.XOR, lR = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/aead_encryption_functions
   "KEYS.NEW_KEYSET",
   "KEYS.ADD_KEY_FROM_RAW_BYTES",
@@ -3139,7 +3147,7 @@ const FT = (R) => ({
   // pivot
   "PIVOT",
   "UNPIVOT"
-], UR = [
+], GR = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/lexical#reserved_keywords
   "ALL",
   "AND",
@@ -3247,7 +3255,7 @@ const FT = (R) => ({
   "CASCADE",
   "RESTRICT",
   "DETERMINISTIC"
-], cR = [
+], uR = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/data-types
   "ARRAY",
   "BOOL",
@@ -3272,7 +3280,7 @@ const FT = (R) => ({
   "STRUCT",
   "TIME",
   "TIMEZONE"
-], GR = _(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), lR = _([
+], HR = _(["SELECT [ALL | DISTINCT] [AS STRUCT | AS VALUE]"]), BR = _([
   // Queries: https://cloud.google.com/bigquery/docs/reference/standard-sql/query-syntax
   "WITH [RECURSIVE]",
   "FROM",
@@ -3391,15 +3399,15 @@ const FT = (R) => ({
   "ASSERT",
   // Other, https://cloud.google.com/bigquery/docs/reference/standard-sql/other-statements
   "EXPORT DATA"
-]), uR = _([
+]), dR = _([
   "UNION {ALL | DISTINCT}",
   "EXCEPT DISTINCT",
   "INTERSECT DISTINCT"
-]), HR = _([
+]), FR = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), BR = _([
+]), pR = _([
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/query-syntax#tablesample_operator
   "TABLESAMPLE SYSTEM",
   // From DDL: https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language
@@ -3410,18 +3418,18 @@ const FT = (R) => ({
   "{ROWS | RANGE} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), dR = _([]), FR = {
+]), mR = _([]), YR = {
   name: "bigquery",
   tokenizerOptions: {
-    reservedSelect: GR,
-    reservedClauses: [...lR, ...LE, ...ZE],
-    reservedSetOperations: uR,
-    reservedJoins: HR,
-    reservedKeywordPhrases: BR,
-    reservedDataTypePhrases: dR,
-    reservedKeywords: UR,
-    reservedDataTypes: cR,
-    reservedFunctionNames: MR,
+    reservedSelect: HR,
+    reservedClauses: [...BR, ...LE, ...ZE],
+    reservedSetOperations: dR,
+    reservedJoins: FR,
+    reservedKeywordPhrases: pR,
+    reservedDataTypePhrases: mR,
+    reservedKeywords: GR,
+    reservedDataTypes: uR,
+    reservedFunctionNames: lR,
     extraParens: ["[]"],
     stringTypes: [
       // The triple-quoted strings are listed first, so they get matched first.
@@ -3439,29 +3447,29 @@ const FT = (R) => ({
     variableTypes: [{ regex: String.raw`@@\w+` }],
     lineCommentTypes: ["--", "#"],
     operators: ["&", "|", "^", "~", ">>", "<<", "||", "=>"],
-    postProcess: mR
+    postProcess: hR
   },
   formatOptions: {
     onelineClauses: [...ZE, ...LE],
     tabularOnelineClauses: LE
   }
 };
-function mR(R) {
-  return pR(YR(R));
+function hR(R) {
+  return fR(VR(R));
 }
-function pR(R) {
+function fR(R) {
   let E = v;
-  return R.map((T) => T.text === "OFFSET" && E.text === "[" ? (E = T, Object.assign(Object.assign({}, T), { type: D.RESERVED_FUNCTION_NAME })) : (E = T, T));
+  return R.map((T) => T.text === "OFFSET" && E.text === "[" ? (E = T, Object.assign(Object.assign({}, T), { type: o.RESERVED_FUNCTION_NAME })) : (E = T, T));
 }
-function YR(R) {
+function VR(R) {
   var E;
   const T = [];
   for (let A = 0; A < R.length; A++) {
     const e = R[A];
     if ((y.ARRAY(e) || y.STRUCT(e)) && ((E = R[A + 1]) === null || E === void 0 ? void 0 : E.text) === "<") {
-      const S = hR(R, A + 1), I = R.slice(A, S + 1);
+      const S = WR(R, A + 1), I = R.slice(A, S + 1);
       T.push({
-        type: D.IDENTIFIER,
+        type: o.IDENTIFIER,
         raw: I.map(qE("raw")).join(""),
         text: I.map(qE("text")).join(""),
         start: e.start
@@ -3471,8 +3479,8 @@ function YR(R) {
   }
   return T;
 }
-const qE = (R) => (E) => E.type === D.IDENTIFIER || E.type === D.COMMA ? E[R] + " " : E[R];
-function hR(R, E) {
+const qE = (R) => (E) => E.type === o.IDENTIFIER || E.type === o.COMMA ? E[R] + " " : E[R];
+function WR(R, E) {
   let T = 0;
   for (let A = E; A < R.length; A++) {
     const e = R[A];
@@ -3481,7 +3489,7 @@ function hR(R, E) {
   }
   return R.length - 1;
 }
-const fR = [
+const XR = [
   // https://www.ibm.com/docs/en/db2/11.5?topic=bif-aggregate-functions
   "ARRAY_AGG",
   "AVG",
@@ -3801,7 +3809,7 @@ const fR = [
   "RATIO_TO_REPORT",
   // Type casting
   "CAST"
-], VR = [
+], bR = [
   // https://www.ibm.com/docs/en/db2/11.5?topic=sql-reserved-schema-names-reserved-words
   "ACTIVATE",
   "ADD",
@@ -4202,7 +4210,7 @@ const fR = [
   "XMLNAMESPACES",
   "YEAR",
   "YEARS"
-], WR = [
+], yR = [
   // https://www.ibm.com/docs/en/db2-for-zos/12?topic=columns-data-types
   "ARRAY",
   "BIGINT",
@@ -4244,7 +4252,7 @@ const fR = [
   "VARBINARY",
   "VARCHAR",
   "VARGRAPHIC"
-], XR = _(["SELECT [ALL | DISTINCT]"]), bR = _([
+], KR = _(["SELECT [ALL | DISTINCT]"]), gR = _([
   // queries
   "WITH",
   "FROM",
@@ -4478,27 +4486,27 @@ const fR = [
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}",
   "WHILE"
-]), yR = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), KR = _([
+]), $R = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), wR = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN"
-]), $R = _([
+]), JR = _([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), gR = _([]), wR = {
+]), xR = _([]), vR = {
   name: "db2",
   tokenizerOptions: {
-    reservedSelect: XR,
-    reservedClauses: [...bR, ...jE, ..._E],
-    reservedSetOperations: yR,
-    reservedJoins: KR,
-    reservedKeywordPhrases: $R,
-    reservedDataTypePhrases: gR,
-    reservedKeywords: VR,
-    reservedDataTypes: WR,
-    reservedFunctionNames: fR,
+    reservedSelect: KR,
+    reservedClauses: [...gR, ...jE, ..._E],
+    reservedSetOperations: $R,
+    reservedJoins: wR,
+    reservedKeywordPhrases: JR,
+    reservedDataTypePhrases: xR,
+    reservedKeywords: bR,
+    reservedDataTypes: yR,
+    reservedFunctionNames: XR,
     extraParens: ["[]"],
     stringTypes: [
       { quote: "''-qq", prefixes: ["G", "N", "U&"] },
@@ -4532,7 +4540,7 @@ const fR = [
     onelineClauses: [...jE, ..._E],
     tabularOnelineClauses: _E
   }
-}, JR = [
+}, QR = [
   // https://www.ibm.com/docs/en/i/7.5?topic=functions-aggregate
   // TODO: 'ANY', - conflicts with test for ANY predicate in 'operators.ys'!!
   "ARRAY_AGG",
@@ -4866,7 +4874,7 @@ const fR = [
   "ROW_NUMBER",
   // Type casting
   "CAST"
-], xR = [
+], ZR = [
   // https://www.ibm.com/docs/en/i/7.5?topic=words-reserved
   // TODO: This list likely contains all keywords, not only the reserved ones,
   // try to filter it down to just the reserved keywords.
@@ -5362,7 +5370,7 @@ const fR = [
   "YEARS",
   "YES",
   "ZONE"
-], vR = [
+], qR = [
   // https://www.ibm.com/docs/en/i/7.2?topic=iaodsd-odbc-data-types-how-they-correspond-db2-i-database-types
   "ARRAY",
   "BIGINT",
@@ -5398,7 +5406,7 @@ const fR = [
   "VARCHAR",
   "VARGRAPHIC",
   "XML"
-], QR = _(["SELECT [ALL | DISTINCT]"]), ZR = _([
+], jR = _(["SELECT [ALL | DISTINCT]"]), kR = _([
   // queries
   "WITH [RECURSIVE]",
   "INTO",
@@ -5524,28 +5532,28 @@ const fR = [
   "TAG",
   "TRANSFER OWNERSHIP OF",
   "WHENEVER {NOT FOUND | SQLERROR | SQLWARNING}"
-]), qR = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), jR = _([
+]), zR = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), EA = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "[LEFT | RIGHT] EXCEPTION JOIN",
   "{INNER | CROSS} JOIN"
-]), kR = _([
+]), TA = _([
   "ON DELETE",
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), zR = _([]), EA = {
+]), RA = _([]), AA = {
   name: "db2i",
   tokenizerOptions: {
-    reservedSelect: QR,
-    reservedClauses: [...ZR, ...kE, ...rE],
-    reservedSetOperations: qR,
-    reservedJoins: jR,
-    reservedKeywordPhrases: kR,
-    reservedDataTypePhrases: zR,
-    reservedKeywords: xR,
-    reservedDataTypes: vR,
-    reservedFunctionNames: JR,
+    reservedSelect: jR,
+    reservedClauses: [...kR, ...kE, ...rE],
+    reservedSetOperations: zR,
+    reservedJoins: EA,
+    reservedKeywordPhrases: TA,
+    reservedDataTypePhrases: RA,
+    reservedKeywords: ZR,
+    reservedDataTypes: qR,
+    reservedFunctionNames: QR,
     nestedBlockComments: !0,
     extraParens: ["[]"],
     stringTypes: [
@@ -5562,7 +5570,7 @@ const fR = [
     onelineClauses: [...kE, ...rE],
     tabularOnelineClauses: rE
   }
-}, TA = [
+}, eA = [
   // Functions from DuckDB (excluding those that start with an underscore):
   // SELECT DISTINCT upper(function_name) AS function_name
   // FROM duckdb_functions()
@@ -6225,7 +6233,7 @@ const fR = [
   // 'NULL', we really prefer treating it as keyword
   "RANK",
   "ROW_NUMBER"
-], RA = [
+], SA = [
   // Keywords from DuckDB:
   // SELECT upper(keyword_name)
   // FROM duckdb_keywords()
@@ -6307,7 +6315,7 @@ const fR = [
   "WHERE",
   "WINDOW",
   "WITH"
-], AA = [
+], IA = [
   // Types from DuckDB:
   // SELECT DISTINCT upper(type_name)
   // FROM duckdb_types()
@@ -6387,7 +6395,7 @@ const fR = [
   "UUID",
   "VARBINARY",
   "VARCHAR"
-], eA = _(["SELECT [ALL | DISTINCT]"]), SA = _([
+], OA = _(["SELECT [ALL | DISTINCT]"]), NA = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -6491,11 +6499,11 @@ const fR = [
   "PREPARE",
   "EXECUTE",
   "DEALLOCATE [PREPARE]"
-]), IA = _([
+]), tA = _([
   "UNION [ALL | BY NAME]",
   "EXCEPT [ALL]",
   "INTERSECT [ALL]"
-]), OA = _([
+]), sA = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -6504,23 +6512,23 @@ const fR = [
   "POSITIONAL JOIN",
   "ANTI JOIN",
   "SEMI JOIN"
-]), NA = _([
+]), CA = _([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "SIMILAR TO",
   "IS [NOT] DISTINCT FROM"
-]), tA = _(["TIMESTAMP WITH TIME ZONE"]), sA = {
+]), LA = _(["TIMESTAMP WITH TIME ZONE"]), _A = {
   name: "duckdb",
   tokenizerOptions: {
-    reservedSelect: eA,
-    reservedClauses: [...SA, ...zE, ...nE],
-    reservedSetOperations: IA,
-    reservedJoins: OA,
-    reservedKeywordPhrases: NA,
-    reservedDataTypePhrases: tA,
+    reservedSelect: OA,
+    reservedClauses: [...NA, ...zE, ...nE],
+    reservedSetOperations: tA,
+    reservedJoins: sA,
+    reservedKeywordPhrases: CA,
+    reservedDataTypePhrases: LA,
     supportsXor: !0,
-    reservedKeywords: RA,
-    reservedDataTypes: AA,
-    reservedFunctionNames: TA,
+    reservedKeywords: SA,
+    reservedDataTypes: IA,
+    reservedFunctionNames: eA,
     nestedBlockComments: !0,
     extraParens: ["[]", "{}"],
     underscoresInNumbers: !0,
@@ -6584,7 +6592,7 @@ const fR = [
     onelineClauses: [...zE, ...nE],
     tabularOnelineClauses: nE
   }
-}, CA = [
+}, rA = [
   // https://cwiki.apache.org/confluence/display/Hive/LanguageManual+UDF
   // math
   "ABS",
@@ -6792,7 +6800,7 @@ const fR = [
   "CUME_DIST",
   "PERCENT_RANK",
   "NTILE"
-], LA = [
+], nA = [
   // https://cwiki.apache.org/confluence/display/hive/languagemanual+ddl
   // Non-reserved keywords have proscribed meanings in. HiveQL, but can still be used as table or column names
   "ADD",
@@ -7107,7 +7115,7 @@ const fR = [
   "JSONFILE",
   "INPUTFORMAT",
   "OUTPUTFORMAT"
-], _A = [
+], iA = [
   // https://cwiki.apache.org/confluence/display/Hive/LanguageManual+Types
   "ARRAY",
   "BIGINT",
@@ -7128,7 +7136,7 @@ const fR = [
   "STRUCT",
   "TIMESTAMP",
   "VARCHAR"
-], rA = _(["SELECT [ALL | DISTINCT]"]), nA = _([
+], aA = _(["SELECT [ALL | DISTINCT]"]), oA = _([
   // queries
   "WITH",
   "FROM",
@@ -7189,24 +7197,24 @@ const fR = [
   "STORED AS",
   "STORED BY",
   "ROW FORMAT"
-]), iA = _(["UNION [ALL | DISTINCT]"]), aA = _([
+]), DA = _(["UNION [ALL | DISTINCT]"]), PA = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "LEFT SEMI JOIN"
-]), oA = _(["{ROWS | RANGE} BETWEEN"]), DA = _([]), PA = {
+]), MA = _(["{ROWS | RANGE} BETWEEN"]), UA = _([]), cA = {
   name: "hive",
   tokenizerOptions: {
-    reservedSelect: rA,
-    reservedClauses: [...nA, ...ET, ...iE],
-    reservedSetOperations: iA,
-    reservedJoins: aA,
-    reservedKeywordPhrases: oA,
-    reservedDataTypePhrases: DA,
-    reservedKeywords: LA,
-    reservedDataTypes: _A,
-    reservedFunctionNames: CA,
+    reservedSelect: aA,
+    reservedClauses: [...oA, ...ET, ...iE],
+    reservedSetOperations: DA,
+    reservedJoins: PA,
+    reservedKeywordPhrases: MA,
+    reservedDataTypePhrases: UA,
+    reservedKeywords: nA,
+    reservedDataTypes: iA,
+    reservedFunctionNames: rA,
     extraParens: ["[]"],
     stringTypes: ['""-bs', "''-bs"],
     identTypes: ["``"],
@@ -7222,12 +7230,12 @@ function AE(R) {
   return R.map((E, T) => {
     const A = R[T + 1] || v;
     if (y.SET(E) && A.text === "(")
-      return Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME });
+      return Object.assign(Object.assign({}, E), { type: o.RESERVED_FUNCTION_NAME });
     const e = R[T - 1] || v;
-    return y.VALUES(E) && e.text === "=" ? Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME }) : E;
+    return y.VALUES(E) && e.text === "=" ? Object.assign(Object.assign({}, E), { type: o.RESERVED_FUNCTION_NAME }) : E;
   });
 }
-const MA = [
+const lA = [
   // https://mariadb.com/kb/en/reserved-words/
   "ACCESSIBLE",
   "ADD",
@@ -7444,7 +7452,7 @@ const MA = [
   "XOR",
   "YEAR_MONTH",
   "ZEROFILL"
-], UA = [
+], GA = [
   // https://mariadb.com/kb/en/data-types/
   "BIGINT",
   "BINARY",
@@ -7495,7 +7503,7 @@ const MA = [
   "YEAR"
   // 'NUMBER', // ?? In oracle mode only
   // 'SET' // handled as special-case in postProcess
-], cA = [
+], uA = [
   // https://mariadb.com/kb/en/information-schema-sql_functions-table/
   "ADDDATE",
   "ADD_MONTHS",
@@ -7733,7 +7741,7 @@ const MA = [
   // CASE expression shorthands
   "COALESCE",
   "NULLIF"
-], GA = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), lA = _([
+], HA = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), BA = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -7964,12 +7972,12 @@ const MA = [
   "XA RECOVER",
   "XA ROLLBACK",
   "XA START"
-]), uA = _([
+]), dA = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]",
   "MINUS [ALL | DISTINCT]"
-]), HA = _([
+]), FA = _([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -7977,24 +7985,24 @@ const MA = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), BA = _([
+]), pA = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), dA = _([]), FA = {
+]), mA = _([]), YA = {
   name: "mariadb",
   tokenizerOptions: {
-    reservedSelect: GA,
-    reservedClauses: [...lA, ...TT, ...aE],
-    reservedSetOperations: uA,
-    reservedJoins: HA,
-    reservedKeywordPhrases: BA,
-    reservedDataTypePhrases: dA,
+    reservedSelect: HA,
+    reservedClauses: [...BA, ...TT, ...aE],
+    reservedSetOperations: dA,
+    reservedJoins: FA,
+    reservedKeywordPhrases: pA,
+    reservedDataTypePhrases: mA,
     supportsXor: !0,
-    reservedKeywords: MA,
-    reservedDataTypes: UA,
-    reservedFunctionNames: cA,
+    reservedKeywords: lA,
+    reservedDataTypes: GA,
+    reservedFunctionNames: uA,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -8033,7 +8041,7 @@ const MA = [
     onelineClauses: [...TT, ...aE],
     tabularOnelineClauses: aE
   }
-}, mA = [
+}, hA = [
   // https://dev.mysql.com/doc/refman/8.0/en/keywords.html
   "ACCESSIBLE",
   "ADD",
@@ -8264,7 +8272,7 @@ const MA = [
   "YEAR_MONTH",
   "ZEROFILL"
   // (R)
-], pA = [
+], fA = [
   // https://dev.mysql.com/doc/refman/8.0/en/data-types.html
   "BIGINT",
   "BINARY",
@@ -8316,7 +8324,7 @@ const MA = [
   "VARYING",
   "YEAR"
   // 'SET' // handled as special-case in postProcess
-], YA = [
+], VA = [
   // https://dev.mysql.com/doc/refman/8.0/en/built-in-function-reference.html
   "ABS",
   "ACOS",
@@ -8739,7 +8747,7 @@ const MA = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], hA = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), fA = _([
+], WA = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), XA = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -8940,7 +8948,7 @@ const MA = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), VA = _(["UNION [ALL | DISTINCT]"]), WA = _([
+]), bA = _(["UNION [ALL | DISTINCT]"]), yA = _([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -8948,24 +8956,24 @@ const MA = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), XA = _([
+]), KA = _([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), bA = _([]), yA = {
+]), gA = _([]), $A = {
   name: "mysql",
   tokenizerOptions: {
-    reservedSelect: hA,
-    reservedClauses: [...fA, ...RT, ...oE],
-    reservedSetOperations: VA,
-    reservedJoins: WA,
-    reservedKeywordPhrases: XA,
-    reservedDataTypePhrases: bA,
+    reservedSelect: WA,
+    reservedClauses: [...XA, ...RT, ...oE],
+    reservedSetOperations: bA,
+    reservedJoins: yA,
+    reservedKeywordPhrases: KA,
+    reservedDataTypePhrases: gA,
     supportsXor: !0,
-    reservedKeywords: mA,
-    reservedDataTypes: pA,
-    reservedFunctionNames: YA,
+    reservedKeywords: hA,
+    reservedDataTypes: fA,
+    reservedFunctionNames: VA,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -9006,7 +9014,7 @@ const MA = [
     onelineClauses: [...RT, ...oE],
     tabularOnelineClauses: oE
   }
-}, KA = [
+}, wA = [
   // https://docs.pingcap.com/tidb/stable/keywords
   "ADD",
   "ALL",
@@ -9198,7 +9206,7 @@ const MA = [
   "YEAR_MONTH",
   "ZEROFILL"
   // (R)
-], $A = [
+], JA = [
   // https://docs.pingcap.com/tidb/stable/data-type-overview
   "BIGINT",
   "BINARY",
@@ -9245,7 +9253,7 @@ const MA = [
   "VARYING",
   "YEAR"
   // 'SET' // handled as special-case in postProcess
-], gA = [
+], xA = [
   // https://docs.pingcap.com/tidb/stable/sql-statement-show-builtins
   // https://docs.pingcap.com/tidb/stable/functions-and-operators-overview
   // + MySQL aggregate functions: https://dev.mysql.com/doc/refman/8.0/en/aggregate-functions.html
@@ -9571,7 +9579,7 @@ const MA = [
   // 'XOR',
   "YEAR",
   "YEARWEEK"
-], wA = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), JA = _([
+], vA = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), QA = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -9706,7 +9714,7 @@ const MA = [
   "UNLOCK TABLES",
   // https://docs.pingcap.com/tidb/stable/sql-statement-use
   "USE"
-]), xA = _(["UNION [ALL | DISTINCT]"]), vA = _([
+]), ZA = _(["UNION [ALL | DISTINCT]"]), qA = _([
   "JOIN",
   "{LEFT | RIGHT} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -9714,24 +9722,24 @@ const MA = [
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), QA = _([
+]), jA = _([
   "ON {UPDATE | DELETE} [SET NULL]",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), ZA = _([]), qA = {
+]), kA = _([]), zA = {
   name: "tidb",
   tokenizerOptions: {
-    reservedSelect: wA,
-    reservedClauses: [...JA, ...AT, ...DE],
-    reservedSetOperations: xA,
-    reservedJoins: vA,
-    reservedKeywordPhrases: QA,
-    reservedDataTypePhrases: ZA,
+    reservedSelect: vA,
+    reservedClauses: [...QA, ...AT, ...DE],
+    reservedSetOperations: ZA,
+    reservedJoins: qA,
+    reservedKeywordPhrases: jA,
+    reservedDataTypePhrases: kA,
     supportsXor: !0,
-    reservedKeywords: KA,
-    reservedDataTypes: $A,
-    reservedFunctionNames: gA,
+    reservedKeywords: wA,
+    reservedDataTypes: JA,
+    reservedFunctionNames: xA,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
       '""-qq-bs',
@@ -9772,7 +9780,7 @@ const MA = [
     onelineClauses: [...AT, ...DE],
     tabularOnelineClauses: DE
   }
-}, jA = [
+}, Ee = [
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/functions.html
   "ABORT",
   "ABS",
@@ -10002,7 +10010,7 @@ const MA = [
   // not implemented in N1QL, but added here now for the sake of tests
   // https://docs.couchbase.com/server/current/analytics/3_query.html#Vs_SQL-92
   "CAST"
-], kA = [
+], Te = [
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/reservedwords.html
   "ADVISE",
   "ALL",
@@ -10208,7 +10216,7 @@ const MA = [
   "WITHIN",
   "WORK",
   "XOR"
-], zA = [
+], Re = [
   // N1QL does not support any way of declaring types for columns.
   // It does not support the CREATE TABLE statement nor the CAST() expression.
   //
@@ -10217,7 +10225,7 @@ const MA = [
   // which it actually doesn't use.
   //
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/datatypes.html
-], Ee = _(["SELECT [ALL | DISTINCT]"]), Te = _([
+], Ae = _(["SELECT [ALL | DISTINCT]"]), ee = _([
   // queries
   "WITH",
   "FROM",
@@ -10284,19 +10292,19 @@ const MA = [
   "SET CURRENT SCHEMA",
   "SHOW",
   "USE [PRIMARY] KEYS"
-]), Re = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), Ae = _(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), ee = _(["{ROWS | RANGE | GROUPS} BETWEEN"]), Se = _([]), Ie = {
+]), Se = _(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), Ie = _(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), Oe = _(["{ROWS | RANGE | GROUPS} BETWEEN"]), Ne = _([]), te = {
   name: "n1ql",
   tokenizerOptions: {
-    reservedSelect: Ee,
-    reservedClauses: [...Te, ...eT],
-    reservedSetOperations: Re,
-    reservedJoins: Ae,
-    reservedKeywordPhrases: ee,
-    reservedDataTypePhrases: Se,
+    reservedSelect: Ae,
+    reservedClauses: [...ee, ...eT],
+    reservedSetOperations: Se,
+    reservedJoins: Ie,
+    reservedKeywordPhrases: Oe,
+    reservedDataTypePhrases: Ne,
     supportsXor: !0,
-    reservedKeywords: kA,
-    reservedDataTypes: zA,
-    reservedFunctionNames: jA,
+    reservedKeywords: Te,
+    reservedDataTypes: Re,
+    reservedFunctionNames: Ee,
     // NOTE: single quotes are actually not supported in N1QL,
     // but we support them anyway as all other SQL dialects do,
     // which simplifies writing tests that are shared between all dialects.
@@ -10310,7 +10318,7 @@ const MA = [
   formatOptions: {
     onelineClauses: eT
   }
-}, Oe = [
+}, se = [
   // https://docs.oracle.com/cd/B19306_01/appdev.102/b14261/reservewords.htm
   // 'A',
   "ADD",
@@ -10615,7 +10623,7 @@ const MA = [
   "WRITE",
   "YEAR",
   "ZONE"
-], Ne = [
+], Ce = [
   // https://www.ibm.com/docs/en/db2/10.5?topic=plsql-data-types
   "ARRAY",
   "BFILE_BASE",
@@ -10653,7 +10661,7 @@ const MA = [
   "UROWID",
   "VARCHAR",
   "VARCHAR2"
-], te = [
+], Le = [
   // https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions001.htm
   // numeric
   "ABS",
@@ -10918,7 +10926,7 @@ const MA = [
   "PRESENTNNV",
   "PRESENTV",
   "PREVIOUS"
-], se = _(["SELECT [ALL | DISTINCT | UNIQUE]"]), Ce = _([
+], _e = _(["SELECT [ALL | DISTINCT | UNIQUE]"]), re = _([
   // queries
   "WITH",
   "FROM",
@@ -10972,7 +10980,7 @@ const MA = [
   "EXCEPTION",
   "LOOP",
   "START WITH"
-]), Le = _(["UNION [ALL]", "MINUS", "INTERSECT"]), _e = _([
+]), ne = _(["UNION [ALL]", "MINUS", "INTERSECT"]), ie = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -10980,23 +10988,23 @@ const MA = [
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), re = _([
+]), ae = _([
   "ON {UPDATE | DELETE} [SET NULL]",
   "ON COMMIT",
   "{ROWS | RANGE} BETWEEN"
-]), ne = _([]), ie = {
+]), oe = _([]), De = {
   name: "plsql",
   tokenizerOptions: {
-    reservedSelect: se,
-    reservedClauses: [...Ce, ...ST, ...PE],
-    reservedSetOperations: Le,
-    reservedJoins: _e,
-    reservedKeywordPhrases: re,
-    reservedDataTypePhrases: ne,
+    reservedSelect: _e,
+    reservedClauses: [...re, ...ST, ...PE],
+    reservedSetOperations: ne,
+    reservedJoins: ie,
+    reservedKeywordPhrases: ae,
+    reservedDataTypePhrases: oe,
     supportsXor: !0,
-    reservedKeywords: Oe,
-    reservedDataTypes: Ne,
-    reservedFunctionNames: te,
+    reservedKeywords: se,
+    reservedDataTypes: Ce,
+    reservedFunctionNames: Le,
     stringTypes: [
       { quote: "''-qq", prefixes: ["N"] },
       { quote: "q''", prefixes: ["N"] }
@@ -11021,7 +11029,7 @@ const MA = [
       "@",
       "||"
     ],
-    postProcess: ae
+    postProcess: Pe
   },
   formatOptions: {
     alwaysDenseOperators: ["@"],
@@ -11029,11 +11037,11 @@ const MA = [
     tabularOnelineClauses: PE
   }
 };
-function ae(R) {
+function Pe(R) {
   let E = v;
-  return R.map((T) => y.SET(T) && y.BY(E) ? Object.assign(Object.assign({}, T), { type: D.RESERVED_KEYWORD }) : (mT(T.type) && (E = T), T));
+  return R.map((T) => y.SET(T) && y.BY(E) ? Object.assign(Object.assign({}, T), { type: o.RESERVED_KEYWORD }) : (pT(T.type) && (E = T), T));
 }
-const oe = [
+const Me = [
   // https://www.postgresql.org/docs/14/functions.html
   //
   // https://www.postgresql.org/docs/14/functions-math.html
@@ -11717,7 +11725,7 @@ const oe = [
   "PG_MCV_LIST_ITEMS",
   // cast
   "CAST"
-], De = [
+], Ue = [
   // https://www.postgresql.org/docs/14/sql-keywords-appendix.html
   "ALL",
   "ANALYSE",
@@ -11836,7 +11844,7 @@ const oe = [
   "WITHOUT",
   "YEAR"
   // requires AS
-], Pe = [
+], ce = [
   // https://www.postgresql.org/docs/current/datatype.html
   "ARRAY",
   "BIGINT",
@@ -11870,7 +11878,7 @@ const oe = [
   "VARCHAR",
   "XML",
   "ZONE"
-], Me = _(["SELECT [ALL | DISTINCT]"]), Ue = _([
+], le = _(["SELECT [ALL | DISTINCT]"]), Ge = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -12093,17 +12101,17 @@ const oe = [
   "START TRANSACTION",
   "UNLISTEN",
   "VACUUM"
-]), ce = _([
+]), ue = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), Ge = _([
+]), He = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), le = _([
+]), Be = _([
   "PRIMARY KEY",
   "GENERATED {ALWAYS | BY DEFAULT} AS IDENTITY",
   "ON {UPDATE | DELETE} [NO ACTION | RESTRICT | CASCADE | SET NULL | SET DEFAULT]",
@@ -12114,21 +12122,21 @@ const oe = [
   "IS [NOT] DISTINCT FROM",
   "NULLS {FIRST | LAST}",
   "WITH ORDINALITY"
-]), ue = _([
+]), de = _([
   // https://www.postgresql.org/docs/current/datatype-datetime.html
   "[TIMESTAMP | TIME] {WITH | WITHOUT} TIME ZONE"
-]), He = {
+]), Fe = {
   name: "postgresql",
   tokenizerOptions: {
-    reservedSelect: Me,
-    reservedClauses: [...Ue, ...IT, ...ME],
-    reservedSetOperations: ce,
-    reservedJoins: Ge,
-    reservedKeywordPhrases: le,
-    reservedDataTypePhrases: ue,
-    reservedKeywords: De,
-    reservedDataTypes: Pe,
-    reservedFunctionNames: oe,
+    reservedSelect: le,
+    reservedClauses: [...Ge, ...IT, ...ME],
+    reservedSetOperations: ue,
+    reservedJoins: He,
+    reservedKeywordPhrases: Be,
+    reservedDataTypePhrases: de,
+    reservedKeywords: Ue,
+    reservedDataTypes: ce,
+    reservedFunctionNames: Me,
     nestedBlockComments: !0,
     extraParens: ["[]"],
     underscoresInNumbers: !0,
@@ -12243,7 +12251,7 @@ const oe = [
     onelineClauses: [...IT, ...ME],
     tabularOnelineClauses: ME
   }
-}, Be = [
+}, pe = [
   // https://docs.aws.amazon.com/redshift/latest/dg/c_Aggregate_Functions.html
   "ANY_VALUE",
   "APPROXIMATE PERCENTILE_DISC",
@@ -12589,7 +12597,7 @@ const oe = [
   "SLICE_NUM",
   "USER",
   "VERSION"
-], de = [
+], me = [
   // https://docs.aws.amazon.com/redshift/latest/dg/r_pg_keywords.html
   "AES128",
   "AES256",
@@ -12778,7 +12786,7 @@ const oe = [
    * SVL: https://docs.aws.amazon.com/redshift/latest/dg/svl_views.html
    * SVV: https://docs.aws.amazon.com/redshift/latest/dg/svv_views.html
    */
-], Fe = [
+], Ye = [
   // https://docs.aws.amazon.com/redshift/latest/dg/r_Character_types.html#r_Character_types-text-and-bpchar-types
   "ARRAY",
   "BIGINT",
@@ -12799,7 +12807,7 @@ const oe = [
   "TEXT",
   "VARBYTE",
   "VARCHAR"
-], me = _(["SELECT [ALL | DISTINCT]"]), pe = _([
+], he = _(["SELECT [ALL | DISTINCT]"]), fe = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -12910,13 +12918,13 @@ const oe = [
   "START TRANSACTION",
   "UNLOAD",
   "VACUUM"
-]), Ye = _(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), he = _([
+]), Ve = _(["UNION [ALL]", "EXCEPT", "INTERSECT", "MINUS"]), We = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), fe = _([
+]), Xe = _([
   // https://docs.aws.amazon.com/redshift/latest/dg/copy-parameters-data-conversion.html
   "NULL AS",
   // https://docs.aws.amazon.com/redshift/latest/dg/r_CREATE_EXTERNAL_SCHEMA.html
@@ -12924,18 +12932,18 @@ const oe = [
   "HIVE METASTORE",
   // in window specifications
   "{ROWS | RANGE} BETWEEN"
-]), Ve = _([]), We = {
+]), be = _([]), ye = {
   name: "redshift",
   tokenizerOptions: {
-    reservedSelect: me,
-    reservedClauses: [...pe, ...OT, ...UE],
-    reservedSetOperations: Ye,
-    reservedJoins: he,
-    reservedKeywordPhrases: fe,
-    reservedDataTypePhrases: Ve,
-    reservedKeywords: de,
-    reservedDataTypes: Fe,
-    reservedFunctionNames: Be,
+    reservedSelect: he,
+    reservedClauses: [...fe, ...OT, ...UE],
+    reservedSetOperations: Ve,
+    reservedJoins: We,
+    reservedKeywordPhrases: Xe,
+    reservedDataTypePhrases: be,
+    reservedKeywords: me,
+    reservedDataTypes: Ye,
+    reservedFunctionNames: pe,
     extraParens: ["[]"],
     stringTypes: ["''-qq"],
     identTypes: ['""-qq'],
@@ -12962,7 +12970,7 @@ const oe = [
     onelineClauses: [...OT, ...UE],
     tabularOnelineClauses: UE
   }
-}, Xe = [
+}, Ke = [
   // https://deepkb.com/CO_000013/en/kb/IMPORT-fbfa59f0-2bf1-31fe-bb7b-0f9efe9932c6/spark-sql-keywords
   "ADD",
   "AFTER",
@@ -13229,7 +13237,7 @@ const oe = [
   "UNSIGNED",
   "VARIABLES",
   "YEAR_MONTH"
-], be = [
+], ge = [
   // https://spark.apache.org/docs/latest/sql-ref-datatypes.html
   "ARRAY",
   "BIGINT",
@@ -13259,7 +13267,7 @@ const oe = [
   "TINYINT",
   "VARCHAR"
   // No varchar type in Spark, only STRING. Added for the sake of tests
-], ye = [
+], $e = [
   // http://spark.apache.org/docs/latest/sql-ref-functions.html
   //
   // http://spark.apache.org/docs/latest/sql-ref-functions-builtin.html#aggregate-functions
@@ -13580,7 +13588,7 @@ const oe = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], Ke = _(["SELECT [ALL | DISTINCT]"]), $e = _([
+], we = _(["SELECT [ALL | DISTINCT]"]), Je = _([
   // queries
   "WITH",
   "FROM",
@@ -13661,11 +13669,11 @@ const oe = [
   "SHOW TBLPROPERTIES",
   "SHOW VIEWS",
   "UNCACHE TABLE"
-]), ge = _([
+]), xe = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), we = _([
+]), ve = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -13674,24 +13682,24 @@ const oe = [
   // non-standard-joins
   "[LEFT] {ANTI | SEMI} JOIN",
   "NATURAL [LEFT] {ANTI | SEMI} JOIN"
-]), Je = _([
+]), Qe = _([
   "ON DELETE",
   "ON UPDATE",
   "CURRENT ROW",
   "{ROWS | RANGE} BETWEEN"
-]), xe = _([]), ve = {
+]), Ze = _([]), qe = {
   name: "spark",
   tokenizerOptions: {
-    reservedSelect: Ke,
-    reservedClauses: [...$e, ...NT, ...cE],
-    reservedSetOperations: ge,
-    reservedJoins: we,
-    reservedKeywordPhrases: Je,
-    reservedDataTypePhrases: xe,
+    reservedSelect: we,
+    reservedClauses: [...Je, ...NT, ...cE],
+    reservedSetOperations: xe,
+    reservedJoins: ve,
+    reservedKeywordPhrases: Qe,
+    reservedDataTypePhrases: Ze,
     supportsXor: !0,
-    reservedKeywords: Xe,
-    reservedDataTypes: be,
-    reservedFunctionNames: ye,
+    reservedKeywords: Ke,
+    reservedDataTypes: ge,
+    reservedFunctionNames: $e,
     extraParens: ["[]"],
     stringTypes: [
       "''-bs",
@@ -13703,20 +13711,20 @@ const oe = [
     identChars: { allowFirstCharNumber: !0 },
     variableTypes: [{ quote: "{}", prefixes: ["$"], requirePrefix: !0 }],
     operators: ["%", "~", "^", "|", "&", "<=>", "==", "!", "||", "->"],
-    postProcess: Qe
+    postProcess: je
   },
   formatOptions: {
     onelineClauses: [...NT, ...cE],
     tabularOnelineClauses: cE
   }
 };
-function Qe(R) {
+function je(R) {
   return R.map((E, T) => {
     const A = R[T - 1] || v, e = R[T + 1] || v;
-    return y.WINDOW(E) && e.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" && e.text === "TERMINATED") ? Object.assign(Object.assign({}, E), { type: D.IDENTIFIER, text: E.raw }) : E;
+    return y.WINDOW(E) && e.type === o.OPEN_PAREN ? Object.assign(Object.assign({}, E), { type: o.RESERVED_FUNCTION_NAME }) : E.text === "ITEMS" && E.type === o.RESERVED_KEYWORD && !(A.text === "COLLECTION" && e.text === "TERMINATED") ? Object.assign(Object.assign({}, E), { type: o.IDENTIFIER, text: E.raw }) : E;
   });
 }
-const Ze = [
+const ke = [
   // https://www.sqlite.org/lang_corefunc.html
   "ABS",
   "CHANGES",
@@ -13840,7 +13848,7 @@ const Ze = [
   "JSON_TREE",
   // cast
   "CAST"
-], qe = [
+], ze = [
   // https://www.sqlite.org/lang_keywords.html
   // Note: The keywords listed on that URL are not all reserved keywords.
   // We'll need to clean up this list to only include reserved keywords.
@@ -13993,7 +14001,7 @@ const Ze = [
   "WINDOW",
   "WITH",
   "WITHOUT"
-], je = [
+], ES = [
   // SQLite allows any word as a data type, e.g. CREATE TABLE foo (col1 madeupname(123));
   // Here we just list some common ones as SQL Formatter
   // is only able to detect a predefined list of data types.
@@ -14014,7 +14022,7 @@ const Ze = [
   "TEXT",
   "VARCHAR",
   "VARYING CHARACTER"
-], ke = _(["SELECT [ALL | DISTINCT]"]), ze = _([
+], TS = _(["SELECT [ALL | DISTINCT]"]), RS = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -14035,7 +14043,7 @@ const Ze = [
   "SET",
   // other:
   "RETURNING"
-]), tT = _(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), GE = _([
+]), tT = _(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), lE = _([
   // - create:
   "CREATE [TEMPORARY | TEMP] VIEW [IF NOT EXISTS]",
   // - update:
@@ -14054,28 +14062,28 @@ const Ze = [
   "RENAME TO",
   // - set schema
   "SET SCHEMA"
-]), ES = _(["UNION [ALL]", "EXCEPT", "INTERSECT"]), TS = _([
+]), AS = _(["UNION [ALL]", "EXCEPT", "INTERSECT"]), eS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), RS = _([
+]), SS = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "DO UPDATE"
-]), AS = _([]), eS = {
+]), IS = _([]), OS = {
   name: "sqlite",
   tokenizerOptions: {
-    reservedSelect: ke,
-    reservedClauses: [...ze, ...tT, ...GE],
-    reservedSetOperations: ES,
-    reservedJoins: TS,
-    reservedKeywordPhrases: RS,
-    reservedDataTypePhrases: AS,
-    reservedKeywords: qe,
-    reservedDataTypes: je,
-    reservedFunctionNames: Ze,
+    reservedSelect: TS,
+    reservedClauses: [...RS, ...tT, ...lE],
+    reservedSetOperations: AS,
+    reservedJoins: eS,
+    reservedKeywordPhrases: SS,
+    reservedDataTypePhrases: IS,
+    reservedKeywords: ze,
+    reservedDataTypes: ES,
+    reservedFunctionNames: ke,
     stringTypes: [
       "''-qq",
       { quote: "''-raw", prefixes: ["X"], requirePrefix: !0 }
@@ -14088,10 +14096,10 @@ const Ze = [
     operators: ["%", "~", "&", "|", "<<", ">>", "==", "->", "->>", "||"]
   },
   formatOptions: {
-    onelineClauses: [...tT, ...GE],
-    tabularOnelineClauses: GE
+    onelineClauses: [...tT, ...lE],
+    tabularOnelineClauses: lE
   }
-}, SS = [
+}, NS = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#_6_9_set_function_specification
   "GROUPING",
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#_6_10_window_function
@@ -14188,7 +14196,7 @@ const Ze = [
   "ASIN",
   "ACOS",
   "ATAN"
-], IS = [
+], tS = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#reserved-word
   "ALL",
   "ALLOCATE",
@@ -14386,7 +14394,7 @@ const Ze = [
   "WITHIN",
   "WITHOUT",
   "YEAR"
-], OS = [
+], sS = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#_6_1_data_type
   "ARRAY",
   "BIGINT",
@@ -14426,7 +14434,7 @@ const Ze = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], NS = _(["SELECT [ALL | DISTINCT]"]), tS = _([
+], CS = _(["SELECT [ALL | DISTINCT]"]), LS = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -14445,7 +14453,7 @@ const Ze = [
   "VALUES",
   // - update:
   "SET"
-]), sT = _(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), lE = _([
+]), sT = _(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), GE = _([
   // - create:
   "CREATE [RECURSIVE] VIEW",
   // - update:
@@ -14470,31 +14478,31 @@ const Ze = [
   "TRUNCATE TABLE",
   // other
   "SET SCHEMA"
-]), sS = _([
+]), _S = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), CS = _([
+]), rS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), LS = _([
+]), nS = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), _S = _([]), rS = {
+]), iS = _([]), aS = {
   name: "sql",
   tokenizerOptions: {
-    reservedSelect: NS,
-    reservedClauses: [...tS, ...sT, ...lE],
-    reservedSetOperations: sS,
-    reservedJoins: CS,
-    reservedKeywordPhrases: LS,
-    reservedDataTypePhrases: _S,
-    reservedKeywords: IS,
-    reservedDataTypes: OS,
-    reservedFunctionNames: SS,
+    reservedSelect: CS,
+    reservedClauses: [...LS, ...sT, ...GE],
+    reservedSetOperations: _S,
+    reservedJoins: rS,
+    reservedKeywordPhrases: nS,
+    reservedDataTypePhrases: iS,
+    reservedKeywords: tS,
+    reservedDataTypes: sS,
+    reservedFunctionNames: NS,
     stringTypes: [
       { quote: "''-qq-bs", prefixes: ["N", "U&"] },
       { quote: "''-raw", prefixes: ["X"], requirePrefix: !0 }
@@ -14504,10 +14512,10 @@ const Ze = [
     operators: ["||"]
   },
   formatOptions: {
-    onelineClauses: [...sT, ...lE],
-    tabularOnelineClauses: lE
+    onelineClauses: [...sT, ...GE],
+    tabularOnelineClauses: GE
   }
-}, nS = [
+}, oS = [
   // https://github.com/trinodb/trino/tree/432d2897bdef99388c1a47188743a061c4ac1f34/docs/src/main/sphinx/functions
   // rg '^\.\. function::' ./docs/src/main/sphinx/functions | cut -d' ' -f 3 | cut -d '(' -f 1 | sort | uniq
   // rg '\* ' ./docs/src/main/sphinx/functions/list-by-topic.rst | grep    '\* :func:' | cut -d'`' -f 2
@@ -14941,7 +14949,7 @@ const Ze = [
   "NEXT",
   "PERMUTE",
   "PREV"
-], iS = [
+], DS = [
   // https://github.com/trinodb/trino/blob/432d2897bdef99388c1a47188743a061c4ac1f34/core/trino-parser/src/main/antlr4/io/trino/sql/parser/SqlBase.g4#L858-L1128
   "ABSENT",
   "ADD",
@@ -15178,7 +15186,7 @@ const Ze = [
   "WRAPPER",
   "WRITE",
   "ZONE"
-], aS = [
+], PS = [
   // https://github.com/trinodb/trino/blob/432d2897bdef99388c1a47188743a061c4ac1f34/core/trino-main/src/main/java/io/trino/metadata/TypeRegistry.java#L131-L168
   // or https://trino.io/docs/current/language/types.html
   "BIGINT",
@@ -15217,7 +15225,7 @@ const Ze = [
   "CODEPOINTS",
   "FUNCTION",
   "JSONPATH"
-], oS = _(["SELECT [ALL | DISTINCT]"]), DS = _([
+], MS = _(["SELECT [ALL | DISTINCT]"]), US = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -15303,32 +15311,32 @@ const Ze = [
   "SHOW ROLE GRANTS",
   "SHOW FUNCTIONS",
   "SHOW SESSION"
-]), PS = _([
+]), cS = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), MS = _([
+]), lS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), US = _([
+]), GS = _([
   "{ROWS | RANGE | GROUPS} BETWEEN",
   // comparison operator
   "IS [NOT] DISTINCT FROM"
-]), cS = _([]), GS = {
+]), uS = _([]), HS = {
   name: "trino",
   tokenizerOptions: {
-    reservedSelect: oS,
-    reservedClauses: [...DS, ...CT, ...uE],
-    reservedSetOperations: PS,
-    reservedJoins: MS,
-    reservedKeywordPhrases: US,
-    reservedDataTypePhrases: cS,
-    reservedKeywords: iS,
-    reservedDataTypes: aS,
-    reservedFunctionNames: nS,
+    reservedSelect: MS,
+    reservedClauses: [...US, ...CT, ...uE],
+    reservedSetOperations: cS,
+    reservedJoins: lS,
+    reservedKeywordPhrases: GS,
+    reservedDataTypePhrases: uS,
+    reservedKeywords: DS,
+    reservedDataTypes: PS,
+    reservedFunctionNames: oS,
     // Trino also supports {- ... -} parenthesis.
     // The formatting of these currently works out as a result of { and -
     // not getting a space added in-between.
@@ -15360,7 +15368,7 @@ const Ze = [
     onelineClauses: [...CT, ...uE],
     tabularOnelineClauses: uE
   }
-}, lS = [
+}, BS = [
   // https://docs.microsoft.com/en-us/sql/t-sql/functions/functions?view=sql-server-ver15
   // aggregate
   "APPROX_COUNT_DISTINCT",
@@ -15665,7 +15673,7 @@ const Ze = [
   // Shorthand functions to use in place of CASE expression
   "COALESCE",
   "NULLIF"
-], uS = [
+], dS = [
   // https://docs.microsoft.com/en-us/sql/t-sql/language-elements/reserved-keywords-transact-sql?view=sql-server-ver15
   // standard
   "ADD",
@@ -15846,7 +15854,7 @@ const Ze = [
   "WRITETEXT",
   // https://learn.microsoft.com/en-us/sql/t-sql/queries/output-clause-transact-sql?view=sql-server-ver16#action
   "$ACTION"
-], HS = [
+], FS = [
   // https://learn.microsoft.com/en-us/sql/t-sql/data-types/data-types-transact-sql?view=sql-server-ver15
   "BINARY",
   "BIT",
@@ -15873,7 +15881,7 @@ const Ze = [
   "TIMESTAMP",
   "VARBINARY",
   "VARCHAR"
-], BS = _(["SELECT [ALL | DISTINCT]"]), dS = _([
+], pS = _(["SELECT [ALL | DISTINCT]"]), mS = _([
   // queries
   "WITH",
   "INTO",
@@ -16078,27 +16086,27 @@ const Ze = [
   "XACT_ABORT",
   "XML INDEX",
   "XML SCHEMA COLLECTION"
-]), FS = _(["UNION [ALL]", "EXCEPT", "INTERSECT"]), mS = _([
+]), YS = _(["UNION [ALL]", "EXCEPT", "INTERSECT"]), hS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), pS = _([
+]), fS = _([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), YS = _([]), hS = {
+]), VS = _([]), WS = {
   name: "transactsql",
   tokenizerOptions: {
-    reservedSelect: BS,
-    reservedClauses: [...dS, ...LT, ...HE],
-    reservedSetOperations: FS,
-    reservedJoins: mS,
-    reservedKeywordPhrases: pS,
-    reservedDataTypePhrases: YS,
-    reservedKeywords: uS,
-    reservedDataTypes: HS,
-    reservedFunctionNames: lS,
+    reservedSelect: pS,
+    reservedClauses: [...mS, ...LT, ...HE],
+    reservedSetOperations: YS,
+    reservedJoins: hS,
+    reservedKeywordPhrases: fS,
+    reservedDataTypePhrases: VS,
+    reservedKeywords: dS,
+    reservedDataTypes: FS,
+    reservedFunctionNames: BS,
     nestedBlockComments: !0,
     stringTypes: [{ quote: "''-qq", prefixes: ["N"] }, "{}"],
     identTypes: ['""-qq', "[]"],
@@ -16131,7 +16139,7 @@ const Ze = [
     onelineClauses: [...LT, ...HE],
     tabularOnelineClauses: HE
   }
-}, fS = [
+}, XS = [
   // List of all keywords taken from:
   // https://docs.singlestore.com/managed-service/en/reference/sql-reference/restricted-keywords/list-of-restricted-keywords.html
   // Then filtered down to reserved keywords by running
@@ -16344,7 +16352,7 @@ const Ze = [
   "XOR",
   "YEAR_MONTH",
   "ZEROFILL"
-], VS = [
+], bS = [
   // https://docs.singlestore.com/cloud/reference/sql-reference/data-types/
   "BIGINT",
   "BINARY",
@@ -16393,7 +16401,7 @@ const Ze = [
   "VARCHAR",
   "VARCHARACTER",
   "YEAR"
-], WS = [
+], yS = [
   // https://docs.singlestore.com/managed-service/en/reference/sql-reference/vector-functions/vector-functions.html
   // https://docs.singlestore.com/managed-service/en/reference/sql-reference/window-functions/window-functions.html
   // https://docs.singlestore.com/managed-service/en/reference/sql-reference/string-functions/string-functions.html
@@ -16673,7 +16681,7 @@ const Ze = [
   "WEEKDAY",
   "WEEKOFYEAR",
   "YEAR"
-], XS = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), bS = _([
+], KS = _(["SELECT [ALL | DISTINCT | DISTINCTROW]"]), gS = _([
   // queries
   "WITH",
   "FROM",
@@ -16874,36 +16882,36 @@ const Ze = [
   "REPEAT",
   "RETURN",
   "WHILE"
-]), yS = _([
+]), $S = _([
   "UNION [ALL | DISTINCT]",
   "EXCEPT",
   "INTERSECT",
   "MINUS"
-]), KS = _([
+]), wS = _([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL {LEFT | RIGHT} [OUTER] JOIN",
   // non-standard joins
   "STRAIGHT_JOIN"
-]), $S = _([
+]), JS = _([
   "ON DELETE",
   "ON UPDATE",
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), gS = _([]), wS = {
+]), xS = _([]), vS = {
   name: "singlestoredb",
   tokenizerOptions: {
-    reservedSelect: XS,
-    reservedClauses: [...bS, ..._T, ...BE],
-    reservedSetOperations: yS,
-    reservedJoins: KS,
-    reservedKeywordPhrases: $S,
-    reservedDataTypePhrases: gS,
-    reservedKeywords: fS,
-    reservedDataTypes: VS,
-    reservedFunctionNames: WS,
+    reservedSelect: KS,
+    reservedClauses: [...gS, ..._T, ...BE],
+    reservedSetOperations: $S,
+    reservedJoins: wS,
+    reservedKeywordPhrases: JS,
+    reservedDataTypePhrases: xS,
+    reservedKeywords: XS,
+    reservedDataTypes: bS,
+    reservedFunctionNames: yS,
     // TODO: support _binary"some string" prefix
     stringTypes: [
       '""-qq-bs',
@@ -16943,7 +16951,7 @@ const Ze = [
     onelineClauses: [..._T, ...BE],
     tabularOnelineClauses: BE
   }
-}, JS = [
+}, QS = [
   // https://docs.snowflake.com/en/sql-reference-functions.html
   //
   // https://docs.snowflake.com/en/sql-reference/functions-all.html
@@ -17551,7 +17559,7 @@ const Ze = [
   "QUARTER",
   "ZEROIFNULL",
   "ZIPF"
-], xS = [
+], ZS = [
   // https://docs.snowflake.com/en/sql-reference/reserved-keywords.html
   //
   // run in console on this page: $x('//tbody/tr/*[1]/p/text()').map(x => x.nodeValue)
@@ -17648,7 +17656,7 @@ const Ze = [
   "WITH",
   // These are definitely keywords, but haven't found a definite list in the docs
   "COMMENT"
-], vS = [
+], qS = [
   "NUMBER",
   "DECIMAL",
   "NUMERIC",
@@ -17685,7 +17693,7 @@ const Ze = [
   "ARRAY",
   "GEOGRAPHY",
   "GEOMETRY"
-], QS = _(["SELECT [ALL | DISTINCT]"]), ZS = _([
+], jS = _(["SELECT [ALL | DISTINCT]"]), kS = _([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -17957,25 +17965,25 @@ const Ze = [
   "USE SCHEMA",
   "USE SECONDARY ROLES",
   "USE WAREHOUSE"
-]), qS = _(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), jS = _([
+]), zS = _(["UNION [ALL]", "MINUS", "EXCEPT", "INTERSECT"]), EI = _([
   "[INNER] JOIN",
   "[NATURAL] {LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{CROSS | NATURAL} JOIN"
-]), kS = _([
+]), TI = _([
   "{ROWS | RANGE} BETWEEN",
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]"
-]), zS = _([]), EI = {
+]), RI = _([]), AI = {
   name: "snowflake",
   tokenizerOptions: {
-    reservedSelect: QS,
-    reservedClauses: [...ZS, ...rT, ...dE],
-    reservedSetOperations: qS,
-    reservedJoins: jS,
-    reservedKeywordPhrases: kS,
-    reservedDataTypePhrases: zS,
-    reservedKeywords: xS,
-    reservedDataTypes: vS,
-    reservedFunctionNames: JS,
+    reservedSelect: jS,
+    reservedClauses: [...kS, ...rT, ...dE],
+    reservedSetOperations: zS,
+    reservedJoins: EI,
+    reservedKeywordPhrases: TI,
+    reservedDataTypePhrases: RI,
+    reservedKeywords: ZS,
+    reservedDataTypes: qS,
+    reservedFunctionNames: QS,
     stringTypes: ["$$", "''-qq-bs"],
     identTypes: ['""-qq'],
     variableTypes: [
@@ -18008,43 +18016,43 @@ const Ze = [
     onelineClauses: [...rT, ...dE],
     tabularOnelineClauses: dE
   }
-}, TI = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, eI = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  bigquery: FR,
-  db2: wR,
-  db2i: EA,
-  duckdb: sA,
-  hive: PA,
-  mariadb: FA,
-  mysql: yA,
-  n1ql: Ie,
-  plsql: ie,
-  postgresql: He,
-  redshift: We,
-  singlestoredb: wS,
-  snowflake: EI,
-  spark: ve,
-  sql: rS,
-  sqlite: eS,
-  tidb: qA,
-  transactsql: hS,
-  trino: GS
-}, Symbol.toStringTag, { value: "Module" })), Z = (R) => R[R.length - 1], pT = (R) => R.sort((E, T) => T.length - E.length || E.localeCompare(T)), z = (R) => R.replace(/\s+/gu, " "), FE = (R) => /\n/.test(R), h = (R) => R.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), nT = /\s+/uy, K = (R) => new RegExp(`(?:${R})`, "uy"), RI = (R) => R.split("").map((E) => / /gu.test(E) ? "\\s+" : `[${E.toUpperCase()}${E.toLowerCase()}]`).join(""), AI = (R) => R + "(?:-" + R + ")*", eI = ({ prefixes: R, requirePrefix: E }) => `(?:${R.map(RI).join("|")}${E ? "" : "|"})`, SI = (R) => new RegExp(`(?:${R.map(h).join("|")}).*?(?=\r
+  bigquery: YR,
+  db2: vR,
+  db2i: AA,
+  duckdb: _A,
+  hive: cA,
+  mariadb: YA,
+  mysql: $A,
+  n1ql: te,
+  plsql: De,
+  postgresql: Fe,
+  redshift: ye,
+  singlestoredb: vS,
+  snowflake: AI,
+  spark: qe,
+  sql: aS,
+  sqlite: OS,
+  tidb: zA,
+  transactsql: WS,
+  trino: HS
+}, Symbol.toStringTag, { value: "Module" })), Z = (R) => R[R.length - 1], mT = (R) => R.sort((E, T) => T.length - E.length || E.localeCompare(T)), z = (R) => R.replace(/\s+/gu, " "), FE = (R) => /\n/.test(R), h = (R) => R.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), nT = /\s+/uy, K = (R) => new RegExp(`(?:${R})`, "uy"), SI = (R) => R.split("").map((E) => / /gu.test(E) ? "\\s+" : `[${E.toUpperCase()}${E.toLowerCase()}]`).join(""), II = (R) => R + "(?:-" + R + ")*", OI = ({ prefixes: R, requirePrefix: E }) => `(?:${R.map(SI).join("|")}${E ? "" : "|"})`, NI = (R) => new RegExp(`(?:${R.map(h).join("|")}).*?(?=\r
 |\r|
 |$)`, "uy"), iT = (R, E = []) => {
   const T = R === "open" ? 0 : 1, A = ["()", ...E].map((e) => e[T]);
   return K(A.map(h).join("|"));
-}, aT = (R) => K(`${pT(R).map(h).join("|")}`), II = ({ rest: R, dashes: E }) => R || E ? `(?![${R || ""}${E ? "-" : ""}])` : "", V = (R, E = {}) => {
+}, aT = (R) => K(`${mT(R).map(h).join("|")}`), tI = ({ rest: R, dashes: E }) => R || E ? `(?![${R || ""}${E ? "-" : ""}])` : "", V = (R, E = {}) => {
   if (R.length === 0)
     return /^\b$/u;
-  const T = II(E), A = pT(R).map(h).join("|").replace(/ /gu, "\\s+");
+  const T = tI(E), A = mT(R).map(h).join("|").replace(/ /gu, "\\s+");
   return new RegExp(`(?:${A})${T}\\b`, "iuy");
-}, mE = (R, E) => {
+}, pE = (R, E) => {
   if (!R.length)
     return;
   const T = R.map(h).join("|");
   return K(`(?:${T})(?:${E})`);
-}, OI = () => {
+}, sI = () => {
   const R = {
     "<": ">",
     "[": "]",
@@ -18076,16 +18084,16 @@ const Ze = [
   // Hive and Spark variables: ${name}
   "{}": String.raw`(?:\{[^\}]*\})`,
   // Oracle q'' strings: q'<text>' q'|text|' ...
-  "q''": OI()
-}, YT = (R) => typeof R == "string" ? oT[R] : "regex" in R ? R.regex : eI(R) + oT[R.quote], NI = (R) => K(R.map((E) => "regex" in E ? E.regex : YT(E)).join("|")), hT = (R) => R.map(YT).join("|"), DT = (R) => K(hT(R)), tI = (R = {}) => K(fT(R)), fT = ({ first: R, rest: E, dashes: T, allowFirstCharNumber: A } = {}) => {
+  "q''": sI()
+}, YT = (R) => typeof R == "string" ? oT[R] : "regex" in R ? R.regex : OI(R) + oT[R.quote], CI = (R) => K(R.map((E) => "regex" in E ? E.regex : YT(E)).join("|")), hT = (R) => R.map(YT).join("|"), DT = (R) => K(hT(R)), LI = (R = {}) => K(fT(R)), fT = ({ first: R, rest: E, dashes: T, allowFirstCharNumber: A } = {}) => {
   const e = "\\p{Alphabetic}\\p{Mark}_", S = "\\p{Decimal_Number}", I = h(R ?? ""), t = h(E ?? ""), C = A ? `[${e}${S}${I}][${e}${S}${t}]*` : `[${e}${I}][${e}${S}${t}]*`;
-  return T ? AI(C) : C;
+  return T ? II(C) : C;
 };
 function VT(R, E) {
   const T = R.slice(0, E).split(/\n/);
   return { line: T.length, col: T[T.length - 1].length + 1 };
 }
-class sI {
+class _I {
   constructor(E, T) {
     this.rules = E, this.dialectName = T, this.input = "", this.index = 0;
   }
@@ -18147,8 +18155,8 @@ If possible, please select a more specific dialect (like sqlite, postgresql, etc
     }
   }
 }
-const PT = /\/\*/uy, CI = /[\s\S]/uy, LI = /\*\//uy;
-class _I {
+const PT = /\/\*/uy, rI = /[\s\S]/uy, nI = /\*\//uy;
+class iI {
   constructor() {
     this.lastIndex = 0;
   }
@@ -18161,9 +18169,9 @@ class _I {
     for (; e > 0; )
       if (A = this.matchSection(PT, E))
         T += A, e++;
-      else if (A = this.matchSection(LI, E))
+      else if (A = this.matchSection(nI, E))
         T += A, e--;
-      else if (A = this.matchSection(CI, E))
+      else if (A = this.matchSection(rI, E))
         T += A;
       else
         return null;
@@ -18175,7 +18183,7 @@ class _I {
     return A && (this.lastIndex += A[0].length), A ? A[0] : null;
   }
 }
-class rI {
+class aI {
   constructor(E, T) {
     this.cfg = E, this.dialectName = T, this.rulesBeforeParams = this.buildRulesBeforeParams(E), this.rulesAfterParams = this.buildRulesAfterParams(E);
   }
@@ -18184,7 +18192,7 @@ class rI {
       ...this.rulesBeforeParams,
       ...this.buildParamRules(this.cfg, T),
       ...this.rulesAfterParams
-    ], e = new sI(A, this.dialectName).tokenize(E);
+    ], e = new _I(A, this.dialectName).tokenize(E);
     return this.cfg.postProcess ? this.cfg.postProcess(e) : e;
   }
   // These rules can be cached as they only depend on
@@ -18193,125 +18201,125 @@ class rI {
     var T, A, e;
     return this.validRules([
       {
-        type: D.DISABLE_COMMENT,
+        type: o.DISABLE_COMMENT,
         regex: /(\/\* *sql-formatter-disable *\*\/[\s\S]*?(?:\/\* *sql-formatter-enable *\*\/|$))/uy
       },
       {
-        type: D.BLOCK_COMMENT,
-        regex: E.nestedBlockComments ? new _I() : /(\/\*[^]*?\*\/)/uy
+        type: o.BLOCK_COMMENT,
+        regex: E.nestedBlockComments ? new iI() : /(\/\*[^]*?\*\/)/uy
       },
       {
-        type: D.LINE_COMMENT,
-        regex: SI((T = E.lineCommentTypes) !== null && T !== void 0 ? T : ["--"])
+        type: o.LINE_COMMENT,
+        regex: NI((T = E.lineCommentTypes) !== null && T !== void 0 ? T : ["--"])
       },
       {
-        type: D.QUOTED_IDENTIFIER,
+        type: o.QUOTED_IDENTIFIER,
         regex: DT(E.identTypes)
       },
       {
-        type: D.NUMBER,
+        type: o.NUMBER,
         regex: E.underscoresInNumbers ? /(?:0x[0-9a-fA-F_]+|0b[01_]+|(?:-\s*)?(?:[0-9_]*\.[0-9_]+|[0-9_]+(?:\.[0-9_]*)?)(?:[eE][-+]?[0-9_]+(?:\.[0-9_]+)?)?)(?![\w\p{Alphabetic}])/uy : /(?:0x[0-9a-fA-F]+|0b[01]+|(?:-\s*)?(?:[0-9]*\.[0-9]+|[0-9]+(?:\.[0-9]*)?)(?:[eE][-+]?[0-9]+(?:\.[0-9]+)?)?)(?![\w\p{Alphabetic}])/uy
       },
       // RESERVED_KEYWORD_PHRASE and RESERVED_DATA_TYPE_PHRASE  is matched before all other keyword tokens
       // to e.g. prioritize matching "TIMESTAMP WITH TIME ZONE" phrase over "WITH" clause.
       {
-        type: D.RESERVED_KEYWORD_PHRASE,
+        type: o.RESERVED_KEYWORD_PHRASE,
         regex: V((A = E.reservedKeywordPhrases) !== null && A !== void 0 ? A : [], E.identChars),
         text: d
       },
       {
-        type: D.RESERVED_DATA_TYPE_PHRASE,
+        type: o.RESERVED_DATA_TYPE_PHRASE,
         regex: V((e = E.reservedDataTypePhrases) !== null && e !== void 0 ? e : [], E.identChars),
         text: d
       },
       {
-        type: D.CASE,
+        type: o.CASE,
         regex: /CASE\b/iuy,
         text: d
       },
       {
-        type: D.END,
+        type: o.END,
         regex: /END\b/iuy,
         text: d
       },
       {
-        type: D.BETWEEN,
+        type: o.BETWEEN,
         regex: /BETWEEN\b/iuy,
         text: d
       },
       {
-        type: D.LIMIT,
+        type: o.LIMIT,
         regex: E.reservedClauses.includes("LIMIT") ? /LIMIT\b/iuy : void 0,
         text: d
       },
       {
-        type: D.RESERVED_CLAUSE,
+        type: o.RESERVED_CLAUSE,
         regex: V(E.reservedClauses, E.identChars),
         text: d
       },
       {
-        type: D.RESERVED_SELECT,
+        type: o.RESERVED_SELECT,
         regex: V(E.reservedSelect, E.identChars),
         text: d
       },
       {
-        type: D.RESERVED_SET_OPERATION,
+        type: o.RESERVED_SET_OPERATION,
         regex: V(E.reservedSetOperations, E.identChars),
         text: d
       },
       {
-        type: D.WHEN,
+        type: o.WHEN,
         regex: /WHEN\b/iuy,
         text: d
       },
       {
-        type: D.ELSE,
+        type: o.ELSE,
         regex: /ELSE\b/iuy,
         text: d
       },
       {
-        type: D.THEN,
+        type: o.THEN,
         regex: /THEN\b/iuy,
         text: d
       },
       {
-        type: D.RESERVED_JOIN,
+        type: o.RESERVED_JOIN,
         regex: V(E.reservedJoins, E.identChars),
         text: d
       },
       {
-        type: D.AND,
+        type: o.AND,
         regex: /AND\b/iuy,
         text: d
       },
       {
-        type: D.OR,
+        type: o.OR,
         regex: /OR\b/iuy,
         text: d
       },
       {
-        type: D.XOR,
+        type: o.XOR,
         regex: E.supportsXor ? /XOR\b/iuy : void 0,
         text: d
       },
       ...E.operatorKeyword ? [
         {
-          type: D.OPERATOR,
+          type: o.OPERATOR,
           regex: /OPERATOR *\([^)]+\)/iuy
         }
       ] : [],
       {
-        type: D.RESERVED_FUNCTION_NAME,
+        type: o.RESERVED_FUNCTION_NAME,
         regex: V(E.reservedFunctionNames, E.identChars),
         text: d
       },
       {
-        type: D.RESERVED_DATA_TYPE,
+        type: o.RESERVED_DATA_TYPE,
         regex: V(E.reservedDataTypes, E.identChars),
         text: d
       },
       {
-        type: D.RESERVED_KEYWORD,
+        type: o.RESERVED_KEYWORD,
         regex: V(E.reservedKeywords, E.identChars),
         text: d
       }
@@ -18323,26 +18331,26 @@ class rI {
     var T, A;
     return this.validRules([
       {
-        type: D.VARIABLE,
-        regex: E.variableTypes ? NI(E.variableTypes) : void 0
+        type: o.VARIABLE,
+        regex: E.variableTypes ? CI(E.variableTypes) : void 0
       },
-      { type: D.STRING, regex: DT(E.stringTypes) },
+      { type: o.STRING, regex: DT(E.stringTypes) },
       {
-        type: D.IDENTIFIER,
-        regex: tI(E.identChars)
+        type: o.IDENTIFIER,
+        regex: LI(E.identChars)
       },
-      { type: D.DELIMITER, regex: /[;]/uy },
-      { type: D.COMMA, regex: /[,]/y },
+      { type: o.DELIMITER, regex: /[;]/uy },
+      { type: o.COMMA, regex: /[,]/y },
       {
-        type: D.OPEN_PAREN,
+        type: o.OPEN_PAREN,
         regex: iT("open", E.extraParens)
       },
       {
-        type: D.CLOSE_PAREN,
+        type: o.CLOSE_PAREN,
         regex: iT("close", E.extraParens)
       },
       {
-        type: D.OPERATOR,
+        type: o.OPERATOR,
         regex: aT([
           // standard operators
           "+",
@@ -18358,9 +18366,9 @@ class rI {
           ...(T = E.operators) !== null && T !== void 0 ? T : []
         ])
       },
-      { type: D.ASTERISK, regex: /[*]/uy },
+      { type: o.ASTERISK, regex: /[*]/uy },
       {
-        type: D.PROPERTY_ACCESS_OPERATOR,
+        type: o.PROPERTY_ACCESS_OPERATOR,
         regex: aT([".", ...(A = E.propertyAccessOperators) !== null && A !== void 0 ? A : []])
       }
     ]);
@@ -18378,31 +18386,31 @@ class rI {
     };
     return this.validRules([
       {
-        type: D.NAMED_PARAMETER,
-        regex: mE(C.named, fT(E.paramChars || E.identChars)),
+        type: o.NAMED_PARAMETER,
+        regex: pE(C.named, fT(E.paramChars || E.identChars)),
         key: (O) => O.slice(1)
       },
       {
-        type: D.QUOTED_PARAMETER,
-        regex: mE(C.quoted, hT(E.identTypes)),
+        type: o.QUOTED_PARAMETER,
+        regex: pE(C.quoted, hT(E.identTypes)),
         key: (O) => (({ tokenKey: N, quoteChar: s }) => N.replace(new RegExp(h("\\" + s), "gu"), s))({
           tokenKey: O.slice(2, -1),
           quoteChar: O.slice(-1)
         })
       },
       {
-        type: D.NUMBERED_PARAMETER,
-        regex: mE(C.numbered, "[0-9]+"),
+        type: o.NUMBERED_PARAMETER,
+        regex: pE(C.numbered, "[0-9]+"),
         key: (O) => O.slice(1)
       },
       {
-        type: D.POSITIONAL_PARAMETER,
+        type: o.POSITIONAL_PARAMETER,
         regex: C.positional ? /[?]/y : void 0
       },
       ...C.custom.map((O) => {
         var N;
         return {
-          type: D.CUSTOM_PARAMETER,
+          type: o.CUSTOM_PARAMETER,
           regex: K(O.regex),
           key: (N = O.key) !== null && N !== void 0 ? N : ((s) => s)
         };
@@ -18414,13 +18422,13 @@ class rI {
     return E.filter((T) => !!T.regex);
   }
 }
-const d = (R) => z(R.toUpperCase()), MT = /* @__PURE__ */ new Map(), nI = (R) => {
+const d = (R) => z(R.toUpperCase()), MT = /* @__PURE__ */ new Map(), oI = (R) => {
   let E = MT.get(R);
-  return E || (E = iI(R), MT.set(R, E)), E;
-}, iI = (R) => ({
-  tokenizer: new rI(R.tokenizerOptions, R.name),
-  formatOptions: aI(R.formatOptions)
-}), aI = (R) => {
+  return E || (E = DI(R), MT.set(R, E)), E;
+}, DI = (R) => ({
+  tokenizer: new aI(R.tokenizerOptions, R.name),
+  formatOptions: PI(R.formatOptions)
+}), PI = (R) => {
   var E;
   return {
     alwaysDenseOperators: R.alwaysDenseOperators || [],
@@ -18428,13 +18436,13 @@ const d = (R) => z(R.toUpperCase()), MT = /* @__PURE__ */ new Map(), nI = (R) =>
     tabularOnelineClauses: Object.fromEntries(((E = R.tabularOnelineClauses) !== null && E !== void 0 ? E : R.onelineClauses).map((T) => [T, !0]))
   };
 };
-function oI(R) {
+function MI(R) {
   return R.indentStyle === "tabularLeft" || R.indentStyle === "tabularRight" ? " ".repeat(10) : R.useTabs ? "	" : " ".repeat(R.tabWidth);
 }
 function J(R) {
   return R.indentStyle === "tabularLeft" || R.indentStyle === "tabularRight";
 }
-class DI {
+class UI {
   constructor(E) {
     this.params = E, this.index = 0;
   }
@@ -18457,15 +18465,15 @@ class DI {
     this.index = E;
   }
 }
-function PI(R) {
+function cI(R) {
   return R && R.__esModule && Object.prototype.hasOwnProperty.call(R, "default") ? R.default : R;
 }
-var EE = { exports: {} }, MI = EE.exports, UT;
-function UI() {
+var EE = { exports: {} }, lI = EE.exports, UT;
+function GI() {
   return UT || (UT = 1, (function(R) {
     (function(E, T) {
       R.exports ? R.exports = T() : E.nearley = T();
-    })(MI, function() {
+    })(lI, function() {
       function E(O, N, s) {
         return this.id = ++E.highestId, this.name = O, this.symbols = N, this.postprocess = s, this;
       }
@@ -18498,8 +18506,8 @@ function UI() {
           var i = N[L];
           if (i.isComplete) {
             if (i.finish(), i.data !== I.fail) {
-              for (var o = i.wantedBy, l = o.length; l--; ) {
-                var P = o[l];
+              for (var D = i.wantedBy, l = D.length; l--; ) {
+                var P = D[l];
                 this.complete(P, i);
               }
               if (i.reference === this.index) {
@@ -18573,14 +18581,14 @@ function UI() {
           ), L = s.indexOf(`
 `, this.index);
           L === -1 && (L = s.length);
-          var i = this.index - this.lastLineBreak, o = String(this.line).length;
+          var i = this.index - this.lastLineBreak, D = String(this.line).length;
           return N += " at line " + this.line + " col " + i + `:
 
 `, N += r.map(function(P, c) {
-            return l(this.line - r.length + c + 1, o) + " " + P;
+            return l(this.line - r.length + c + 1, D) + " " + P;
           }, this).join(`
 `), N += `
-` + l("", o + i) + `^
+` + l("", D + i) + `^
 `, N;
         } else
           return N + " at index " + (this.index - 1);
@@ -18612,23 +18620,23 @@ function UI() {
             if (s = N.next(), !s)
               break;
           } catch (Y) {
-            var o = new A(this.grammar, this.current + 1);
-            this.table.push(o);
+            var D = new A(this.grammar, this.current + 1);
+            this.table.push(D);
             var r = new Error(this.reportLexerError(Y));
             throw r.offset = this.current, r.token = Y.token, r;
           }
           var L = this.table[this.current];
           this.options.keepHistory || delete this.table[this.current - 1];
-          var i = this.current + 1, o = new A(this.grammar, i);
-          this.table.push(o);
+          var i = this.current + 1, D = new A(this.grammar, i);
+          this.table.push(D);
           for (var l = s.text !== void 0 ? s.text : s.value, P = N.constructor === S ? s.value : s, c = L.scannable, M = c.length; M--; ) {
             var u = c[M], H = u.rule.symbols[u.dot];
             if (H.test ? H.test(P) : H.type ? H.type === s.type : H.literal === l) {
               var B = u.nextState({ data: P, token: s, isToken: !0, reference: i - 1 });
-              o.states.push(B);
+              D.states.push(B);
             }
           }
-          if (o.process(), o.states.length === 0) {
+          if (D.process(), D.states.length === 0) {
             var r = new Error(this.reportError(s));
             throw r.offset = this.current, r.token = s, r;
           }
@@ -18654,10 +18662,10 @@ function UI() {
         else {
           s.push("Unexpected " + N + `. Instead, I was expecting to see one of the following:
 `);
-          var o = i.map(function(l) {
+          var D = i.map(function(l) {
             return this.buildFirstStateStack(l, []) || [l];
           }, this);
-          o.forEach(function(l) {
+          D.forEach(function(l) {
             var P = l[0], c = P.rule.symbols[P.dot], M = this.getSymbolDisplay(c);
             s.push("A " + M + " based on:"), this.displayStateStack(l, s);
           }, this);
@@ -18666,8 +18674,8 @@ function UI() {
 `);
       }, I.prototype.displayStateStack = function(O, N) {
         for (var s, r = 0, L = 0; L < O.length; L++) {
-          var i = O[L], o = i.rule.toString(i.dot);
-          o === s ? r++ : (r > 0 && N.push("    ^ " + r + " more lines identical to this"), r = 0, N.push("    " + o)), s = o;
+          var i = O[L], D = i.rule.toString(i.dot);
+          D === s ? r++ : (r > 0 && N.push("    ^ " + r + " more lines identical to this"), r = 0, N.push("    " + D)), s = D;
         }
       }, I.prototype.getSymbolDisplay = function(O) {
         return t(O);
@@ -18736,55 +18744,55 @@ function UI() {
     });
   })(EE)), EE.exports;
 }
-var cI = UI();
-const GI = /* @__PURE__ */ PI(cI);
-function lI(R) {
-  return R.map(uI).map(HI).map(BI).map(dI).map(FI);
+var uI = GI();
+const HI = /* @__PURE__ */ cI(uI);
+function BI(R) {
+  return R.map(dI).map(FI).map(pI).map(mI).map(YI);
 }
-const uI = (R, E, T) => {
-  if (mT(R.type)) {
-    const A = mI(T, E);
-    if (A && A.type === D.PROPERTY_ACCESS_OPERATOR)
-      return Object.assign(Object.assign({}, R), { type: D.IDENTIFIER, text: R.raw });
+const dI = (R, E, T) => {
+  if (pT(R.type)) {
+    const A = hI(T, E);
+    if (A && A.type === o.PROPERTY_ACCESS_OPERATOR)
+      return Object.assign(Object.assign({}, R), { type: o.IDENTIFIER, text: R.raw });
     const e = Q(T, E);
-    if (e && e.type === D.PROPERTY_ACCESS_OPERATOR)
-      return Object.assign(Object.assign({}, R), { type: D.IDENTIFIER, text: R.raw });
+    if (e && e.type === o.PROPERTY_ACCESS_OPERATOR)
+      return Object.assign(Object.assign({}, R), { type: o.IDENTIFIER, text: R.raw });
   }
   return R;
-}, HI = (R, E, T) => {
-  if (R.type === D.RESERVED_FUNCTION_NAME) {
+}, FI = (R, E, T) => {
+  if (R.type === o.RESERVED_FUNCTION_NAME) {
     const A = Q(T, E);
     if (!A || !WT(A))
-      return Object.assign(Object.assign({}, R), { type: D.IDENTIFIER, text: R.raw });
+      return Object.assign(Object.assign({}, R), { type: o.IDENTIFIER, text: R.raw });
   }
   return R;
-}, BI = (R, E, T) => {
-  if (R.type === D.RESERVED_DATA_TYPE) {
+}, pI = (R, E, T) => {
+  if (R.type === o.RESERVED_DATA_TYPE) {
     const A = Q(T, E);
     if (A && WT(A))
-      return Object.assign(Object.assign({}, R), { type: D.RESERVED_PARAMETERIZED_DATA_TYPE });
+      return Object.assign(Object.assign({}, R), { type: o.RESERVED_PARAMETERIZED_DATA_TYPE });
   }
   return R;
-}, dI = (R, E, T) => {
-  if (R.type === D.IDENTIFIER) {
+}, mI = (R, E, T) => {
+  if (R.type === o.IDENTIFIER) {
     const A = Q(T, E);
     if (A && XT(A))
-      return Object.assign(Object.assign({}, R), { type: D.ARRAY_IDENTIFIER });
+      return Object.assign(Object.assign({}, R), { type: o.ARRAY_IDENTIFIER });
   }
   return R;
-}, FI = (R, E, T) => {
-  if (R.type === D.RESERVED_DATA_TYPE) {
+}, YI = (R, E, T) => {
+  if (R.type === o.RESERVED_DATA_TYPE) {
     const A = Q(T, E);
     if (A && XT(A))
-      return Object.assign(Object.assign({}, R), { type: D.ARRAY_KEYWORD });
+      return Object.assign(Object.assign({}, R), { type: o.ARRAY_KEYWORD });
   }
   return R;
-}, mI = (R, E) => Q(R, E, -1), Q = (R, E, T = 1) => {
+}, hI = (R, E) => Q(R, E, -1), Q = (R, E, T = 1) => {
   let A = 1;
-  for (; R[E + A * T] && pI(R[E + A * T]); )
+  for (; R[E + A * T] && fI(R[E + A * T]); )
     A++;
   return R[E + A * T];
-}, WT = (R) => R.type === D.OPEN_PAREN && R.text === "(", XT = (R) => R.type === D.OPEN_PAREN && R.text === "[", pI = (R) => R.type === D.BLOCK_COMMENT || R.type === D.LINE_COMMENT;
+}, WT = (R) => R.type === o.OPEN_PAREN && R.text === "(", XT = (R) => R.type === o.OPEN_PAREN && R.text === "[", fI = (R) => R.type === o.BLOCK_COMMENT || R.type === o.LINE_COMMENT;
 class bT {
   constructor(E) {
     this.tokenize = E, this.index = 0, this.tokens = [], this.input = "";
@@ -18802,14 +18810,14 @@ class bT {
     return `Parse error at token: ${E.text} at line ${T} column ${A}`;
   }
   has(E) {
-    return E in D;
+    return E in o;
   }
 }
 var U;
 (function(R) {
   R.statement = "statement", R.clause = "clause", R.set_operation = "set_operation", R.function_call = "function_call", R.parameterized_data_type = "parameterized_data_type", R.array_subscript = "array_subscript", R.property_access = "property_access", R.parenthesis = "parenthesis", R.between_predicate = "between_predicate", R.case_expression = "case_expression", R.case_when = "case_when", R.case_else = "case_else", R.limit_clause = "limit_clause", R.all_columns_asterisk = "all_columns_asterisk", R.literal = "literal", R.identifier = "identifier", R.keyword = "keyword", R.data_type = "data_type", R.parameter = "parameter", R.operator = "operator", R.comma = "comma", R.line_comment = "line_comment", R.block_comment = "block_comment", R.disable_comment = "disable_comment";
 })(U = U || (U = {}));
-function pE(R) {
+function mE(R) {
   return R[0];
 }
 const G = new bT((R) => []), W = ([[R]]) => R, F = (R) => ({
@@ -18821,17 +18829,17 @@ const G = new bT((R) => []), W = ([[R]]) => R, F = (R) => ({
   type: U.data_type,
   text: R.text,
   raw: R.raw
-}), m = (R, { leading: E, trailing: T }) => (E?.length && (R = Object.assign(Object.assign({}, R), { leadingComments: E })), T?.length && (R = Object.assign(Object.assign({}, R), { trailingComments: T })), R), YI = (R, { leading: E, trailing: T }) => {
+}), p = (R, { leading: E, trailing: T }) => (E?.length && (R = Object.assign(Object.assign({}, R), { leadingComments: E })), T?.length && (R = Object.assign(Object.assign({}, R), { trailingComments: T })), R), VI = (R, { leading: E, trailing: T }) => {
   if (E?.length) {
     const [A, ...e] = R;
-    R = [m(A, { leading: E }), ...e];
+    R = [p(A, { leading: E }), ...e];
   }
   if (T?.length) {
     const A = R.slice(0, -1), e = R[R.length - 1];
-    R = [...A, m(e, { trailing: T })];
+    R = [...A, p(e, { trailing: T })];
   }
   return R;
-}, hI = {
+}, WI = {
   Lexer: G,
   ParserRules: [
     { name: "main$ebnf$1", symbols: [] },
@@ -18852,7 +18860,7 @@ const G = new bT((R) => []), W = ([[R]]) => R, F = (R) => ({
       postprocess: ([R, [E]]) => ({
         type: U.statement,
         children: R,
-        hasSemicolon: E.type === D.DELIMITER
+        hasSemicolon: E.type === o.DELIMITER
       })
     },
     { name: "expressions_or_clauses$ebnf$1", symbols: [] },
@@ -18872,7 +18880,7 @@ const G = new bT((R) => []), W = ([[R]]) => R, F = (R) => ({
     { 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: (R) => R[0].concat([R[1]]) },
     { name: "limit_clause$ebnf$1$subexpression$1", symbols: [G.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: pE },
+    { name: "limit_clause$ebnf$1", symbols: ["limit_clause$ebnf$1$subexpression$1"], postprocess: mE },
     { name: "limit_clause$ebnf$1", symbols: [], postprocess: () => null },
     {
       name: "limit_clause",
@@ -18882,14 +18890,14 @@ const G = new bT((R) => []), W = ([[R]]) => R, F = (R) => ({
           const [e, S] = A;
           return {
             type: U.limit_clause,
-            limitKw: m(F(R), { trailing: E }),
+            limitKw: p(F(R), { trailing: E }),
             offset: T,
             count: S
           };
         } else
           return {
             type: U.limit_clause,
-            limitKw: m(F(R), { trailing: E }),
+            limitKw: p(F(R), { trailing: E }),
             count: T
           };
       }
@@ -18947,7 +18955,7 @@ const G = new bT((R) => []), W = ([[R]]) => R, F = (R) => ({
     },
     { name: "expression_chain_$ebnf$1", symbols: ["expression_with_comments_"] },
     { name: "expression_chain_$ebnf$1", symbols: ["expression_chain_$ebnf$1", "expression_with_comments_"], postprocess: (R) => R[0].concat([R[1]]) },
-    { name: "expression_chain_", symbols: ["expression_chain_$ebnf$1"], postprocess: pE },
+    { name: "expression_chain_", symbols: ["expression_chain_$ebnf$1"], postprocess: mE },
     { name: "expression_chain$ebnf$1", symbols: [] },
     { name: "expression_chain$ebnf$1", symbols: ["expression_chain$ebnf$1", "_expression_with_comments"], postprocess: (R) => R[0].concat([R[1]]) },
     {
@@ -18965,17 +18973,17 @@ const G = new bT((R) => []), W = ([[R]]) => R, F = (R) => ({
     {
       name: "expression_with_comments_",
       symbols: ["expression", "_"],
-      postprocess: ([R, E]) => m(R, { trailing: E })
+      postprocess: ([R, E]) => p(R, { trailing: E })
     },
     {
       name: "_expression_with_comments",
       symbols: ["_", "expression"],
-      postprocess: ([R, E]) => m(E, { leading: R })
+      postprocess: ([R, E]) => p(E, { leading: R })
     },
     {
       name: "_andless_expression_with_comments",
       symbols: ["_", "andless_expression"],
-      postprocess: ([R, E]) => m(E, { leading: R })
+      postprocess: ([R, E]) => p(E, { leading: R })
     },
     { name: "free_form_sql$subexpression$1", symbols: ["asteriskless_free_form_sql"] },
     { name: "free_form_sql$subexpression$1", symbols: ["asterisk"] },
@@ -19014,7 +19022,7 @@ const G = new bT((R) => []), W = ([[R]]) => R, F = (R) => ({
       symbols: [G.has("ARRAY_IDENTIFIER") ? { type: "ARRAY_IDENTIFIER" } : ARRAY_IDENTIFIER, "_", "square_brackets"],
       postprocess: ([R, E, T]) => ({
         type: U.array_subscript,
-        array: m({ type: U.identifier, quoted: !1, text: R.text }, { trailing: E }),
+        array: p({ type: U.identifier, quoted: !1, text: R.text }, { trailing: E }),
         parenthesis: T
       })
     },
@@ -19023,7 +19031,7 @@ const G = new bT((R) => []), W = ([[R]]) => R, F = (R) => ({
       symbols: [G.has("ARRAY_KEYWORD") ? { type: "ARRAY_KEYWORD" } : ARRAY_KEYWORD, "_", "square_brackets"],
       postprocess: ([R, E, T]) => ({
         type: U.array_subscript,
-        array: m(F(R), { trailing: E }),
+        array: p(F(R), { trailing: E }),
         parenthesis: T
       })
     },
@@ -19032,7 +19040,7 @@ const G = new bT((R) => []), W = ([[R]]) => R, F = (R) => ({
       symbols: [G.has("RESERVED_FUNCTION_NAME") ? { type: "RESERVED_FUNCTION_NAME" } : RESERVED_FUNCTION_NAME, "_", "parenthesis"],
       postprocess: ([R, E, T]) => ({
         type: U.function_call,
-        nameKw: m(F(R), { trailing: E }),
+        nameKw: p(F(R), { trailing: E }),
         parenthesis: T
       })
     },
@@ -19084,9 +19092,9 @@ const G = new bT((R) => []), W = ([[R]]) => R, F = (R) => ({
         // %ARRAY_IDENTIFIER on the left side of <array_subscript>.
         ([R, E, T, A, [e]]) => ({
           type: U.property_access,
-          object: m(R, { trailing: E }),
+          object: p(R, { trailing: E }),
           operator: T.text,
-          property: m(e, { leading: A })
+          property: p(e, { leading: A })
         })
       )
     },
@@ -19096,12 +19104,12 @@ const G = new bT((R) => []), W = ([[R]]) => R, F = (R) => ({
       postprocess: ([R, E, T, A, e, S, I]) => ({
         type: U.between_predicate,
         betweenKw: F(R),
-        expr1: YI(T, { leading: E, trailing: A }),
+        expr1: VI(T, { leading: E, trailing: A }),
         andKw: F(e),
-        expr2: [m(I, { leading: S })]
+        expr2: [p(I, { leading: S })]
       })
     },
-    { name: "case_expression$ebnf$1", symbols: ["expression_chain_"], postprocess: pE },
+    { name: "case_expression$ebnf$1", symbols: ["expression_chain_"], postprocess: mE },
     { 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: (R) => R[0].concat([R[1]]) },
@@ -19110,7 +19118,7 @@ const G = new bT((R) => []), W = ([[R]]) => R, F = (R) => ({
       symbols: [G.has("CASE") ? { type: "CASE" } : CASE, "_", "case_expression$ebnf$1", "case_expression$ebnf$2", G.has("END") ? { type: "END" } : END],
       postprocess: ([R, E, T, A, e]) => ({
         type: U.case_expression,
-        caseKw: m(F(R), { trailing: E }),
+        caseKw: p(F(R), { trailing: E }),
         endKw: F(e),
         expr: T || [],
         clauses: A
@@ -19121,8 +19129,8 @@ const G = new bT((R) => []), W = ([[R]]) => R, F = (R) => ({
       symbols: [G.has("WHEN") ? { type: "WHEN" } : WHEN, "_", "expression_chain_", G.has("THEN") ? { type: "THEN" } : THEN, "_", "expression_chain_"],
       postprocess: ([R, E, T, A, e, S]) => ({
         type: U.case_when,
-        whenKw: m(F(R), { trailing: E }),
-        thenKw: m(F(A), { trailing: e }),
+        whenKw: p(F(R), { trailing: E }),
+        thenKw: p(F(A), { trailing: e }),
         condition: T,
         result: S
       })
@@ -19132,7 +19140,7 @@ const G = new bT((R) => []), W = ([[R]]) => R, F = (R) => ({
       symbols: [G.has("ELSE") ? { type: "ELSE" } : ELSE, "_", "expression_chain_"],
       postprocess: ([R, E, T]) => ({
         type: U.case_else,
-        elseKw: m(F(R), { trailing: E }),
+        elseKw: p(F(R), { trailing: E }),
         result: T
       })
     },
@@ -19175,7 +19183,7 @@ const G = new bT((R) => []), W = ([[R]]) => R, F = (R) => ({
       symbols: [G.has("RESERVED_PARAMETERIZED_DATA_TYPE") ? { type: "RESERVED_PARAMETERIZED_DATA_TYPE" } : RESERVED_PARAMETERIZED_DATA_TYPE, "_", "parenthesis"],
       postprocess: ([R, E, T]) => ({
         type: U.parameterized_data_type,
-        dataType: m(cT(R), { trailing: E }),
+        dataType: p(cT(R), { trailing: E }),
         parenthesis: T
       })
     },
@@ -19228,13 +19236,13 @@ const G = new bT((R) => []), W = ([[R]]) => R, F = (R) => ({
     }
   ],
   ParserStart: "main"
-}, { Parser: fI, Grammar: VI } = GI;
-function WI(R) {
+}, { Parser: XI, Grammar: bI } = HI;
+function yI(R) {
   let E = {};
   const T = new bT((e) => [
-    ...lI(R.tokenize(e, E)),
+    ...BI(R.tokenize(e, E)),
     FT(e.length)
-  ]), A = new fI(VI.fromCompiled(hI), { lexer: T });
+  ]), A = new XI(bI.fromCompiled(WI), { lexer: T });
   return {
     parse: (e, S) => {
       E = S;
@@ -19286,11 +19294,11 @@ class yT {
       }
   }
   trimHorizontalWhitespace() {
-    for (; XI(Z(this.items)); )
+    for (; KI(Z(this.items)); )
       this.items.pop();
   }
   trimWhitespace() {
-    for (; bI(Z(this.items)); )
+    for (; gI(Z(this.items)); )
       this.items.pop();
   }
   addNewline(E) {
@@ -19337,17 +19345,17 @@ class yT {
     }
   }
 }
-const XI = (R) => R === a.SPACE || R === a.SINGLE_INDENT, bI = (R) => R === a.SPACE || R === a.SINGLE_INDENT || R === a.NEWLINE;
-function GT(R, E) {
+const KI = (R) => R === a.SPACE || R === a.SINGLE_INDENT, gI = (R) => R === a.SPACE || R === a.SINGLE_INDENT || R === a.NEWLINE;
+function lT(R, E) {
   if (E === "standard")
     return R;
   let T = [];
   return R.length >= 10 && R.includes(" ") && ([R, ...T] = R.split(" ")), E === "tabularLeft" ? R = R.padEnd(9, " ") : R = R.padStart(9, " "), R + ["", ...T].join(" ");
 }
-function lT(R) {
-  return PR(R) || R === D.RESERVED_CLAUSE || R === D.RESERVED_SELECT || R === D.RESERVED_SET_OPERATION || R === D.RESERVED_JOIN || R === D.LIMIT;
+function GT(R) {
+  return cR(R) || R === o.RESERVED_CLAUSE || R === o.RESERVED_SELECT || R === o.RESERVED_SET_OPERATION || R === o.RESERVED_JOIN || R === o.LIMIT;
 }
-const YE = "top-level", yI = "block-level";
+const YE = "top-level", $I = "block-level";
 class KT {
   /**
    * @param {string} indent A string to indent with
@@ -19377,7 +19385,7 @@ class KT {
    * Increases indentation by one block-level indent.
    */
   increaseBlockLevel() {
-    this.indentTypes.push(yI);
+    this.indentTypes.push($I);
   }
   /**
    * Decreases indentation by one top-level indent.
@@ -19396,7 +19404,7 @@ class KT {
       ;
   }
 }
-class KI extends yT {
+class wI extends yT {
   constructor(E) {
     super(new KT("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
   }
@@ -19640,7 +19648,7 @@ class RE {
         cfg: this.cfg,
         dialectCfg: this.dialectCfg,
         params: this.params,
-        layout: new KI(this.cfg.expressionWidth),
+        layout: new wI(this.cfg.expressionWidth),
         inline: !0
       }).format(E);
     } catch (A) {
@@ -19653,11 +19661,11 @@ class RE {
   }
   formatKeywordNode(E) {
     switch (E.tokenType) {
-      case D.RESERVED_JOIN:
+      case o.RESERVED_JOIN:
         return this.formatJoin(E);
-      case D.AND:
-      case D.OR:
-      case D.XOR:
+      case o.AND:
+      case o.OR:
+      case o.XOR:
         return this.formatLogicalOperator(E);
       default:
         return this.formatKeyword(E);
@@ -19676,7 +19684,7 @@ class RE {
     this.layout.add(this.showDataType(E), a.SPACE);
   }
   showKw(E) {
-    return lT(E.tokenType) ? GT(this.showNonTabularKw(E), this.cfg.indentStyle) : this.showNonTabularKw(E);
+    return GT(E.tokenType) ? lT(this.showNonTabularKw(E), this.cfg.indentStyle) : this.showNonTabularKw(E);
   }
   // Like showKw(), but skips tabular formatting
   showNonTabularKw(E) {
@@ -19690,7 +19698,7 @@ class RE {
     }
   }
   showFunctionKw(E) {
-    return lT(E.tokenType) ? GT(this.showNonTabularFunctionKw(E), this.cfg.indentStyle) : this.showNonTabularFunctionKw(E);
+    return GT(E.tokenType) ? lT(this.showNonTabularFunctionKw(E), this.cfg.indentStyle) : this.showNonTabularFunctionKw(E);
   }
   // Like showFunctionKw(), but skips tabular formatting
   showNonTabularFunctionKw(E) {
@@ -19726,9 +19734,9 @@ class RE {
     }
   }
 }
-class $I {
+class JI {
   constructor(E, T) {
-    this.dialect = E, this.cfg = T, this.params = new DI(this.cfg.params);
+    this.dialect = E, this.cfg = T, this.params = new UI(this.cfg.params);
   }
   /**
    * Formats an SQL query.
@@ -19740,7 +19748,7 @@ class $I {
     return this.formatAst(T).trimEnd();
   }
   parse(E) {
-    return WI(this.dialect.tokenizer).parse(E, this.cfg.paramTypes || {});
+    return yI(this.dialect.tokenizer).parse(E, this.cfg.paramTypes || {});
   }
   formatAst(E) {
     return E.map((T) => this.formatStatement(T)).join(`
@@ -19751,14 +19759,14 @@ class $I {
       cfg: this.cfg,
       dialectCfg: this.dialect.formatOptions,
       params: this.params,
-      layout: new yT(new KT(oI(this.cfg)))
+      layout: new yT(new KT(MI(this.cfg)))
     }).format(E.children);
     return E.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? T.add(a.NEWLINE, ";") : T.add(a.NO_NEWLINE, ";")), T.toString();
   }
 }
 class TE extends Error {
 }
-function gI(R) {
+function xI(R) {
   const E = [
     "multilineLists",
     "newlineBeforeOpenParen",
@@ -19772,17 +19780,17 @@ function gI(R) {
       throw new TE(`${T} config is no more supported.`);
   if (R.expressionWidth <= 0)
     throw new TE(`expressionWidth config must be positive number. Received ${R.expressionWidth} instead.`);
-  if (R.params && !wI(R.params) && console.warn('WARNING: All "params" option values should be strings.'), R.paramTypes && !JI(R.paramTypes))
+  if (R.params && !vI(R.params) && console.warn('WARNING: All "params" option values should be strings.'), R.paramTypes && !QI(R.paramTypes))
     throw new TE("Empty regex given in custom paramTypes. That would result in matching infinite amount of parameters.");
   return R;
 }
-function wI(R) {
+function vI(R) {
   return (R instanceof Array ? R : Object.values(R)).every((T) => typeof T == "string");
 }
-function JI(R) {
+function QI(R) {
   return R.custom && Array.isArray(R.custom) ? R.custom.every((E) => E.regex !== "") : !0;
 }
-var xI = function(R, E) {
+var ZI = function(R, E) {
   var T = {};
   for (var A in R) Object.prototype.hasOwnProperty.call(R, A) && E.indexOf(A) < 0 && (T[A] = R[A]);
   if (R != null && typeof Object.getOwnPropertySymbols == "function")
@@ -19790,7 +19798,7 @@ var xI = function(R, E) {
       E.indexOf(A[e]) < 0 && Object.prototype.propertyIsEnumerable.call(R, A[e]) && (T[A[e]] = R[A[e]]);
   return T;
 };
-const $T = {
+const gT = {
   bigquery: "bigquery",
   db2: "db2",
   db2i: "db2i",
@@ -19811,7 +19819,7 @@ const $T = {
   tsql: "transactsql",
   singlestoredb: "singlestoredb",
   snowflake: "snowflake"
-}, vI = Object.keys($T), QI = {
+}, qI = Object.keys(gT), jI = {
   tabWidth: 2,
   useTabs: !1,
   keywordCase: "preserve",
@@ -19824,21 +19832,21 @@ const $T = {
   linesBetweenQueries: 1,
   denseOperators: !1,
   newlineBeforeSemicolon: !1
-}, ZI = (R, E = {}) => {
-  if (typeof E.language == "string" && !vI.includes(E.language))
+}, kI = (R, E = {}) => {
+  if (typeof E.language == "string" && !qI.includes(E.language))
     throw new TE(`Unsupported SQL dialect: ${E.language}`);
-  const T = $T[E.language || "sql"];
-  return qI(R, Object.assign(Object.assign({}, E), { dialect: TI[T] }));
-}, qI = (R, E) => {
-  var { dialect: T } = E, A = xI(E, ["dialect"]);
+  const T = gT[E.language || "sql"];
+  return zI(R, Object.assign(Object.assign({}, E), { dialect: eI[T] }));
+}, zI = (R, E) => {
+  var { dialect: T } = E, A = ZI(E, ["dialect"]);
   if (typeof R != "string")
     throw new Error("Invalid query argument. Expected string, instead got " + typeof R);
-  const e = gI(Object.assign(Object.assign({}, QI), A));
-  return new $I(nI(T), e).format(R);
+  const e = xI(Object.assign(Object.assign({}, jI), A));
+  return new JI(oI(T), e).format(R);
 };
 function uT(R, E) {
   try {
-    return ZI(R, {
+    return kI(R, {
       language: {
         postgres: "postgresql",
         mysql: "mysql",
@@ -19913,7 +19921,7 @@ class bE {
           );
           continue;
         }
-        const S = tR(e.calculatedSql);
+        const S = LR(e.calculatedSql);
         if (!S.isValid) {
           T.push(
             `Invalid calculatedSql syntax in '${E.name}.${A}': ${S.errors.join(", ")}`
@@ -20131,10 +20139,10 @@ ${T.join(`
    * Ensures all referenced cubes and fields exist
    */
   validateQuery(E) {
-    return gT(this.cubes, E);
+    return $T(this.cubes, E);
   }
 }
-function gT(R, E) {
+function $T(R, E) {
   const T = [], A = /* @__PURE__ */ new Set();
   if (E.measures)
     for (const e of E.measures) {
@@ -20213,17 +20221,17 @@ function wT(R, E, T, A) {
   }
   !I.dimensions[S] && !I.measures[S] && T.push(`Filter field '${S}' not found on cube '${e}' (must be a dimension or measure)`);
 }
-function TO(R) {
+function eO(R) {
   return new bE(R);
 }
-const jI = new bE(), RO = jI;
-function AO(R) {
+const EO = new bE(), SO = EO;
+function IO(R) {
   return new bE({
     drizzle: R.drizzle,
     schema: R.schema
   });
 }
-const eO = {
+const OO = {
   /**
    * Create a simple query builder
    */
@@ -20332,24 +20340,24 @@ const eO = {
 export {
   VE as BaseDatabaseExecutor,
   BT as MySQLExecutor,
-  ER as PostgresExecutor,
-  sR as QueryBuilder,
+  AR as PostgresExecutor,
+  _R as QueryBuilder,
   CE as QueryExecutor,
-  CR as QueryPlanner,
-  RR as SQLiteExecutor,
+  rR as QueryPlanner,
+  SR as SQLiteExecutor,
   bE as SemanticLayerCompiler,
-  eO as SemanticLayerUtils,
+  OO as SemanticLayerUtils,
   vE as createDatabaseExecutor,
-  AO as createDrizzleSemanticLayer,
-  zI as createMultiCubeContext,
-  TR as createMySQLExecutor,
+  IO as createDrizzleSemanticLayer,
+  RO as createMultiCubeContext,
+  eR as createMySQLExecutor,
   JE as createPostgresExecutor,
   xE as createSQLiteExecutor,
-  TO as createSemanticLayer,
-  RO as defaultSemanticLayer,
-  EO as defineCube,
+  eO as createSemanticLayer,
+  SO as defaultSemanticLayer,
+  AO as defineCube,
   dT as getJoinType,
   QE as resolveCubeReference,
   X as resolveSqlExpression,
-  jI as semanticLayer
+  EO as semanticLayer
 };