drizzle-cube 0.1.21 → 0.1.24

package/dist/server/index.js

@@ -1,8 +1,8 @@
-var XT = Object.defineProperty;
-var bT = (T, E, R) => E in T ? XT(T, E, { enumerable: !0, configurable: !0, writable: !0, value: R }) : T[E] = R;
-var f = (T, E, R) => bT(T, typeof E != "symbol" ? E + "" : E, R);
-import { sql as r, count as SE, sum as y, max as uE, min as FE, and as d, countDistinct as KT, SQL as yT, or as $T, gt as fE, lt as WE, gte as Q, lte as Z, isNull as gT, isNotNull as JT, notInArray as xT, ne as wT, inArray as XE, eq as mE, desc as vT, asc as bE } from "drizzle-orm";
-class pE {
+var gT = Object.defineProperty;
+var JT = (T, E, R) => E in T ? gT(T, E, { enumerable: !0, configurable: !0, writable: !0, value: R }) : T[E] = R;
+var W = (T, E, R) => JT(T, typeof E != "symbol" ? E + "" : E, R);
+import { sql as _, count as IE, sum as y, max as dE, min as VE, and as d, countDistinct as wT, SQL as xT, or as OE, isNotNull as KE, ne as yE, isNull as $E, eq as EE, notInArray as gE, inArray as NE, lt as eE, gt as CE, gte as J, lte as w, desc as vT, asc as JE } from "drizzle-orm";
+class WE {
   /**
    * Helper method to build pattern for string matching
    * Can be overridden by specific adapters if needed
@@ -21,7 +21,7 @@ class pE {
     }
   }
 }
-class QT extends pE {
+class QT extends WE {
   getEngineType() {
     return "postgres";
   }
@@ -32,21 +32,21 @@ class QT extends pE {
   buildTimeDimension(E, R) {
     switch (E) {
       case "year":
-        return r`DATE_TRUNC('year', ${R}::timestamp)`;
+        return _`DATE_TRUNC('year', ${R}::timestamp)`;
       case "quarter":
-        return r`DATE_TRUNC('quarter', ${R}::timestamp)`;
+        return _`DATE_TRUNC('quarter', ${R}::timestamp)`;
       case "month":
-        return r`DATE_TRUNC('month', ${R}::timestamp)`;
+        return _`DATE_TRUNC('month', ${R}::timestamp)`;
       case "week":
-        return r`DATE_TRUNC('week', ${R}::timestamp)`;
+        return _`DATE_TRUNC('week', ${R}::timestamp)`;
       case "day":
-        return r`DATE_TRUNC('day', ${R}::timestamp)::timestamp`;
+        return _`DATE_TRUNC('day', ${R}::timestamp)::timestamp`;
       case "hour":
-        return r`DATE_TRUNC('hour', ${R}::timestamp)`;
+        return _`DATE_TRUNC('hour', ${R}::timestamp)`;
       case "minute":
-        return r`DATE_TRUNC('minute', ${R}::timestamp)`;
+        return _`DATE_TRUNC('minute', ${R}::timestamp)`;
       case "second":
-        return r`DATE_TRUNC('second', ${R}::timestamp)`;
+        return _`DATE_TRUNC('second', ${R}::timestamp)`;
       default:
         return R;
     }
@@ -56,16 +56,25 @@ class QT extends pE {
    * Extracted from executor.ts:807-813 and multi-cube-builder.ts:468-474
    */
   buildStringCondition(E, R, A) {
-    const S = this.buildPattern(R, A);
     switch (R) {
       case "contains":
-        return r`${E} ILIKE ${S}`;
+        return _`${E} ILIKE ${`%${A}%`}`;
       case "notContains":
-        return r`${E} NOT ILIKE ${S}`;
+        return _`${E} NOT ILIKE ${`%${A}%`}`;
       case "startsWith":
-        return r`${E} ILIKE ${S}`;
+        return _`${E} ILIKE ${`${A}%`}`;
       case "endsWith":
-        return r`${E} ILIKE ${S}`;
+        return _`${E} ILIKE ${`%${A}`}`;
+      case "like":
+        return _`${E} LIKE ${A}`;
+      case "notLike":
+        return _`${E} NOT LIKE ${A}`;
+      case "ilike":
+        return _`${E} ILIKE ${A}`;
+      case "regex":
+        return _`${E} ~* ${A}`;
+      case "notRegex":
+        return _`${E} !~* ${A}`;
       default:
         throw new Error(`Unsupported string operator: ${R}`);
     }
@@ -77,11 +86,11 @@ class QT extends pE {
   castToType(E, R) {
     switch (R) {
       case "timestamp":
-        return r`${E}::timestamp`;
+        return _`${E}::timestamp`;
       case "decimal":
-        return r`${E}::decimal`;
+        return _`${E}::decimal`;
       case "integer":
-        return r`${E}::integer`;
+        return _`${E}::integer`;
       default:
         throw new Error(`Unsupported cast type: ${R}`);
     }
@@ -92,21 +101,21 @@ class QT extends pE {
    * Extracted from multi-cube-builder.ts:284
    */
   buildAvg(E) {
-    return r`COALESCE(AVG(${E}), 0)`;
+    return _`COALESCE(AVG(${E}), 0)`;
   }
   /**
    * Build PostgreSQL CASE WHEN conditional expression
    */
   buildCaseWhen(E, R) {
-    const A = E.map((S) => r`WHEN ${S.when} THEN ${S.then}`).reduce((S, I) => r`${S} ${I}`);
-    return R !== void 0 ? r`CASE ${A} ELSE ${R} END` : r`CASE ${A} END`;
+    const A = E.map((S) => _`WHEN ${S.when} THEN ${S.then}`).reduce((S, I) => _`${S} ${I}`);
+    return R !== void 0 ? _`CASE ${A} ELSE ${R} END` : _`CASE ${A} END`;
   }
   /**
    * Build PostgreSQL boolean literal
    * PostgreSQL uses TRUE/FALSE keywords
    */
   buildBooleanLiteral(E) {
-    return E ? r`TRUE` : r`FALSE`;
+    return E ? _`TRUE` : _`FALSE`;
   }
   /**
    * Convert filter values - PostgreSQL uses native types
@@ -136,7 +145,7 @@ class QT extends pE {
     return E;
   }
 }
-class ZT extends pE {
+class ZT extends WE {
   getEngineType() {
     return "mysql";
   }
@@ -159,12 +168,12 @@ class ZT extends pE {
     };
     switch (E) {
       case "quarter":
-        return r`DATE_ADD(MAKEDATE(YEAR(${R}), 1), INTERVAL (QUARTER(${R}) - 1) * 3 MONTH)`;
+        return _`DATE_ADD(MAKEDATE(YEAR(${R}), 1), INTERVAL (QUARTER(${R}) - 1) * 3 MONTH)`;
       case "week":
-        return r`DATE_SUB(${R}, INTERVAL WEEKDAY(${R}) DAY)`;
+        return _`DATE_SUB(${R}, INTERVAL WEEKDAY(${R}) DAY)`;
       default:
         const S = A[E];
-        return S ? r`STR_TO_DATE(DATE_FORMAT(${R}, ${S}), '%Y-%m-%d %H:%i:%s')` : R;
+        return S ? _`STR_TO_DATE(DATE_FORMAT(${R}, ${S}), '%Y-%m-%d %H:%i:%s')` : R;
     }
   }
   /**
@@ -173,16 +182,25 @@ class ZT extends pE {
    * For guaranteed case-insensitive matching, we use LOWER() functions
    */
   buildStringCondition(E, R, A) {
-    const S = this.buildPattern(R, A.toLowerCase());
     switch (R) {
       case "contains":
-        return r`LOWER(${E}) LIKE ${S}`;
+        return _`LOWER(${E}) LIKE ${`%${A.toLowerCase()}%`}`;
       case "notContains":
-        return r`LOWER(${E}) NOT LIKE ${S}`;
+        return _`LOWER(${E}) NOT LIKE ${`%${A.toLowerCase()}%`}`;
       case "startsWith":
-        return r`LOWER(${E}) LIKE ${S}`;
+        return _`LOWER(${E}) LIKE ${`${A.toLowerCase()}%`}`;
       case "endsWith":
-        return r`LOWER(${E}) LIKE ${S}`;
+        return _`LOWER(${E}) LIKE ${`%${A.toLowerCase()}`}`;
+      case "like":
+        return _`${E} LIKE ${A}`;
+      case "notLike":
+        return _`${E} NOT LIKE ${A}`;
+      case "ilike":
+        return _`LOWER(${E}) LIKE ${A.toLowerCase()}`;
+      case "regex":
+        return _`${E} REGEXP ${A}`;
+      case "notRegex":
+        return _`${E} NOT REGEXP ${A}`;
       default:
         throw new Error(`Unsupported string operator: ${R}`);
     }
@@ -194,11 +212,11 @@ class ZT extends pE {
   castToType(E, R) {
     switch (R) {
       case "timestamp":
-        return r`CAST(${E} AS DATETIME)`;
+        return _`CAST(${E} AS DATETIME)`;
       case "decimal":
-        return r`CAST(${E} AS DECIMAL(10,2))`;
+        return _`CAST(${E} AS DECIMAL(10,2))`;
       case "integer":
-        return r`CAST(${E} AS SIGNED INTEGER)`;
+        return _`CAST(${E} AS SIGNED INTEGER)`;
       default:
         throw new Error(`Unsupported cast type: ${R}`);
     }
@@ -208,21 +226,21 @@ class ZT extends pE {
    * MySQL AVG returns NULL for empty sets, using IFNULL for consistency
    */
   buildAvg(E) {
-    return r`IFNULL(AVG(${E}), 0)`;
+    return _`IFNULL(AVG(${E}), 0)`;
   }
   /**
    * Build MySQL CASE WHEN conditional expression
    */
   buildCaseWhen(E, R) {
-    const A = E.map((S) => r`WHEN ${S.when} THEN ${S.then}`).reduce((S, I) => r`${S} ${I}`);
-    return R !== void 0 ? r`CASE ${A} ELSE ${R} END` : r`CASE ${A} END`;
+    const A = E.map((S) => _`WHEN ${S.when} THEN ${S.then}`).reduce((S, I) => _`${S} ${I}`);
+    return R !== void 0 ? _`CASE ${A} ELSE ${R} END` : _`CASE ${A} END`;
   }
   /**
    * Build MySQL boolean literal
    * MySQL uses TRUE/FALSE keywords (equivalent to 1/0)
    */
   buildBooleanLiteral(E) {
-    return E ? r`TRUE` : r`FALSE`;
+    return E ? _`TRUE` : _`FALSE`;
   }
   /**
    * Convert filter values - MySQL uses native types
@@ -252,7 +270,7 @@ class ZT extends pE {
     return E;
   }
 }
-class qT extends pE {
+class kT extends WE {
   getEngineType() {
     return "sqlite";
   }
@@ -265,28 +283,28 @@ class qT extends pE {
   buildTimeDimension(E, R) {
     switch (E) {
       case "year":
-        return r`datetime(${R}, 'unixepoch', 'start of year')`;
+        return _`datetime(${R}, 'unixepoch', 'start of year')`;
       case "quarter":
-        const A = r`datetime(${R}, 'unixepoch')`;
-        return r`datetime(${A}, 'start of year', 
+        const A = _`datetime(${R}, 'unixepoch')`;
+        return _`datetime(${A}, 'start of year', 
           '+' || (((CAST(strftime('%m', ${A}) AS INTEGER) - 1) / 3) * 3) || ' months')`;
       case "month":
-        return r`datetime(${R}, 'unixepoch', 'start of month')`;
+        return _`datetime(${R}, 'unixepoch', 'start of month')`;
       case "week":
-        return r`date(datetime(${R}, 'unixepoch'), 'weekday 1', '-6 days')`;
+        return _`date(datetime(${R}, 'unixepoch'), 'weekday 1', '-6 days')`;
       case "day":
-        return r`datetime(${R}, 'unixepoch', 'start of day')`;
+        return _`datetime(${R}, 'unixepoch', 'start of day')`;
       case "hour":
-        const S = r`datetime(${R}, 'unixepoch')`;
-        return r`datetime(strftime('%Y-%m-%d %H:00:00', ${S}))`;
+        const S = _`datetime(${R}, 'unixepoch')`;
+        return _`datetime(strftime('%Y-%m-%d %H:00:00', ${S}))`;
       case "minute":
-        const I = r`datetime(${R}, 'unixepoch')`;
-        return r`datetime(strftime('%Y-%m-%d %H:%M:00', ${I}))`;
+        const I = _`datetime(${R}, 'unixepoch')`;
+        return _`datetime(strftime('%Y-%m-%d %H:%M:00', ${I}))`;
       case "second":
-        const N = r`datetime(${R}, 'unixepoch')`;
-        return r`datetime(strftime('%Y-%m-%d %H:%M:%S', ${N}))`;
+        const N = _`datetime(${R}, 'unixepoch')`;
+        return _`datetime(strftime('%Y-%m-%d %H:%M:%S', ${N}))`;
       default:
-        return r`datetime(${R}, 'unixepoch')`;
+        return _`datetime(${R}, 'unixepoch')`;
     }
   }
   /**
@@ -294,16 +312,25 @@ class qT extends pE {
    * SQLite LIKE is case-insensitive by default, but LOWER() ensures consistency
    */
   buildStringCondition(E, R, A) {
-    const S = this.buildPattern(R, A.toLowerCase());
     switch (R) {
       case "contains":
-        return r`LOWER(${E}) LIKE ${S}`;
+        return _`LOWER(${E}) LIKE ${`%${A.toLowerCase()}%`}`;
       case "notContains":
-        return r`LOWER(${E}) NOT LIKE ${S}`;
+        return _`LOWER(${E}) NOT LIKE ${`%${A.toLowerCase()}%`}`;
       case "startsWith":
-        return r`LOWER(${E}) LIKE ${S}`;
+        return _`LOWER(${E}) LIKE ${`${A.toLowerCase()}%`}`;
       case "endsWith":
-        return r`LOWER(${E}) LIKE ${S}`;
+        return _`LOWER(${E}) LIKE ${`%${A.toLowerCase()}`}`;
+      case "like":
+        return _`${E} LIKE ${A}`;
+      case "notLike":
+        return _`${E} NOT LIKE ${A}`;
+      case "ilike":
+        return _`LOWER(${E}) LIKE ${A.toLowerCase()}`;
+      case "regex":
+        return _`${E} GLOB ${A}`;
+      case "notRegex":
+        return _`${E} NOT GLOB ${A}`;
       default:
         throw new Error(`Unsupported string operator: ${R}`);
     }
@@ -315,11 +342,11 @@ class qT extends pE {
   castToType(E, R) {
     switch (R) {
       case "timestamp":
-        return r`datetime(${E} / 1000, 'unixepoch')`;
+        return _`datetime(${E} / 1000, 'unixepoch')`;
       case "decimal":
-        return r`CAST(${E} AS REAL)`;
+        return _`CAST(${E} AS REAL)`;
       case "integer":
-        return r`CAST(${E} AS INTEGER)`;
+        return _`CAST(${E} AS INTEGER)`;
       default:
         throw new Error(`Unsupported cast type: ${R}`);
     }
@@ -329,21 +356,21 @@ class qT extends pE {
    * SQLite AVG returns NULL for empty sets, using IFNULL for consistency
    */
   buildAvg(E) {
-    return r`IFNULL(AVG(${E}), 0)`;
+    return _`IFNULL(AVG(${E}), 0)`;
   }
   /**
    * Build SQLite CASE WHEN conditional expression
    */
   buildCaseWhen(E, R) {
-    const A = E.map((S) => S.then && typeof S.then == "object" && (S.then.queryChunks || S.then._ || S.then.sql) ? r`WHEN ${S.when} THEN ${r.raw("(")}${S.then}${r.raw(")")}` : r`WHEN ${S.when} THEN ${S.then}`).reduce((S, I) => r`${S} ${I}`);
-    return R !== void 0 ? R && typeof R == "object" && (R.queryChunks || R._ || R.sql) ? r`CASE ${A} ELSE ${r.raw("(")}${R}${r.raw(")")} END` : r`CASE ${A} ELSE ${R} END` : r`CASE ${A} END`;
+    const A = E.map((S) => S.then && typeof S.then == "object" && (S.then.queryChunks || S.then._ || S.then.sql) ? _`WHEN ${S.when} THEN ${_.raw("(")}${S.then}${_.raw(")")}` : _`WHEN ${S.when} THEN ${S.then}`).reduce((S, I) => _`${S} ${I}`);
+    return R !== void 0 ? R && typeof R == "object" && (R.queryChunks || R._ || R.sql) ? _`CASE ${A} ELSE ${_.raw("(")}${R}${_.raw(")")} END` : _`CASE ${A} ELSE ${R} END` : _`CASE ${A} END`;
   }
   /**
    * Build SQLite boolean literal
    * SQLite uses 1/0 for true/false
    */
   buildBooleanLiteral(E) {
-    return E ? r`1` : r`0`;
+    return E ? _`1` : _`0`;
   }
   /**
    * Convert filter values to SQLite-compatible types
@@ -379,44 +406,31 @@ class qT extends pE {
     return E;
   }
 }
-function kT(T) {
+function qT(T) {
   switch (T) {
     case "postgres":
       return new QT();
     case "mysql":
       return new ZT();
     case "sqlite":
-      return new qT();
+      return new kT();
     default:
       throw new Error(`Unsupported database engine: ${T}`);
   }
 }
-class dE {
+class fE {
   constructor(E, R, A) {
-    f(this, "databaseAdapter");
+    W(this, "databaseAdapter");
     this.db = E, this.schema = R;
     const S = A || this.getEngineType();
-    this.databaseAdapter = kT(S);
+    this.databaseAdapter = qT(S);
   }
 }
-class jT extends dE {
+class jT extends fE {
   async execute(E, R) {
-    if (E && typeof E == "object") {
-      if (typeof E.execute == "function") {
-        const S = await E.execute();
-        return Array.isArray(S) ? S.map((I) => this.convertNumericFields(I, R)) : S;
-      }
-      if (this.db && typeof this.db.execute == "function")
-        try {
-          const S = await this.db.execute(E);
-          return Array.isArray(S) ? S.map((I) => this.convertNumericFields(I, R)) : S;
-        } catch (S) {
-          if (typeof E.getSQL == "function") {
-            const I = E.getSQL(), N = await this.db.execute(I);
-            return Array.isArray(N) ? N.map((e) => this.convertNumericFields(e, R)) : N;
-          }
-          throw S;
-        }
+    if (E && typeof E == "object" && typeof E.execute == "function") {
+      const S = await E.execute();
+      return Array.isArray(S) ? S.map((I) => this.convertNumericFields(I, R)) : S;
     }
     if (!this.db.execute)
       throw new Error("PostgreSQL database instance must have an execute method");
@@ -464,10 +478,10 @@ class jT extends dE {
     return "postgres";
   }
 }
-function KE(T, E) {
+function wE(T, E) {
   return new jT(T, E, "postgres");
 }
-class zT extends dE {
+class zT extends fE {
   async execute(E, R) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
       const S = await E.execute();
@@ -508,7 +522,7 @@ class zT extends dE {
 function ER(T, E) {
   return new zT(T, E, "mysql");
 }
-class TR extends dE {
+class TR extends fE {
   async execute(E, R) {
     if (E && typeof E == "object" && typeof E.execute == "function") {
       const A = await E.execute();
@@ -554,26 +568,26 @@ class TR extends dE {
     return "sqlite";
   }
 }
-function yE(T, E) {
+function xE(T, E) {
   return new TR(T, E, "sqlite");
 }
-function $E(T, E, R) {
+function vE(T, E, R) {
   if (R)
     switch (R) {
       case "postgres":
-        return KE(T, E);
+        return wE(T, E);
       case "mysql":
         return ER(T, E);
       case "sqlite":
-        return yE(T, E);
+        return xE(T, E);
     }
   if (T.all && T.run)
-    return yE(T, E);
+    return xE(T, E);
   if (T.execute)
-    return KE(T, E);
+    return wE(T, E);
   throw new Error("Unable to determine database engine type. Please specify engineType parameter.");
 }
-function gE(T) {
+function QE(T) {
   return typeof T == "function" ? T() : T;
 }
 function RR(T, E) {
@@ -619,31 +633,31 @@ class AR {
       for (const N of R.dimensions) {
         const [e, n] = N.split("."), O = I.get(e);
         if (O && O.dimensions && O.dimensions[n]) {
-          const s = O.dimensions[n], C = K(s.sql, A);
-          S[N] = r`${C}`.as(N);
+          const t = O.dimensions[n], C = K(t.sql, A);
+          S[N] = _`${C}`.as(N);
         }
       }
     if (R.measures)
       for (const N of R.measures) {
         const [e, n] = N.split("."), O = I.get(e);
         if (O && O.measures && O.measures[n]) {
-          const s = O.measures[n], C = this.buildMeasureExpression(s, A);
-          S[N] = r`${C}`.as(N);
+          const t = O.measures[n], C = this.buildMeasureExpression(t, A);
+          S[N] = _`${C}`.as(N);
         }
       }
     if (R.timeDimensions)
       for (const N of R.timeDimensions) {
         const [e, n] = N.dimension.split("."), O = I.get(e);
         if (O && O.dimensions && O.dimensions[n]) {
-          const s = O.dimensions[n], C = this.buildTimeDimensionExpression(
-            s.sql,
+          const t = O.dimensions[n], C = this.buildTimeDimensionExpression(
+            t.sql,
             N.granularity,
             A
           );
-          S[N.dimension] = r`${C}`.as(N.dimension);
+          S[N.dimension] = _`${C}`.as(N.dimension);
         }
       }
-    return Object.keys(S).length === 0 && (S.count = SE()), S;
+    return Object.keys(S).length === 0 && (S.count = IE()), S;
   }
   /**
    * Build measure expression for HAVING clause, handling CTE references correctly
@@ -652,7 +666,7 @@ class AR {
     if (I && I.preAggregationCTEs) {
       const N = I.preAggregationCTEs.find((e) => e.cube.name === E);
       if (N && N.measures.includes(`${E}.${R}`)) {
-        const e = r`${r.identifier(N.cteAlias)}.${r.identifier(R)}`;
+        const e = _`${_.identifier(N.cteAlias)}.${_.identifier(R)}`;
         switch (A.type) {
           case "count":
           case "countDistinct":
@@ -661,9 +675,9 @@ class AR {
           case "avg":
             return this.databaseAdapter.buildAvg(e);
           case "min":
-            return FE(e);
+            return VE(e);
           case "max":
-            return uE(e);
+            return dE(e);
           case "number":
             return y(e);
           default:
@@ -689,21 +703,21 @@ class AR {
     }
     switch (E.type) {
       case "count":
-        return SE(A);
+        return IE(A);
       case "countDistinct":
-        return KT(A);
+        return wT(A);
       case "sum":
         return y(A);
       case "avg":
         return this.databaseAdapter.buildAvg(A);
       case "min":
-        return FE(A);
+        return VE(A);
       case "max":
-        return uE(A);
+        return dE(A);
       case "number":
         return A;
       default:
-        return SE(A);
+        return IE(A);
     }
   }
   /**
@@ -711,7 +725,7 @@ class AR {
    */
   buildTimeDimensionExpression(E, R, A) {
     const S = K(E, A);
-    return R ? this.databaseAdapter.buildTimeDimension(R, S) : S instanceof yT ? S : r`${S}`;
+    return R ? this.databaseAdapter.buildTimeDimension(R, S) : S instanceof xT ? S : _`${S}`;
   }
   /**
    * Build WHERE conditions from semantic query filters (dimensions only)
@@ -726,11 +740,11 @@ class AR {
       }
     if (R.timeDimensions)
       for (const e of R.timeDimensions) {
-        const [n, O] = e.dimension.split("."), s = N.get(n);
-        if (s && s.dimensions[O] && e.dateRange) {
+        const [n, O] = e.dimension.split("."), t = N.get(n);
+        if (t && t.dimensions[O] && e.dateRange) {
           if (S != null && S.preAggregationCTEs && S.preAggregationCTEs.some((U) => U.cube.name === n))
             continue;
-          const C = s.dimensions[O], t = K(C.sql, A), i = this.buildDateRangeCondition(t, e.dateRange);
+          const C = t.dimensions[O], s = K(C.sql, A), i = this.buildDateRangeCondition(s, e.dateRange);
           i && I.push(i);
         }
       }
@@ -762,24 +776,24 @@ class AR {
       }
       if (i.or) {
         const a = i.or.map((U) => this.processFilter(U, R, A, S, I)).filter((U) => U !== null);
-        return a.length > 0 ? $T(...a) : null;
+        return a.length > 0 ? OE(...a) : null;
       }
     }
     const N = E, [e, n] = N.member.split("."), O = R.get(e);
     if (!O) return null;
-    const s = O.dimensions[n], C = O.measures[n], t = s || C;
-    if (!t) return null;
-    if (S === "where" && s) {
+    const t = O.dimensions[n], C = O.measures[n], s = t || C;
+    if (!s) return null;
+    if (S === "where" && t) {
       if (I != null && I.preAggregationCTEs && I.preAggregationCTEs.some((U) => U.cube.name === e))
         return null;
-      const i = K(s.sql, A);
-      return this.buildFilterCondition(i, N.operator, N.values, t);
+      const i = K(t.sql, A);
+      return this.buildFilterCondition(i, N.operator, N.values, s);
     } else {
       if (S === "where" && C)
         return null;
       if (S === "having" && C) {
         const i = this.buildHavingMeasureExpression(e, n, C, A, I);
-        return this.buildFilterCondition(i, N.operator, N.values, t);
+        return this.buildFilterCondition(i, N.operator, N.values, s);
       }
     }
     return null;
@@ -799,16 +813,16 @@ class AR {
         if (I.length > 1) {
           if ((S == null ? void 0 : S.type) === "time") {
             const e = I.map((n) => this.normalizeDate(n) || n);
-            return XE(E, e);
+            return NE(E, e);
           }
-          return XE(E, I);
+          return NE(E, I);
         } else if (I.length === 1) {
           const e = (S == null ? void 0 : S.type) === "time" && this.normalizeDate(N) || N;
-          return mE(E, e);
+          return EE(E, e);
         }
         return this.databaseAdapter.buildBooleanLiteral(!1);
       case "notEquals":
-        return I.length > 1 ? xT(E, I) : I.length === 1 ? wT(E, N) : null;
+        return I.length > 1 ? gE(E, I) : I.length === 1 ? yE(E, N) : null;
       case "contains":
         return this.databaseAdapter.buildStringCondition(E, "contains", N);
       case "notContains":
@@ -818,35 +832,69 @@ class AR {
       case "endsWith":
         return this.databaseAdapter.buildStringCondition(E, "endsWith", N);
       case "gt":
-        return fE(E, N);
+        return CE(E, N);
       case "gte":
-        return Q(E, N);
+        return J(E, N);
       case "lt":
-        return WE(E, N);
+        return eE(E, N);
       case "lte":
-        return Z(E, N);
+        return w(E, N);
       case "set":
-        return JT(E);
+        return KE(E);
       case "notSet":
-        return gT(E);
+        return $E(E);
       case "inDateRange":
         if (I.length >= 2) {
           const e = this.normalizeDate(I[0]), n = this.normalizeDate(I[1]);
           if (e && n)
             return d(
-              Q(E, e),
-              Z(E, n)
+              J(E, e),
+              w(E, n)
             );
         }
         return null;
       case "beforeDate": {
         const e = this.normalizeDate(N);
-        return e ? WE(E, e) : null;
+        return e ? eE(E, e) : null;
       }
       case "afterDate": {
         const e = this.normalizeDate(N);
-        return e ? fE(E, e) : null;
+        return e ? CE(E, e) : null;
       }
+      case "between":
+        return I.length >= 2 ? d(
+          J(E, I[0]),
+          w(E, I[1])
+        ) : null;
+      case "notBetween":
+        return I.length >= 2 ? OE(
+          eE(E, I[0]),
+          CE(E, I[1])
+        ) : null;
+      case "in":
+        return I.length > 0 ? NE(E, I) : null;
+      case "notIn":
+        return I.length > 0 ? gE(E, I) : null;
+      case "like":
+        return this.databaseAdapter.buildStringCondition(E, "like", N);
+      case "notLike":
+        return this.databaseAdapter.buildStringCondition(E, "notLike", N);
+      case "ilike":
+        return this.databaseAdapter.buildStringCondition(E, "ilike", N);
+      case "regex":
+        return this.databaseAdapter.buildStringCondition(E, "regex", N);
+      case "notRegex":
+        return this.databaseAdapter.buildStringCondition(E, "notRegex", N);
+      case "isEmpty":
+        return OE(
+          $E(E),
+          EE(E, "")
+        );
+      case "isNotEmpty":
+        return d(
+          KE(E),
+          yE(E, "")
+        );
       default:
         return null;
     }
@@ -859,16 +907,16 @@ class AR {
     if (Array.isArray(R) && R.length >= 2) {
       const A = this.normalizeDate(R[0]), S = this.normalizeDate(R[1]);
       return !A || !S ? null : d(
-        Q(E, A),
-        Z(E, S)
+        J(E, A),
+        w(E, S)
       );
     }
     if (typeof R == "string") {
       const A = this.parseRelativeDateRange(R);
       if (A)
         return d(
-          Q(E, A.start),
-          Z(E, A.end)
+          J(E, A.start),
+          w(E, A.end)
         );
       const S = this.normalizeDate(R);
       if (!S) return null;
@@ -876,8 +924,8 @@ class AR {
       I.setUTCHours(0, 0, 0, 0);
       const N = new Date(S);
       return N.setUTCHours(23, 59, 59, 999), d(
-        Q(E, I),
-        Z(E, N)
+        J(E, I),
+        w(E, N)
       );
     }
     return null;
@@ -891,71 +939,71 @@ class AR {
     if (A === "today") {
       const C = new Date(R);
       C.setUTCHours(0, 0, 0, 0);
-      const t = new Date(R);
-      return t.setUTCHours(23, 59, 59, 999), { start: C, end: t };
+      const s = new Date(R);
+      return s.setUTCHours(23, 59, 59, 999), { start: C, end: s };
     }
     if (A === "yesterday") {
       const C = new Date(R);
       C.setUTCDate(N - 1), C.setUTCHours(0, 0, 0, 0);
-      const t = new Date(R);
-      return t.setUTCDate(N - 1), t.setUTCHours(23, 59, 59, 999), { start: C, end: t };
+      const s = new Date(R);
+      return s.setUTCDate(N - 1), s.setUTCHours(23, 59, 59, 999), { start: C, end: s };
     }
     if (A === "this week") {
-      const C = e === 0 ? -6 : 1 - e, t = new Date(R);
-      t.setUTCDate(N + C), t.setUTCHours(0, 0, 0, 0);
-      const i = new Date(t);
-      return i.setUTCDate(t.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: t, end: i };
+      const C = e === 0 ? -6 : 1 - e, s = new Date(R);
+      s.setUTCDate(N + C), s.setUTCHours(0, 0, 0, 0);
+      const i = new Date(s);
+      return i.setUTCDate(s.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: s, end: i };
     }
     if (A === "this month") {
-      const C = new Date(Date.UTC(S, I, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S, I + 1, 0, 23, 59, 59, 999));
-      return { start: C, end: t };
+      const C = new Date(Date.UTC(S, I, 1, 0, 0, 0, 0)), s = new Date(Date.UTC(S, I + 1, 0, 23, 59, 59, 999));
+      return { start: C, end: s };
     }
     if (A === "this quarter") {
-      const C = Math.floor(I / 3), t = new Date(Date.UTC(S, C * 3, 1, 0, 0, 0, 0)), i = new Date(Date.UTC(S, C * 3 + 3, 0, 23, 59, 59, 999));
-      return { start: t, end: i };
+      const C = Math.floor(I / 3), s = new Date(Date.UTC(S, C * 3, 1, 0, 0, 0, 0)), i = new Date(Date.UTC(S, C * 3 + 3, 0, 23, 59, 59, 999));
+      return { start: s, end: i };
     }
     if (A === "this year") {
-      const C = new Date(Date.UTC(S, 0, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S, 11, 31, 23, 59, 59, 999));
-      return { start: C, end: t };
+      const C = new Date(Date.UTC(S, 0, 1, 0, 0, 0, 0)), s = new Date(Date.UTC(S, 11, 31, 23, 59, 59, 999));
+      return { start: C, end: s };
     }
     const n = A.match(/^last\s+(\d+)\s+days?$/);
     if (n) {
-      const C = parseInt(n[1], 10), t = new Date(R);
-      t.setUTCDate(N - C + 1), t.setUTCHours(0, 0, 0, 0);
+      const C = parseInt(n[1], 10), s = new Date(R);
+      s.setUTCDate(N - C + 1), s.setUTCHours(0, 0, 0, 0);
       const i = new Date(R);
-      return i.setUTCHours(23, 59, 59, 999), { start: t, end: i };
+      return i.setUTCHours(23, 59, 59, 999), { start: s, end: i };
     }
     if (A === "last week") {
-      const C = e === 0 ? -13 : -6 - e, t = new Date(R);
-      t.setUTCDate(N + C), t.setUTCHours(0, 0, 0, 0);
-      const i = new Date(t);
-      return i.setUTCDate(t.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: t, end: i };
+      const C = e === 0 ? -13 : -6 - e, s = new Date(R);
+      s.setUTCDate(N + C), s.setUTCHours(0, 0, 0, 0);
+      const i = new Date(s);
+      return i.setUTCDate(s.getUTCDate() + 6), i.setUTCHours(23, 59, 59, 999), { start: s, end: i };
     }
     if (A === "last month") {
-      const C = new Date(Date.UTC(S, I - 1, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S, I, 0, 23, 59, 59, 999));
-      return { start: C, end: t };
+      const C = new Date(Date.UTC(S, I - 1, 1, 0, 0, 0, 0)), s = new Date(Date.UTC(S, I, 0, 23, 59, 59, 999));
+      return { start: C, end: s };
     }
     if (A === "last quarter") {
-      const C = Math.floor(I / 3), t = C === 0 ? 3 : C - 1, i = C === 0 ? S - 1 : S, a = new Date(Date.UTC(i, t * 3, 1, 0, 0, 0, 0)), U = new Date(Date.UTC(i, t * 3 + 3, 0, 23, 59, 59, 999));
+      const C = Math.floor(I / 3), s = C === 0 ? 3 : C - 1, i = C === 0 ? S - 1 : S, a = new Date(Date.UTC(i, s * 3, 1, 0, 0, 0, 0)), U = new Date(Date.UTC(i, s * 3 + 3, 0, 23, 59, 59, 999));
       return { start: a, end: U };
     }
     if (A === "last year") {
-      const C = new Date(Date.UTC(S - 1, 0, 1, 0, 0, 0, 0)), t = new Date(Date.UTC(S - 1, 11, 31, 23, 59, 59, 999));
-      return { start: C, end: t };
+      const C = new Date(Date.UTC(S - 1, 0, 1, 0, 0, 0, 0)), s = new Date(Date.UTC(S - 1, 11, 31, 23, 59, 59, 999));
+      return { start: C, end: s };
     }
     if (A === "last 12 months") {
-      const C = new Date(Date.UTC(S, I - 11, 1, 0, 0, 0, 0)), t = new Date(R);
-      return t.setUTCHours(23, 59, 59, 999), { start: C, end: t };
+      const C = new Date(Date.UTC(S, I - 11, 1, 0, 0, 0, 0)), s = new Date(R);
+      return s.setUTCHours(23, 59, 59, 999), { start: C, end: s };
     }
     const O = A.match(/^last\s+(\d+)\s+months?$/);
     if (O) {
-      const C = parseInt(O[1], 10), t = new Date(Date.UTC(S, I - C + 1, 1, 0, 0, 0, 0)), i = new Date(R);
-      return i.setUTCHours(23, 59, 59, 999), { start: t, end: i };
+      const C = parseInt(O[1], 10), s = new Date(Date.UTC(S, I - C + 1, 1, 0, 0, 0, 0)), i = new Date(R);
+      return i.setUTCHours(23, 59, 59, 999), { start: s, end: i };
     }
-    const s = A.match(/^last\s+(\d+)\s+years?$/);
-    if (s) {
-      const C = parseInt(s[1], 10), t = new Date(Date.UTC(S - C, 0, 1, 0, 0, 0, 0)), i = new Date(R);
-      return i.setUTCHours(23, 59, 59, 999), { start: t, end: i };
+    const t = A.match(/^last\s+(\d+)\s+years?$/);
+    if (t) {
+      const C = parseInt(t[1], 10), s = new Date(Date.UTC(S - C, 0, 1, 0, 0, 0, 0)), i = new Date(R);
+      return i.setUTCHours(23, 59, 59, 999), { start: s, end: i };
     }
     return null;
   }
@@ -990,43 +1038,43 @@ class AR {
       return [];
     const e = E instanceof Map ? E : /* @__PURE__ */ new Map([[E.name, E]]);
     if (R.dimensions)
-      for (const s of R.dimensions) {
-        const [C, t] = s.split("."), i = e.get(C);
-        if (i && i.dimensions && i.dimensions[t])
+      for (const t of R.dimensions) {
+        const [C, s] = t.split("."), i = e.get(C);
+        if (i && i.dimensions && i.dimensions[s])
           if ((n = S == null ? void 0 : S.preAggregationCTEs) == null ? void 0 : n.some((U) => U.cube.name === C)) {
-            const U = S.preAggregationCTEs.find((G) => G.cube.name === C), o = U.joinKeys.find((G) => G.targetColumn === t);
+            const U = S.preAggregationCTEs.find((G) => G.cube.name === C), o = U.joinKeys.find((G) => G.targetColumn === s);
             if (o && o.sourceColumnObj)
               I.push(o.sourceColumnObj);
             else {
-              const G = r`${r.identifier(U.cteAlias)}.${r.identifier(t)}`;
+              const G = _`${_.identifier(U.cteAlias)}.${_.identifier(s)}`;
               I.push(G);
             }
           } else {
-            const U = i.dimensions[t], o = K(U.sql, A);
+            const U = i.dimensions[s], o = K(U.sql, A);
             I.push(o);
           }
       }
     if (R.timeDimensions)
-      for (const s of R.timeDimensions) {
-        const [C, t] = s.dimension.split("."), i = e.get(C);
-        if (i && i.dimensions && i.dimensions[t])
+      for (const t of R.timeDimensions) {
+        const [C, s] = t.dimension.split("."), i = e.get(C);
+        if (i && i.dimensions && i.dimensions[s])
           if ((O = S == null ? void 0 : S.preAggregationCTEs) == null ? void 0 : O.some((U) => U.cube.name === C)) {
-            const U = S.preAggregationCTEs.find((G) => G.cube.name === C), o = U.joinKeys.find((G) => G.targetColumn === t);
+            const U = S.preAggregationCTEs.find((G) => G.cube.name === C), o = U.joinKeys.find((G) => G.targetColumn === s);
             if (o && o.sourceColumnObj) {
               const G = this.buildTimeDimensionExpression(
                 o.sourceColumnObj,
-                s.granularity,
+                t.granularity,
                 A
               );
               I.push(G);
             } else {
-              const G = r`${r.identifier(U.cteAlias)}.${r.identifier(t)}`;
+              const G = _`${_.identifier(U.cteAlias)}.${_.identifier(s)}`;
               I.push(G);
             }
           } else {
-            const U = i.dimensions[t], o = this.buildTimeDimensionExpression(
+            const U = i.dimensions[s], o = this.buildTimeDimensionExpression(
               U.sql,
-              s.granularity,
+              t.granularity,
               A
             );
             I.push(o);
@@ -1048,7 +1096,7 @@ class AR {
       for (const [N, e] of Object.entries(E.order)) {
         if (!S.includes(N))
           throw new Error(`Cannot order by '${N}': field is not selected in the query`);
-        const n = e === "desc" ? vT(r.identifier(N)) : bE(r.identifier(N));
+        const n = e === "desc" ? vT(_.identifier(N)) : JE(_.identifier(N));
         A.push(n);
       }
     if (E.timeDimensions && E.timeDimensions.length > 0) {
@@ -1056,7 +1104,7 @@ class AR {
         (n, O) => n.dimension.localeCompare(O.dimension)
       );
       for (const n of e)
-        N.has(n.dimension) || A.push(bE(r.identifier(n.dimension)));
+        N.has(n.dimension) || A.push(JE(_.identifier(n.dimension)));
     }
     return A;
   }
@@ -1253,24 +1301,24 @@ class SR {
       const n = this.findJoinPath(E, R.name, e, I);
       if (!n || n.length === 0)
         throw new Error(`No join path found from '${R.name}' to '${e}'`);
-      for (const { toCube: O, joinDef: s } of n) {
+      for (const { toCube: O, joinDef: t } of n) {
         if (I.has(O))
           continue;
         const C = E.get(O);
         if (!C)
           throw new Error(`Cube '${O}' not found`);
-        const t = this.buildJoinCondition(
-          s,
+        const s = this.buildJoinCondition(
+          t,
           null,
           // No source alias needed - use the actual column
           null
           // No target alias needed - use the actual column 
-        ), i = RR(s.relationship, s.sqlJoinType);
+        ), i = RR(t.relationship, t.sqlJoinType);
         S.push({
           cube: C,
           alias: `${O.toLowerCase()}_cube`,
           joinType: i,
-          joinCondition: t
+          joinCondition: s
         }), I.add(O);
       }
     }
@@ -1282,7 +1330,7 @@ class SR {
   buildJoinCondition(E, R, A) {
     const S = [];
     for (const I of E.on) {
-      const N = R ? r`${r.identifier(R)}.${r.identifier(I.source.name)}` : I.source, e = A ? r`${r.identifier(A)}.${r.identifier(I.target.name)}` : I.target, n = I.as || mE;
+      const N = R ? _`${_.identifier(R)}.${_.identifier(I.source.name)}` : I.source, e = A ? _`${_.identifier(A)}.${_.identifier(I.target.name)}` : I.target, n = I.as || EE;
       S.push(n(N, e));
     }
     return d(...S);
@@ -1300,18 +1348,18 @@ class SR {
     for (; I.length > 0; ) {
       const { cube: e, path: n } = I.shift(), O = E.get(e);
       if (O != null && O.joins)
-        for (const [, s] of Object.entries(O.joins)) {
-          const t = gE(s.targetCube).name;
-          if (N.has(t))
+        for (const [, t] of Object.entries(O.joins)) {
+          const s = QE(t.targetCube).name;
+          if (N.has(s))
             continue;
           const i = [...n, {
             fromCube: e,
-            toCube: t,
-            joinDef: s
+            toCube: s,
+            joinDef: t
           }];
-          if (t === A)
+          if (s === A)
             return i;
-          N.add(t), I.push({ cube: t, path: i });
+          N.add(s), I.push({ cube: s, path: i });
         }
     }
     return null;
@@ -1328,22 +1376,22 @@ class SR {
       if (!e)
         continue;
       const n = S.measures ? S.measures.filter(
-        (t) => t.startsWith(N.cube.name + ".")
-      ) : [], O = this.extractMeasuresFromFilters(S, N.cube.name), s = [.../* @__PURE__ */ new Set([...n, ...O])];
-      if (s.length === 0)
+        (s) => s.startsWith(N.cube.name + ".")
+      ) : [], O = this.extractMeasuresFromFilters(S, N.cube.name), t = [.../* @__PURE__ */ new Set([...n, ...O])];
+      if (t.length === 0)
         continue;
-      const C = e.on.map((t) => ({
-        sourceColumn: t.source.name,
-        targetColumn: t.target.name,
-        sourceColumnObj: t.source,
-        targetColumnObj: t.target
+      const C = e.on.map((s) => ({
+        sourceColumn: s.source.name,
+        targetColumn: s.target.name,
+        sourceColumnObj: s.source,
+        targetColumnObj: s.target
       }));
       I.push({
         cube: N.cube,
         alias: N.alias,
         cteAlias: `${N.cube.name.toLowerCase()}_agg`,
         joinKeys: C,
-        measures: s
+        measures: t
       });
     }
     return I;
@@ -1355,16 +1403,16 @@ class SR {
     if (!E.joins)
       return null;
     for (const [, A] of Object.entries(E.joins))
-      if (gE(A.targetCube).name === R && A.relationship === "hasMany")
+      if (QE(A.targetCube).name === R && A.relationship === "hasMany")
         return A;
     return null;
   }
 }
-class IE {
+class tE {
   constructor(E) {
-    f(this, "queryBuilder");
-    f(this, "queryPlanner");
-    f(this, "databaseAdapter");
+    W(this, "queryBuilder");
+    W(this, "queryPlanner");
+    W(this, "databaseAdapter");
     if (this.dbExecutor = E, this.databaseAdapter = E.databaseAdapter, !this.databaseAdapter)
       throw new Error("DatabaseExecutor must have a databaseAdapter property");
     this.queryBuilder = new AR(this.databaseAdapter), this.queryPlanner = new SR();
@@ -1374,15 +1422,15 @@ class IE {
    */
   async execute(E, R, A) {
     try {
-      const S = hT(E, R);
+      const S = KT(E, R);
       if (!S.isValid)
         throw new Error(`Query validation failed: ${S.errors.join(", ")}`);
       const I = {
         db: this.dbExecutor.db,
         schema: this.dbExecutor.schema,
         securityContext: A
-      }, N = this.queryPlanner.createQueryPlan(E, R, I), e = this.buildUnifiedQuery(N, R, I), n = this.queryBuilder.collectNumericFields(E, R), O = await this.dbExecutor.execute(e, n), s = Array.isArray(O) ? O.map((t) => {
-        const i = { ...t };
+      }, N = this.queryPlanner.createQueryPlan(E, R, I), e = this.buildUnifiedQuery(N, R, I), n = this.queryBuilder.collectNumericFields(E, R), O = await this.dbExecutor.execute(e, n), t = Array.isArray(O) ? O.map((s) => {
+        const i = { ...s };
         if (R.timeDimensions) {
           for (const a of R.timeDimensions)
             if (a.dimension in i) {
@@ -1397,7 +1445,7 @@ class IE {
         return i;
       }) : [O], C = this.generateAnnotations(N, R);
       return {
-        data: s,
+        data: t,
         annotation: C
       };
     } catch (S) {
@@ -1421,13 +1469,13 @@ class IE {
       if (o.targetColumnObj) {
         e[o.targetColumn] = o.targetColumnObj;
         for (const [G, P] of Object.entries(I.dimensions || {}))
-          P.sql === o.targetColumnObj && G !== o.targetColumn && (e[G] = r`${o.targetColumnObj}`.as(G));
+          P.sql === o.targetColumnObj && G !== o.targetColumn && (e[G] = _`${o.targetColumnObj}`.as(G));
       }
     for (const o of E.measures) {
       const [, G] = o.split(".");
       if (I.measures && I.measures[G]) {
         const P = I.measures[G], H = this.queryBuilder.buildMeasureExpression(P, A);
-        e[G] = r`${H}`.as(G);
+        e[G] = _`${H}`.as(G);
       }
     }
     const n = I.name;
@@ -1436,7 +1484,7 @@ class IE {
         const [G, P] = o.split(".");
         if (G === n && I.dimensions && I.dimensions[P]) {
           const H = I.dimensions[P], l = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, A);
-          e[P] = r`${l}`.as(P);
+          e[P] = _`${l}`.as(P);
         }
       }
     if (R.timeDimensions)
@@ -1444,22 +1492,22 @@ class IE {
         const [G, P] = o.dimension.split(".");
         if (G === n && I.dimensions && I.dimensions[P]) {
           const H = I.dimensions[P], l = this.queryBuilder.buildTimeDimensionExpression(H.sql, o.granularity, A);
-          e[P] = r`${l}`.as(P);
+          e[P] = _`${l}`.as(P);
         }
       }
     if (Object.keys(e).length === 0)
       return null;
     let O = A.db.select(e).from(N.from);
-    const s = S ? {
+    const t = S ? {
       ...S,
       preAggregationCTEs: (U = S.preAggregationCTEs) == null ? void 0 : U.filter((o) => o.cube.name !== I.name)
-    } : void 0, C = this.queryBuilder.buildWhereConditions(I, R, A, s), t = [];
+    } : void 0, C = this.queryBuilder.buildWhereConditions(I, R, A, t), s = [];
     if (R.timeDimensions)
       for (const o of R.timeDimensions) {
         const [G, P] = o.dimension.split(".");
         if (G === n && I.dimensions && I.dimensions[P] && o.dateRange) {
           const H = I.dimensions[P], l = this.queryBuilder.buildMeasureExpression({ sql: H.sql, type: "number" }, A), B = this.queryBuilder.buildDateRangeCondition(l, o.dateRange);
-          B && t.push(B);
+          B && s.push(B);
         }
       }
     if (R.filters) {
@@ -1470,13 +1518,13 @@ class IE {
             const l = I.dimensions[H];
             if (G.operator === "inDateRange") {
               const B = this.queryBuilder.buildMeasureExpression({ sql: l.sql, type: "number" }, A), u = this.queryBuilder.buildDateRangeCondition(B, G.values);
-              u && t.push(u);
+              u && s.push(u);
             }
           }
         }
     }
     const i = [];
-    if (N.where && i.push(N.where), i.push(...C, ...t), i.length > 0) {
+    if (N.where && i.push(N.where), i.push(...C, ...s), i.length > 0) {
       const o = i.length === 1 ? i[0] : d(...i);
       O = O.where(o);
     }
@@ -1512,8 +1560,8 @@ class IE {
       throw new Error(`CTE info not found for cube ${E.cube.name}`);
     const I = [];
     for (const e of S.joinKeys) {
-      const n = e.sourceColumnObj || r.identifier(e.sourceColumn), O = r`${r.identifier(R)}.${r.identifier(e.targetColumn)}`;
-      I.push(mE(n, O));
+      const n = e.sourceColumnObj || _.identifier(e.sourceColumn), O = _`${_.identifier(R)}.${_.identifier(e.targetColumn)}`;
+      I.push(EE(n, O));
     }
     return I.length === 1 ? I[0] : d(...I);
   }
@@ -1541,43 +1589,43 @@ class IE {
           if (n[l]) {
             const [, B] = l.split("."), u = this.getCubesFromPlan(E).get(H);
             if (u && u.measures && u.measures[B]) {
-              const p = u.measures[B], W = r`${r.identifier(P.cteAlias)}.${r.identifier(B)}`;
+              const p = u.measures[B], f = _`${_.identifier(P.cteAlias)}.${_.identifier(B)}`;
               let h;
               switch (p.type) {
                 case "count":
                 case "countDistinct":
                 case "sum":
-                  h = y(W);
+                  h = y(f);
                   break;
                 case "avg":
-                  h = this.databaseAdapter.buildAvg(W);
+                  h = this.databaseAdapter.buildAvg(f);
                   break;
                 case "min":
-                  h = FE(W);
+                  h = VE(f);
                   break;
                 case "max":
-                  h = uE(W);
+                  h = dE(f);
                   break;
                 case "number":
-                  h = y(W);
+                  h = y(f);
                   break;
                 default:
-                  h = y(W);
+                  h = y(f);
               }
-              n[l] = r`${h}`.as(l);
+              n[l] = _`${h}`.as(l);
             }
           }
         for (const l in n) {
           const [B, u] = l.split(".");
           if (B === H) {
-            const p = this.getCubesFromPlan(E).get(H), W = p && ((U = p.dimensions) == null ? void 0 : U[u]), h = l.startsWith(H + ".");
-            if (W || h) {
-              let RE = P.joinKeys.find((AE) => AE.targetColumn === u);
-              if (!RE && ((o = p == null ? void 0 : p.dimensions) != null && o[u])) {
-                const AE = p.dimensions[u].sql;
-                RE = P.joinKeys.find((WT) => WT.targetColumnObj === AE);
+            const p = this.getCubesFromPlan(E).get(H), f = p && ((U = p.dimensions) == null ? void 0 : U[u]), h = l.startsWith(H + ".");
+            if (f || h) {
+              let AE = P.joinKeys.find((SE) => SE.targetColumn === u);
+              if (!AE && ((o = p == null ? void 0 : p.dimensions) != null && o[u])) {
+                const SE = p.dimensions[u].sql;
+                AE = P.joinKeys.find(($T) => $T.targetColumnObj === SE);
               }
-              RE ? n[l] = r`${r.identifier(P.cteAlias)}.${r.identifier(u)}`.as(l) : h && ((G = p == null ? void 0 : p.dimensions) != null && G[u]) && (n[l] = r`${r.identifier(P.cteAlias)}.${r.identifier(u)}`.as(l));
+              AE ? n[l] = _`${_.identifier(P.cteAlias)}.${_.identifier(u)}`.as(l) : h && ((G = p == null ? void 0 : p.dimensions) != null && G[u]) && (n[l] = _`${_.identifier(P.cteAlias)}.${_.identifier(u)}`.as(l));
             }
           }
         }
@@ -1603,7 +1651,7 @@ class IE {
       for (const P of E.joinCubes) {
         const H = I.get(P.cube.name);
         let l, B;
-        H ? (l = r`${r.identifier(H)}`, B = this.buildCTEJoinCondition(P, H, E)) : (l = P.cube.sql(A).from, B = P.joinCondition);
+        H ? (l = _`${_.identifier(H)}`, B = this.buildCTEJoinCondition(P, H, E)) : (l = P.cube.sql(A).from, B = P.joinCondition);
         try {
           switch (P.joinType || "left") {
             case "left":
@@ -1622,13 +1670,13 @@ class IE {
         } catch {
         }
       }
-    const s = [];
-    if (N.where && s.push(N.where), E.joinCubes && E.joinCubes.length > 0)
+    const t = [];
+    if (N.where && t.push(N.where), E.joinCubes && E.joinCubes.length > 0)
       for (const P of E.joinCubes) {
         if (I.get(P.cube.name))
           continue;
         const l = P.cube.sql(A);
-        l.where && s.push(l.where);
+        l.where && t.push(l.where);
       }
     const C = this.queryBuilder.buildWhereConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
@@ -1638,11 +1686,11 @@ class IE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    if (C.length > 0 && s.push(...C), s.length > 0) {
-      const P = s.length === 1 ? s[0] : d(...s);
+    if (C.length > 0 && t.push(...C), t.length > 0) {
+      const P = t.length === 1 ? t[0] : d(...t);
       O = O.where(P);
     }
-    const t = this.queryBuilder.buildGroupByFields(
+    const s = this.queryBuilder.buildGroupByFields(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
       R,
@@ -1650,7 +1698,7 @@ class IE {
       E
       // Pass the queryPlan to handle CTE scenarios
     );
-    t.length > 0 && (O = O.groupBy(...t));
+    s.length > 0 && (O = O.groupBy(...s));
     const i = this.queryBuilder.buildHavingConditions(
       E.joinCubes.length > 0 ? this.getCubesFromPlan(E) : E.primaryCube,
       // Single cube
@@ -1710,9 +1758,9 @@ class IE {
     const A = {}, S = {}, I = {}, N = [E.primaryCube];
     if (E.joinCubes && E.joinCubes.length > 0 && N.push(...E.joinCubes.map((e) => e.cube)), R.measures)
       for (const e of R.measures) {
-        const [n, O] = e.split("."), s = N.find((C) => C.name === n);
-        if (s && s.measures[O]) {
-          const C = s.measures[O];
+        const [n, O] = e.split("."), t = N.find((C) => C.name === n);
+        if (t && t.measures[O]) {
+          const C = t.measures[O];
           A[e] = {
             title: C.title || O,
             shortTitle: C.title || O,
@@ -1722,9 +1770,9 @@ class IE {
       }
     if (R.dimensions)
       for (const e of R.dimensions) {
-        const [n, O] = e.split("."), s = N.find((C) => C.name === n);
-        if (s && s.dimensions[O]) {
-          const C = s.dimensions[O];
+        const [n, O] = e.split("."), t = N.find((C) => C.name === n);
+        if (t && t.dimensions[O]) {
+          const C = t.dimensions[O];
           S[e] = {
             title: C.title || O,
             shortTitle: C.title || O,
@@ -1734,9 +1782,9 @@ class IE {
       }
     if (R.timeDimensions)
       for (const e of R.timeDimensions) {
-        const [n, O] = e.dimension.split("."), s = N.find((C) => C.name === n);
-        if (s && s.dimensions && s.dimensions[O]) {
-          const C = s.dimensions[O];
+        const [n, O] = e.dimension.split("."), t = N.find((C) => C.name === n);
+        if (t && t.dimensions && t.dimensions[O]) {
+          const C = t.dimensions[O];
           I[e.dimension] = {
             title: C.title || O,
             shortTitle: C.title || O,
@@ -1753,10 +1801,10 @@ class IE {
     };
   }
 }
-const L = (T) => T.flatMap(IR), IR = (T) => k(eR(T)).map(NR), NR = (T) => T.replace(/ +/g, " ").trim(), eR = (T) => ({
+const L = (T) => T.flatMap(IR), IR = (T) => q(eR(T)).map(NR), NR = (T) => T.replace(/ +/g, " ").trim(), eR = (T) => ({
   type: "mandatory_block",
-  items: VE(T, 0)[0]
-}), VE = (T, E, R) => {
+  items: XE(T, 0)[0]
+}), XE = (T, E, R) => {
   const A = [];
   for (; T[E]; ) {
     const [S, I] = CR(T, E);
@@ -1777,16 +1825,16 @@ const L = (T) => T.flatMap(IR), IR = (T) => k(eR(T)).map(NR), NR = (T) => T.repl
 }, CR = (T, E) => {
   const R = [];
   for (; ; ) {
-    const [A, S] = sR(T, E);
+    const [A, S] = tR(T, E);
     if (A)
       R.push(A), E = S;
     else
       break;
   }
   return R.length === 1 ? [R[0], E] : [{ type: "concatenation", items: R }, E];
-}, sR = (T, E) => {
+}, tR = (T, E) => {
   if (T[E] === "{")
-    return tR(T, E + 1);
+    return sR(T, E + 1);
   if (T[E] === "[")
     return LR(T, E + 1);
   {
@@ -1795,21 +1843,21 @@ const L = (T) => T.flatMap(IR), IR = (T) => k(eR(T)).map(NR), NR = (T) => T.repl
       R += T[E], E++;
     return [R, E];
   }
-}, tR = (T, E) => {
-  const [R, A] = VE(T, E, "}");
+}, sR = (T, E) => {
+  const [R, A] = XE(T, E, "}");
   return [{ type: "mandatory_block", items: R }, A];
 }, LR = (T, E) => {
-  const [R, A] = VE(T, E, "]");
+  const [R, A] = XE(T, E, "]");
   return [{ type: "optional_block", items: R }, A];
-}, k = (T) => {
+}, q = (T) => {
   if (typeof T == "string")
     return [T];
   if (T.type === "concatenation")
-    return T.items.map(k).reduce(_R, [""]);
+    return T.items.map(q).reduce(_R, [""]);
   if (T.type === "mandatory_block")
-    return T.items.flatMap(k);
+    return T.items.flatMap(q);
   if (T.type === "optional_block")
-    return ["", ...T.items.flatMap(k)];
+    return ["", ...T.items.flatMap(q)];
   throw new Error(`Unknown node type: ${T}`);
 }, _R = (T, E) => {
   const R = [];
@@ -1822,19 +1870,19 @@ var D;
 (function(T) {
   T.QUOTED_IDENTIFIER = "QUOTED_IDENTIFIER", T.IDENTIFIER = "IDENTIFIER", T.STRING = "STRING", T.VARIABLE = "VARIABLE", T.RESERVED_DATA_TYPE = "RESERVED_DATA_TYPE", T.RESERVED_PARAMETERIZED_DATA_TYPE = "RESERVED_PARAMETERIZED_DATA_TYPE", T.RESERVED_KEYWORD = "RESERVED_KEYWORD", T.RESERVED_FUNCTION_NAME = "RESERVED_FUNCTION_NAME", T.RESERVED_PHRASE = "RESERVED_PHRASE", T.RESERVED_SET_OPERATION = "RESERVED_SET_OPERATION", T.RESERVED_CLAUSE = "RESERVED_CLAUSE", T.RESERVED_SELECT = "RESERVED_SELECT", T.RESERVED_JOIN = "RESERVED_JOIN", T.ARRAY_IDENTIFIER = "ARRAY_IDENTIFIER", T.ARRAY_KEYWORD = "ARRAY_KEYWORD", T.CASE = "CASE", T.END = "END", T.WHEN = "WHEN", T.ELSE = "ELSE", T.THEN = "THEN", T.LIMIT = "LIMIT", T.BETWEEN = "BETWEEN", T.AND = "AND", T.OR = "OR", T.XOR = "XOR", T.OPERATOR = "OPERATOR", T.COMMA = "COMMA", T.ASTERISK = "ASTERISK", T.PROPERTY_ACCESS_OPERATOR = "PROPERTY_ACCESS_OPERATOR", T.OPEN_PAREN = "OPEN_PAREN", T.CLOSE_PAREN = "CLOSE_PAREN", T.LINE_COMMENT = "LINE_COMMENT", T.BLOCK_COMMENT = "BLOCK_COMMENT", T.DISABLE_COMMENT = "DISABLE_COMMENT", T.NUMBER = "NUMBER", T.NAMED_PARAMETER = "NAMED_PARAMETER", T.QUOTED_PARAMETER = "QUOTED_PARAMETER", T.NUMBERED_PARAMETER = "NUMBERED_PARAMETER", T.POSITIONAL_PARAMETER = "POSITIONAL_PARAMETER", T.CUSTOM_PARAMETER = "CUSTOM_PARAMETER", T.DELIMITER = "DELIMITER", T.EOF = "EOF";
 })(D = D || (D = {}));
-const MT = (T) => ({
+const HT = (T) => ({
   type: D.EOF,
   raw: "«EOF»",
   text: "«EOF»",
   start: T
-}), w = MT(1 / 0), J = (T) => (E) => E.type === T.type && E.text === T.text, $ = {
-  ARRAY: J({ text: "ARRAY", type: D.RESERVED_DATA_TYPE }),
-  BY: J({ text: "BY", type: D.RESERVED_KEYWORD }),
-  SET: J({ text: "SET", type: D.RESERVED_CLAUSE }),
-  STRUCT: J({ text: "STRUCT", type: D.RESERVED_DATA_TYPE }),
-  WINDOW: J({ text: "WINDOW", type: D.RESERVED_CLAUSE }),
-  VALUES: J({ text: "VALUES", type: D.RESERVED_CLAUSE })
-}, UT = (T) => T === D.RESERVED_DATA_TYPE || T === D.RESERVED_KEYWORD || T === D.RESERVED_FUNCTION_NAME || T === D.RESERVED_PHRASE || T === D.RESERVED_CLAUSE || T === D.RESERVED_SELECT || T === D.RESERVED_SET_OPERATION || T === D.RESERVED_JOIN || T === D.ARRAY_KEYWORD || T === D.CASE || T === D.END || T === D.WHEN || T === D.ELSE || T === D.THEN || T === D.LIMIT || T === D.BETWEEN || T === D.AND || T === D.OR || T === D.XOR, rR = (T) => T === D.AND || T === D.OR || T === D.XOR, nR = [
+}), Q = HT(1 / 0), x = (T) => (E) => E.type === T.type && E.text === T.text, $ = {
+  ARRAY: x({ text: "ARRAY", type: D.RESERVED_DATA_TYPE }),
+  BY: x({ text: "BY", type: D.RESERVED_KEYWORD }),
+  SET: x({ text: "SET", type: D.RESERVED_CLAUSE }),
+  STRUCT: x({ text: "STRUCT", type: D.RESERVED_DATA_TYPE }),
+  WINDOW: x({ text: "WINDOW", type: D.RESERVED_CLAUSE }),
+  VALUES: x({ text: "VALUES", type: D.RESERVED_CLAUSE })
+}, BT = (T) => T === D.RESERVED_DATA_TYPE || T === D.RESERVED_KEYWORD || T === D.RESERVED_FUNCTION_NAME || T === D.RESERVED_PHRASE || T === D.RESERVED_CLAUSE || T === D.RESERVED_SELECT || T === D.RESERVED_SET_OPERATION || T === D.RESERVED_JOIN || T === D.ARRAY_KEYWORD || T === D.CASE || T === D.END || T === D.WHEN || T === D.ELSE || T === D.THEN || T === D.LIMIT || T === D.BETWEEN || T === D.AND || T === D.OR || T === D.XOR, rR = (T) => T === D.AND || T === D.OR || T === D.XOR, nR = [
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/aead_encryption_functions
   "KEYS.NEW_KEYSET",
   "KEYS.ADD_KEY_FROM_RAW_BYTES",
@@ -2540,9 +2588,9 @@ const MT = (T) => ({
   "WITH CONNECTION",
   "WITH PARTITION COLUMNS",
   "REMOTE WITH CONNECTION"
-]), JE = L([
+]), ZE = L([
   "CREATE [OR REPLACE] [TEMP|TEMPORARY|SNAPSHOT|EXTERNAL] TABLE [IF NOT EXISTS]"
-]), OE = L([
+]), sE = L([
   // - create:
   // https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language
   "CREATE [OR REPLACE] [MATERIALIZED] VIEW [IF NOT EXISTS]",
@@ -2653,7 +2701,7 @@ const MT = (T) => ({
   name: "bigquery",
   tokenizerOptions: {
     reservedSelect: PR,
-    reservedClauses: [...oR, ...OE, ...JE],
+    reservedClauses: [...oR, ...sE, ...ZE],
     reservedSetOperations: aR,
     reservedJoins: MR,
     reservedPhrases: UR,
@@ -2680,15 +2728,15 @@ const MT = (T) => ({
     postProcess: cR
   },
   formatOptions: {
-    onelineClauses: [...JE, ...OE],
-    tabularOnelineClauses: OE
+    onelineClauses: [...ZE, ...sE],
+    tabularOnelineClauses: sE
   }
 };
 function cR(T) {
   return lR(HR(T));
 }
 function lR(T) {
-  let E = w;
+  let E = Q;
   return T.map((R) => R.text === "OFFSET" && E.text === "[" ? (E = R, Object.assign(Object.assign({}, R), { type: D.RESERVED_FUNCTION_NAME })) : (E = R, R));
 }
 function HR(T) {
@@ -2700,8 +2748,8 @@ function HR(T) {
       const I = BR(T, A + 1), N = T.slice(A, I + 1);
       R.push({
         type: D.IDENTIFIER,
-        raw: N.map(xE("raw")).join(""),
-        text: N.map(xE("text")).join(""),
+        raw: N.map(kE("raw")).join(""),
+        text: N.map(kE("text")).join(""),
         start: S.start
       }), A = I;
     } else
@@ -2709,7 +2757,7 @@ function HR(T) {
   }
   return R;
 }
-const xE = (T) => (E) => E.type === D.IDENTIFIER || E.type === D.COMMA ? E[T] + " " : E[T];
+const kE = (T) => (E) => E.type === D.IDENTIFIER || E.type === D.COMMA ? E[T] + " " : E[T];
 function BR(T, E) {
   let R = 0;
   for (let A = E; A < T.length; A++) {
@@ -3511,9 +3559,9 @@ const uR = [
   "WHEN [NOT] MATCHED [THEN]",
   "UPDATE SET",
   "INSERT"
-]), wE = L([
+]), qE = L([
   "CREATE [GLOBAL TEMPORARY | EXTERNAL] TABLE [IF NOT EXISTS]"
-]), NE = L([
+]), LE = L([
   // - create:
   "CREATE [OR REPLACE] VIEW",
   // - update:
@@ -3725,11 +3773,11 @@ const uR = [
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), fR = {
+]), WR = {
   name: "db2",
   tokenizerOptions: {
     reservedSelect: mR,
-    reservedClauses: [...pR, ...wE, ...NE],
+    reservedClauses: [...pR, ...qE, ...LE],
     reservedSetOperations: dR,
     reservedJoins: VR,
     reservedPhrases: hR,
@@ -3766,10 +3814,10 @@ const uR = [
     ]
   },
   formatOptions: {
-    onelineClauses: [...wE, ...NE],
-    tabularOnelineClauses: NE
+    onelineClauses: [...qE, ...LE],
+    tabularOnelineClauses: LE
   }
-}, WR = [
+}, fR = [
   // 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",
@@ -4665,7 +4713,7 @@ const uR = [
   "INSERT",
   // Data definition - table
   "FOR SYSTEM NAME"
-]), vE = L(["CREATE [OR REPLACE] TABLE"]), eE = L([
+]), jE = L(["CREATE [OR REPLACE] TABLE"]), _E = L([
   // - create:
   "CREATE [OR REPLACE] [RECURSIVE] VIEW",
   // - update:
@@ -4771,17 +4819,17 @@ const uR = [
   "ON UPDATE",
   "SET NULL",
   "{ROWS | RANGE} BETWEEN"
-]), xR = {
+]), wR = {
   name: "db2i",
   tokenizerOptions: {
     reservedSelect: KR,
-    reservedClauses: [...yR, ...vE, ...eE],
+    reservedClauses: [...yR, ...jE, ..._E],
     reservedSetOperations: $R,
     reservedJoins: gR,
     reservedPhrases: JR,
     reservedKeywords: XR,
     reservedDataTypes: bR,
-    reservedFunctionNames: WR,
+    reservedFunctionNames: fR,
     nestedBlockComments: !0,
     extraParens: ["[]"],
     stringTypes: [
@@ -4795,10 +4843,10 @@ const uR = [
     operators: ["**", "¬=", "¬>", "¬<", "!>", "!<", "||", "=>"]
   },
   formatOptions: {
-    onelineClauses: [...vE, ...eE],
-    tabularOnelineClauses: eE
+    onelineClauses: [...jE, ..._E],
+    tabularOnelineClauses: _E
   }
-}, wR = [
+}, xR = [
   // Functions from DuckDB (excluding those that start with an underscore):
   // SELECT DISTINCT upper(function_name) AS function_name
   // FROM duckdb_functions()
@@ -5623,7 +5671,7 @@ const uR = [
   "UUID",
   "VARBINARY",
   "VARCHAR"
-], ZR = L(["SELECT [ALL | DISTINCT]"]), qR = L([
+], ZR = L(["SELECT [ALL | DISTINCT]"]), kR = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -5647,9 +5695,9 @@ const uR = [
   "SET",
   // other:
   "RETURNING"
-]), QE = L([
+]), zE = L([
   "CREATE [OR REPLACE] [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"
-]), CE = L([
+]), rE = L([
   // TABLE
   // - update:
   "UPDATE",
@@ -5727,7 +5775,7 @@ const uR = [
   "PREPARE",
   "EXECUTE",
   "DEALLOCATE [PREPARE]"
-]), kR = L([
+]), qR = L([
   "UNION [ALL | BY NAME]",
   "EXCEPT [ALL]",
   "INTERSECT [ALL]"
@@ -5749,14 +5797,14 @@ const uR = [
   name: "duckdb",
   tokenizerOptions: {
     reservedSelect: ZR,
-    reservedClauses: [...qR, ...QE, ...CE],
-    reservedSetOperations: kR,
+    reservedClauses: [...kR, ...zE, ...rE],
+    reservedSetOperations: qR,
     reservedJoins: jR,
     reservedPhrases: zR,
     supportsXor: !0,
     reservedKeywords: vR,
     reservedDataTypes: QR,
-    reservedFunctionNames: wR,
+    reservedFunctionNames: xR,
     nestedBlockComments: !0,
     extraParens: ["[]", "{}"],
     stringTypes: [
@@ -5816,8 +5864,8 @@ const uR = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::"],
-    onelineClauses: [...QE, ...CE],
-    tabularOnelineClauses: CE
+    onelineClauses: [...zE, ...rE],
+    tabularOnelineClauses: rE
   }
 }, TA = [
   // https://cwiki.apache.org/confluence/display/Hive/LanguageManual+UDF
@@ -6397,9 +6445,9 @@ const uR = [
   //   https://cwiki.apache.org/confluence/display/Hive/LanguageManual+DML#LanguageManualDML-Loadingfilesintotables
   "LOAD DATA [LOCAL] INPATH",
   "[OVERWRITE] INTO TABLE"
-]), ZE = L([
+]), ET = L([
   "CREATE [TEMPORARY] [EXTERNAL] TABLE [IF NOT EXISTS]"
-]), sE = L([
+]), nE = L([
   // - create:
   "CREATE [MATERIALIZED] VIEW [IF NOT EXISTS]",
   // - update:
@@ -6434,7 +6482,7 @@ const uR = [
   name: "hive",
   tokenizerOptions: {
     reservedSelect: SA,
-    reservedClauses: [...IA, ...ZE, ...sE],
+    reservedClauses: [...IA, ...ET, ...nE],
     reservedSetOperations: OA,
     reservedJoins: NA,
     reservedPhrases: eA,
@@ -6448,20 +6496,20 @@ const uR = [
     operators: ["%", "~", "^", "|", "&", "<=>", "==", "!", "||"]
   },
   formatOptions: {
-    onelineClauses: [...ZE, ...sE],
-    tabularOnelineClauses: sE
+    onelineClauses: [...ET, ...nE],
+    tabularOnelineClauses: nE
   }
 };
-function TE(T) {
+function RE(T) {
   return T.map((E, R) => {
-    const A = T[R + 1] || w;
+    const A = T[R + 1] || Q;
     if ($.SET(E) && A.text === "(")
       return Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME });
-    const S = T[R - 1] || w;
+    const S = T[R - 1] || Q;
     return $.VALUES(E) && S.text === "=" ? Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME }) : E;
   });
 }
-const sA = [
+const tA = [
   // https://mariadb.com/kb/en/reserved-words/
   "ACCESSIBLE",
   "ADD",
@@ -6678,7 +6726,7 @@ const sA = [
   "XOR",
   "YEAR_MONTH",
   "ZEROFILL"
-], tA = [
+], sA = [
   // https://mariadb.com/kb/en/data-types/
   "BIGINT",
   "BINARY",
@@ -6989,9 +7037,9 @@ const sA = [
   "SET",
   // other
   "RETURNING"
-]), qE = L([
+]), TT = L([
   "CREATE [OR REPLACE] [TEMPORARY] TABLE [IF NOT EXISTS]"
-]), tE = L([
+]), DE = L([
   // - create:
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // - update:
@@ -7220,13 +7268,13 @@ const sA = [
   name: "mariadb",
   tokenizerOptions: {
     reservedSelect: _A,
-    reservedClauses: [...rA, ...qE, ...tE],
+    reservedClauses: [...rA, ...TT, ...DE],
     reservedSetOperations: nA,
     reservedJoins: DA,
     reservedPhrases: iA,
     supportsXor: !0,
-    reservedKeywords: sA,
-    reservedDataTypes: tA,
+    reservedKeywords: tA,
+    reservedDataTypes: sA,
     reservedFunctionNames: LA,
     // TODO: support _ char set prefixes such as _utf8, _latin1, _binary, _utf8mb4, etc.
     stringTypes: [
@@ -7260,11 +7308,11 @@ const sA = [
       "*.*"
       // Not actually an operator
     ],
-    postProcess: TE
+    postProcess: RE
   },
   formatOptions: {
-    onelineClauses: [...qE, ...tE],
-    tabularOnelineClauses: tE
+    onelineClauses: [...TT, ...DE],
+    tabularOnelineClauses: DE
   }
 }, oA = [
   // https://dev.mysql.com/doc/refman/8.0/en/keywords.html
@@ -7992,7 +8040,7 @@ const sA = [
   "ON DUPLICATE KEY UPDATE",
   // - update:
   "SET"
-]), kE = L(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), LE = L([
+]), RT = L(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), iE = L([
   // - create:
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // - update:
@@ -8190,7 +8238,7 @@ const sA = [
   name: "mysql",
   tokenizerOptions: {
     reservedSelect: UA,
-    reservedClauses: [...GA, ...kE, ...LE],
+    reservedClauses: [...GA, ...RT, ...iE],
     reservedSetOperations: cA,
     reservedJoins: lA,
     reservedPhrases: HA,
@@ -8232,11 +8280,11 @@ const sA = [
       "*.*"
       // Not actually an operator
     ],
-    postProcess: TE
+    postProcess: RE
   },
   formatOptions: {
-    onelineClauses: [...kE, ...LE],
-    tabularOnelineClauses: LE
+    onelineClauses: [...RT, ...iE],
+    tabularOnelineClauses: iE
   }
 }, uA = [
   // https://docs.pingcap.com/tidb/stable/keywords
@@ -8823,7 +8871,7 @@ const sA = [
   "ON DUPLICATE KEY UPDATE",
   // - update:
   "SET"
-]), jE = L(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), _E = L([
+]), AT = L(["CREATE [TEMPORARY] TABLE [IF NOT EXISTS]"]), PE = L([
   // https://docs.pingcap.com/tidb/stable/sql-statement-create-view
   "CREATE [OR REPLACE] [SQL SECURITY DEFINER | SQL SECURITY INVOKER] VIEW [IF NOT EXISTS]",
   // https://docs.pingcap.com/tidb/stable/sql-statement-update
@@ -8951,11 +8999,11 @@ const sA = [
   "CHARACTER SET",
   "{ROWS | RANGE} BETWEEN",
   "IDENTIFIED BY"
-]), fA = {
+]), WA = {
   name: "tidb",
   tokenizerOptions: {
     reservedSelect: mA,
-    reservedClauses: [...pA, ...jE, ..._E],
+    reservedClauses: [...pA, ...AT, ...PE],
     reservedSetOperations: dA,
     reservedJoins: VA,
     reservedPhrases: hA,
@@ -8997,13 +9045,13 @@ const sA = [
       "*.*"
       // Not actually an operator
     ],
-    postProcess: TE
+    postProcess: RE
   },
   formatOptions: {
-    onelineClauses: [...jE, ..._E],
-    tabularOnelineClauses: _E
+    onelineClauses: [...AT, ...PE],
+    tabularOnelineClauses: PE
   }
-}, WA = [
+}, fA = [
   // https://docs.couchbase.com/server/current/n1ql/n1ql-language-reference/functions.html
   "ABORT",
   "ABS",
@@ -9475,7 +9523,7 @@ const sA = [
   "NEST",
   "UNNEST",
   "RETURNING"
-]), zE = L([
+]), ST = L([
   // - update:
   "UPDATE",
   // - delete:
@@ -9515,18 +9563,18 @@ const sA = [
   "SET CURRENT SCHEMA",
   "SHOW",
   "USE [PRIMARY] KEYS"
-]), $A = L(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), gA = L(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), JA = L(["{ROWS | RANGE | GROUPS} BETWEEN"]), xA = {
+]), $A = L(["UNION [ALL]", "EXCEPT [ALL]", "INTERSECT [ALL]"]), gA = L(["JOIN", "{LEFT | RIGHT} [OUTER] JOIN", "INNER JOIN"]), JA = L(["{ROWS | RANGE | GROUPS} BETWEEN"]), wA = {
   name: "n1ql",
   tokenizerOptions: {
     reservedSelect: KA,
-    reservedClauses: [...yA, ...zE],
+    reservedClauses: [...yA, ...ST],
     reservedSetOperations: $A,
     reservedJoins: gA,
     reservedPhrases: JA,
     supportsXor: !0,
     reservedKeywords: XA,
     reservedDataTypes: bA,
-    reservedFunctionNames: WA,
+    reservedFunctionNames: fA,
     // 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.
@@ -9538,9 +9586,9 @@ const sA = [
     operators: ["%", "==", ":", "||"]
   },
   formatOptions: {
-    onelineClauses: zE
+    onelineClauses: ST
   }
-}, wA = [
+}, xA = [
   // https://docs.oracle.com/cd/B19306_01/appdev.102/b14261/reservewords.htm
   // 'A',
   "ADD",
@@ -10148,7 +10196,7 @@ const sA = [
   "PRESENTNNV",
   "PRESENTV",
   "PREVIOUS"
-], ZA = L(["SELECT [ALL | DISTINCT | UNIQUE]"]), qA = L([
+], ZA = L(["SELECT [ALL | DISTINCT | UNIQUE]"]), kA = L([
   // queries
   "WITH",
   "FROM",
@@ -10172,9 +10220,9 @@ const sA = [
   "UPDATE SET",
   // other
   "RETURNING"
-]), ET = L([
+]), IT = L([
   "CREATE [GLOBAL TEMPORARY | PRIVATE TEMPORARY | SHARDED | DUPLICATED | IMMUTABLE BLOCKCHAIN | BLOCKCHAIN | IMMUTABLE] TABLE"
-]), rE = L([
+]), oE = L([
   // - create:
   "CREATE [OR REPLACE] [NO FORCE | FORCE] [EDITIONING | EDITIONABLE | EDITIONABLE EDITIONING | NONEDITIONABLE] VIEW",
   "CREATE MATERIALIZED VIEW",
@@ -10202,7 +10250,7 @@ const sA = [
   "EXCEPTION",
   "LOOP",
   "START WITH"
-]), kA = L(["UNION [ALL]", "MINUS", "INTERSECT"]), jA = L([
+]), qA = L(["UNION [ALL]", "MINUS", "INTERSECT"]), jA = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
@@ -10218,12 +10266,12 @@ const sA = [
   name: "plsql",
   tokenizerOptions: {
     reservedSelect: ZA,
-    reservedClauses: [...qA, ...ET, ...rE],
-    reservedSetOperations: kA,
+    reservedClauses: [...kA, ...IT, ...oE],
+    reservedSetOperations: qA,
     reservedJoins: jA,
     reservedPhrases: zA,
     supportsXor: !0,
-    reservedKeywords: wA,
+    reservedKeywords: xA,
     reservedDataTypes: vA,
     reservedFunctionNames: QA,
     stringTypes: [
@@ -10254,13 +10302,13 @@ const sA = [
   },
   formatOptions: {
     alwaysDenseOperators: ["@"],
-    onelineClauses: [...ET, ...rE],
-    tabularOnelineClauses: rE
+    onelineClauses: [...IT, ...oE],
+    tabularOnelineClauses: oE
   }
 };
 function TS(T) {
-  let E = w;
-  return T.map((R) => $.SET(R) && $.BY(E) ? Object.assign(Object.assign({}, R), { type: D.RESERVED_KEYWORD }) : (UT(R.type) && (E = R), R));
+  let E = Q;
+  return T.map((R) => $.SET(R) && $.BY(E) ? Object.assign(Object.assign({}, R), { type: D.RESERVED_KEYWORD }) : (BT(R.type) && (E = R), R));
 }
 const RS = [
   // https://www.postgresql.org/docs/14/functions.html
@@ -11122,9 +11170,9 @@ const RS = [
   "SET",
   // other
   "RETURNING"
-]), TT = L([
+]), OT = L([
   "CREATE [GLOBAL | LOCAL] [TEMPORARY | TEMP | UNLOGGED] TABLE [IF NOT EXISTS]"
-]), nE = L([
+]), aE = L([
   // - create
   "CREATE [OR REPLACE] [TEMP | TEMPORARY] [RECURSIVE] VIEW",
   "CREATE [MATERIALIZED] VIEW [IF NOT EXISTS]",
@@ -11345,11 +11393,11 @@ const RS = [
   "IS [NOT] DISTINCT FROM",
   "NULLS {FIRST | LAST}",
   "WITH ORDINALITY"
-]), sS = {
+]), tS = {
   name: "postgresql",
   tokenizerOptions: {
     reservedSelect: IS,
-    reservedClauses: [...OS, ...TT, ...nE],
+    reservedClauses: [...OS, ...OT, ...aE],
     reservedSetOperations: NS,
     reservedJoins: eS,
     reservedPhrases: CS,
@@ -11466,10 +11514,10 @@ const RS = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::", ":"],
-    onelineClauses: [...TT, ...nE],
-    tabularOnelineClauses: nE
+    onelineClauses: [...OT, ...aE],
+    tabularOnelineClauses: aE
   }
-}, tS = [
+}, sS = [
   // https://docs.aws.amazon.com/redshift/latest/dg/c_Aggregate_Functions.html
   "ANY_VALUE",
   "APPROXIMATE PERCENTILE_DISC",
@@ -12043,9 +12091,9 @@ const RS = [
   "VALUES",
   // - update:
   "SET"
-]), RT = L([
+]), NT = L([
   "CREATE [TEMPORARY | TEMP | LOCAL TEMPORARY | LOCAL TEMP] TABLE [IF NOT EXISTS]"
-]), DE = L([
+]), ME = L([
   // - create:
   "CREATE [OR REPLACE | MATERIALIZED] VIEW",
   // - update:
@@ -12154,13 +12202,13 @@ const RS = [
   name: "redshift",
   tokenizerOptions: {
     reservedSelect: rS,
-    reservedClauses: [...nS, ...RT, ...DE],
+    reservedClauses: [...nS, ...NT, ...ME],
     reservedSetOperations: DS,
     reservedJoins: iS,
     reservedPhrases: PS,
     reservedKeywords: LS,
     reservedDataTypes: _S,
-    reservedFunctionNames: tS,
+    reservedFunctionNames: sS,
     stringTypes: ["''-qq"],
     identTypes: ['""-qq'],
     identChars: { first: "#" },
@@ -12183,8 +12231,8 @@ const RS = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::"],
-    onelineClauses: [...RT, ...DE],
-    tabularOnelineClauses: DE
+    onelineClauses: [...NT, ...ME],
+    tabularOnelineClauses: ME
   }
 }, aS = [
   // https://deepkb.com/CO_000013/en/kb/IMPORT-fbfa59f0-2bf1-31fe-bb7b-0f9efe9932c6/spark-sql-keywords
@@ -12829,7 +12877,7 @@ const RS = [
   //   https://spark.apache.org/docs/latest/sql-ref-syntax-dml-load.html
   "LOAD DATA [LOCAL] INPATH",
   "[OVERWRITE] INTO TABLE"
-]), AT = L(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), iE = L([
+]), eT = L(["CREATE [EXTERNAL] TABLE [IF NOT EXISTS]"]), UE = L([
   // - create:
   "CREATE [OR REPLACE] [GLOBAL TEMPORARY | TEMPORARY] VIEW [IF NOT EXISTS]",
   // - drop table:
@@ -12907,7 +12955,7 @@ const RS = [
   name: "spark",
   tokenizerOptions: {
     reservedSelect: GS,
-    reservedClauses: [...cS, ...AT, ...iE],
+    reservedClauses: [...cS, ...eT, ...UE],
     reservedSetOperations: lS,
     reservedJoins: HS,
     reservedPhrases: BS,
@@ -12929,13 +12977,13 @@ const RS = [
     postProcess: FS
   },
   formatOptions: {
-    onelineClauses: [...AT, ...iE],
-    tabularOnelineClauses: iE
+    onelineClauses: [...eT, ...UE],
+    tabularOnelineClauses: UE
   }
 };
 function FS(T) {
   return T.map((E, R) => {
-    const A = T[R - 1] || w, S = T[R + 1] || w;
+    const A = T[R - 1] || Q, S = T[R + 1] || Q;
     return $.WINDOW(E) && S.type === D.OPEN_PAREN ? Object.assign(Object.assign({}, E), { type: D.RESERVED_FUNCTION_NAME }) : E.text === "ITEMS" && E.type === D.RESERVED_KEYWORD && !(A.text === "COLLECTION" && S.text === "TERMINATED") ? Object.assign(Object.assign({}, E), { type: D.IDENTIFIER, text: E.raw }) : E;
   });
 }
@@ -13256,7 +13304,7 @@ const YS = [
   "VALUES",
   // - update:
   "SET"
-]), ST = L(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), PE = L([
+]), CT = L(["CREATE [TEMPORARY | TEMP] TABLE [IF NOT EXISTS]"]), GE = L([
   // - create:
   "CREATE [TEMPORARY | TEMP] VIEW [IF NOT EXISTS]",
   // - update:
@@ -13275,13 +13323,13 @@ const YS = [
   "RENAME TO",
   // - set schema
   "SET SCHEMA"
-]), hS = L(["UNION [ALL]", "EXCEPT", "INTERSECT"]), fS = L([
+]), hS = L(["UNION [ALL]", "EXCEPT", "INTERSECT"]), WS = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), WS = L([
+]), fS = L([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE | GROUPS} BETWEEN",
   "DO UPDATE"
@@ -13289,10 +13337,10 @@ const YS = [
   name: "sqlite",
   tokenizerOptions: {
     reservedSelect: dS,
-    reservedClauses: [...VS, ...ST, ...PE],
+    reservedClauses: [...VS, ...CT, ...GE],
     reservedSetOperations: hS,
-    reservedJoins: fS,
-    reservedPhrases: WS,
+    reservedJoins: WS,
+    reservedPhrases: fS,
     reservedKeywords: mS,
     reservedDataTypes: pS,
     reservedFunctionNames: YS,
@@ -13308,8 +13356,8 @@ const YS = [
     operators: ["%", "~", "&", "|", "<<", ">>", "==", "->", "->>", "||"]
   },
   formatOptions: {
-    onelineClauses: [...ST, ...PE],
-    tabularOnelineClauses: PE
+    onelineClauses: [...CT, ...GE],
+    tabularOnelineClauses: GE
   }
 }, bS = [
   // https://jakewheat.github.io/sql-overview/sql-2008-foundation-grammar.html#_6_9_set_function_specification
@@ -13665,7 +13713,7 @@ const YS = [
   "VALUES",
   // - update:
   "SET"
-]), IT = L(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), oE = L([
+]), tT = L(["CREATE [GLOBAL TEMPORARY | LOCAL TEMPORARY] TABLE"]), cE = L([
   // - create:
   "CREATE [RECURSIVE] VIEW",
   // - update:
@@ -13694,23 +13742,23 @@ const YS = [
   "UNION [ALL | DISTINCT]",
   "EXCEPT [ALL | DISTINCT]",
   "INTERSECT [ALL | DISTINCT]"
-]), xS = L([
+]), wS = L([
   "JOIN",
   "{LEFT | RIGHT | FULL} [OUTER] JOIN",
   "{INNER | CROSS} JOIN",
   "NATURAL [INNER] JOIN",
   "NATURAL {LEFT | RIGHT | FULL} [OUTER] JOIN"
-]), wS = L([
+]), xS = L([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
 ]), vS = {
   name: "sql",
   tokenizerOptions: {
     reservedSelect: $S,
-    reservedClauses: [...gS, ...IT, ...oE],
+    reservedClauses: [...gS, ...tT, ...cE],
     reservedSetOperations: JS,
-    reservedJoins: xS,
-    reservedPhrases: wS,
+    reservedJoins: wS,
+    reservedPhrases: xS,
     reservedKeywords: KS,
     reservedDataTypes: yS,
     reservedFunctionNames: bS,
@@ -13723,8 +13771,8 @@ const YS = [
     operators: ["||"]
   },
   formatOptions: {
-    onelineClauses: [...IT, ...oE],
-    tabularOnelineClauses: oE
+    onelineClauses: [...tT, ...cE],
+    tabularOnelineClauses: cE
   }
 }, QS = [
   // https://github.com/trinodb/trino/tree/432d2897bdef99388c1a47188743a061c4ac1f34/docs/src/main/sphinx/functions
@@ -14397,7 +14445,7 @@ const YS = [
   "WRAPPER",
   "WRITE",
   "ZONE"
-], qS = [
+], kS = [
   // 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",
@@ -14436,7 +14484,7 @@ const YS = [
   "CODEPOINTS",
   "FUNCTION",
   "JSONPATH"
-], kS = L(["SELECT [ALL | DISTINCT]"]), jS = L([
+], qS = L(["SELECT [ALL | DISTINCT]"]), jS = L([
   // queries
   "WITH [RECURSIVE]",
   "FROM",
@@ -14464,7 +14512,7 @@ const YS = [
   "PATTERN",
   "SUBSET",
   "DEFINE"
-]), OT = L(["CREATE TABLE [IF NOT EXISTS]"]), aE = L([
+]), sT = L(["CREATE TABLE [IF NOT EXISTS]"]), lE = L([
   // - create:
   "CREATE [OR REPLACE] [MATERIALIZED] VIEW",
   // - update:
@@ -14539,13 +14587,13 @@ const YS = [
 ]), RI = {
   name: "trino",
   tokenizerOptions: {
-    reservedSelect: kS,
-    reservedClauses: [...jS, ...OT, ...aE],
+    reservedSelect: qS,
+    reservedClauses: [...jS, ...sT, ...lE],
     reservedSetOperations: zS,
     reservedJoins: EI,
     reservedPhrases: TI,
     reservedKeywords: ZS,
-    reservedDataTypes: qS,
+    reservedDataTypes: kS,
     reservedFunctionNames: QS,
     // Trino also supports {- ... -} parenthesis.
     // The formatting of these currently works out as a result of { and -
@@ -14575,8 +14623,8 @@ const YS = [
     ]
   },
   formatOptions: {
-    onelineClauses: [...OT, ...aE],
-    tabularOnelineClauses: aE
+    onelineClauses: [...sT, ...lE],
+    tabularOnelineClauses: lE
   }
 }, AI = [
   // https://docs.microsoft.com/en-us/sql/t-sql/functions/functions?view=sql-server-ver15
@@ -15118,7 +15166,7 @@ const YS = [
   "UPDATE SET",
   // Data definition
   "CREATE [OR ALTER] {PROC | PROCEDURE}"
-]), NT = L(["CREATE TABLE"]), ME = L([
+]), LT = L(["CREATE TABLE"]), HE = L([
   // - create:
   "CREATE [OR ALTER] [MATERIALIZED] VIEW",
   // - update:
@@ -15304,17 +15352,17 @@ const YS = [
   "{INNER | CROSS} JOIN",
   // non-standard joins
   "{CROSS | OUTER} APPLY"
-]), sI = L([
+]), tI = L([
   "ON {UPDATE | DELETE} [SET NULL | SET DEFAULT]",
   "{ROWS | RANGE} BETWEEN"
-]), tI = {
+]), sI = {
   name: "transactsql",
   tokenizerOptions: {
     reservedSelect: OI,
-    reservedClauses: [...NI, ...NT, ...ME],
+    reservedClauses: [...NI, ...LT, ...HE],
     reservedSetOperations: eI,
     reservedJoins: CI,
-    reservedPhrases: sI,
+    reservedPhrases: tI,
     reservedKeywords: SI,
     reservedDataTypes: II,
     reservedFunctionNames: AI,
@@ -15347,8 +15395,8 @@ const YS = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::"],
-    onelineClauses: [...NT, ...ME],
-    tabularOnelineClauses: ME
+    onelineClauses: [...LT, ...HE],
+    tabularOnelineClauses: HE
   }
 }, LI = [
   // List of all keywords taken from:
@@ -15914,9 +15962,9 @@ const YS = [
   // Data definition
   "CREATE [OR REPLACE] [TEMPORARY] PROCEDURE [IF NOT EXISTS]",
   "CREATE [OR REPLACE] [EXTERNAL] FUNCTION"
-]), eT = L([
+]), _T = L([
   "CREATE [ROWSTORE] [REFERENCE | TEMPORARY | GLOBAL TEMPORARY] TABLE [IF NOT EXISTS]"
-]), UE = L([
+]), BE = L([
   // - create:
   "CREATE VIEW",
   // - update:
@@ -16115,7 +16163,7 @@ const YS = [
   name: "singlestoredb",
   tokenizerOptions: {
     reservedSelect: nI,
-    reservedClauses: [...DI, ...eT, ...UE],
+    reservedClauses: [...DI, ..._T, ...BE],
     reservedSetOperations: iI,
     reservedJoins: PI,
     reservedPhrases: oI,
@@ -16154,12 +16202,12 @@ const YS = [
       "*.*"
       // Not actually an operator
     ],
-    postProcess: TE
+    postProcess: RE
   },
   formatOptions: {
     alwaysDenseOperators: ["::", "::$", "::%"],
-    onelineClauses: [...eT, ...UE],
-    tabularOnelineClauses: UE
+    onelineClauses: [..._T, ...BE],
+    tabularOnelineClauses: BE
   }
 }, MI = [
   // https://docs.snowflake.com/en/sql-reference-functions.html
@@ -16930,10 +16978,10 @@ const YS = [
   "WHEN MATCHED [AND]",
   "THEN {UPDATE SET | DELETE}",
   "WHEN NOT MATCHED THEN INSERT"
-]), CT = L([
+]), rT = L([
   "CREATE [OR REPLACE] [VOLATILE] TABLE [IF NOT EXISTS]",
   "CREATE [OR REPLACE] [LOCAL | GLOBAL] {TEMP|TEMPORARY} TABLE [IF NOT EXISTS]"
-]), GE = L([
+]), uE = L([
   // - create:
   "CREATE [OR REPLACE] [SECURE] [RECURSIVE] VIEW [IF NOT EXISTS]",
   // - update:
@@ -17185,7 +17233,7 @@ const YS = [
   name: "snowflake",
   tokenizerOptions: {
     reservedSelect: cI,
-    reservedClauses: [...lI, ...CT, ...GE],
+    reservedClauses: [...lI, ...rT, ...uE],
     reservedSetOperations: HI,
     reservedJoins: BI,
     reservedPhrases: uI,
@@ -17221,46 +17269,46 @@ const YS = [
   },
   formatOptions: {
     alwaysDenseOperators: ["::"],
-    onelineClauses: [...CT, ...GE],
-    tabularOnelineClauses: GE
+    onelineClauses: [...rT, ...uE],
+    tabularOnelineClauses: uE
   }
 }, YI = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   bigquery: GR,
-  db2: fR,
-  db2i: xR,
+  db2: WR,
+  db2i: wR,
   duckdb: EA,
   hive: CA,
   mariadb: PA,
   mysql: BA,
-  n1ql: xA,
+  n1ql: wA,
   plsql: ES,
-  postgresql: sS,
+  postgresql: tS,
   redshift: oS,
   singlestoredb: aI,
   snowflake: FI,
   spark: uS,
   sql: vS,
   sqlite: XS,
-  tidb: fA,
-  transactsql: tI,
+  tidb: WA,
+  transactsql: sI,
   trino: RI
-}, Symbol.toStringTag, { value: "Module" })), q = (T) => T[T.length - 1], GT = (T) => T.sort((E, R) => R.length - E.length || E.localeCompare(R)), j = (T) => T.replace(/\s+/gu, " "), cE = (T) => /\n/.test(T), V = (T) => T.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), sT = /\s+/uy, g = (T) => new RegExp(`(?:${T})`, "uy"), mI = (T) => T.split("").map((E) => / /gu.test(E) ? "\\s+" : `[${E.toUpperCase()}${E.toLowerCase()}]`).join(""), pI = (T) => T + "(?:-" + T + ")*", dI = ({ prefixes: T, requirePrefix: E }) => `(?:${T.map(mI).join("|")}${E ? "" : "|"})`, VI = (T) => new RegExp(`(?:${T.map(V).join("|")}).*?(?=\r
+}, Symbol.toStringTag, { value: "Module" })), k = (T) => T[T.length - 1], uT = (T) => T.sort((E, R) => R.length - E.length || E.localeCompare(R)), j = (T) => T.replace(/\s+/gu, " "), FE = (T) => /\n/.test(T), V = (T) => T.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&"), nT = /\s+/uy, g = (T) => new RegExp(`(?:${T})`, "uy"), mI = (T) => T.split("").map((E) => / /gu.test(E) ? "\\s+" : `[${E.toUpperCase()}${E.toLowerCase()}]`).join(""), pI = (T) => T + "(?:-" + T + ")*", dI = ({ prefixes: T, requirePrefix: E }) => `(?:${T.map(mI).join("|")}${E ? "" : "|"})`, VI = (T) => new RegExp(`(?:${T.map(V).join("|")}).*?(?=\r
 |\r|
-|$)`, "uy"), tT = (T, E = []) => {
+|$)`, "uy"), DT = (T, E = []) => {
   const R = T === "open" ? 0 : 1, A = ["()", ...E].map((S) => S[R]);
   return g(A.map(V).join("|"));
-}, LT = (T) => g(`${GT(T).map(V).join("|")}`), hI = ({ rest: T, dashes: E }) => T || E ? `(?![${T || ""}${E ? "-" : ""}])` : "", X = (T, E = {}) => {
+}, iT = (T) => g(`${uT(T).map(V).join("|")}`), hI = ({ rest: T, dashes: E }) => T || E ? `(?![${T || ""}${E ? "-" : ""}])` : "", X = (T, E = {}) => {
   if (T.length === 0)
     return /^\b$/u;
-  const R = hI(E), A = GT(T).map(V).join("|").replace(/ /gu, "\\s+");
+  const R = hI(E), A = uT(T).map(V).join("|").replace(/ /gu, "\\s+");
   return new RegExp(`(?:${A})${R}\\b`, "iuy");
-}, lE = (T, E) => {
+}, YE = (T, E) => {
   if (!T.length)
     return;
   const R = T.map(V).join("|");
   return g(`(?:${R})(?:${E})`);
-}, fI = () => {
+}, WI = () => {
   const T = {
     "<": ">",
     "[": "]",
@@ -17268,7 +17316,7 @@ const YS = [
     "{": "}"
   }, E = "{left}(?:(?!{right}').)*?{right}", R = Object.entries(T).map(([N, e]) => E.replace(/{left}/g, V(N)).replace(/{right}/g, V(e))), A = V(Object.keys(T).join(""));
   return `[Qq]'(?:${String.raw`(?<tag>[^\s${A}])(?:(?!\k<tag>').)*?\k<tag>`}|${R.join("|")})'`;
-}, _T = {
+}, PT = {
   // - backtick quoted (using `` to escape)
   "``": "(?:`[^`]*`)+",
   // - Transact-SQL square bracket quoted (using ]] to escape)
@@ -17292,12 +17340,12 @@ const YS = [
   // Hive and Spark variables: ${name}
   "{}": String.raw`(?:\{[^\}]*\})`,
   // Oracle q'' strings: q'<text>' q'|text|' ...
-  "q''": fI()
-}, cT = (T) => typeof T == "string" ? _T[T] : "regex" in T ? T.regex : dI(T) + _T[T.quote], WI = (T) => g(T.map((E) => "regex" in E ? E.regex : cT(E)).join("|")), lT = (T) => T.map(cT).join("|"), rT = (T) => g(lT(T)), XI = (T = {}) => g(HT(T)), HT = ({ first: T, rest: E, dashes: R, allowFirstCharNumber: A } = {}) => {
+  "q''": WI()
+}, FT = (T) => typeof T == "string" ? PT[T] : "regex" in T ? T.regex : dI(T) + PT[T.quote], fI = (T) => g(T.map((E) => "regex" in E ? E.regex : FT(E)).join("|")), YT = (T) => T.map(FT).join("|"), oT = (T) => g(YT(T)), XI = (T = {}) => g(mT(T)), mT = ({ first: T, rest: E, dashes: R, allowFirstCharNumber: A } = {}) => {
   const S = "\\p{Alphabetic}\\p{Mark}_", I = "\\p{Decimal_Number}", N = V(T ?? ""), e = V(E ?? ""), n = A ? `[${S}${I}${N}][${S}${I}${e}]*` : `[${S}${N}][${S}${I}${e}]*`;
   return R ? pI(n) : n;
 };
-function BT(T, E) {
+function pT(T, E) {
   const R = T.slice(0, E).split(/\n/);
   return { line: R.length, col: R[R.length - 1].length + 1 };
 }
@@ -17327,7 +17375,7 @@ class bI {
     return R;
   }
   createParseError() {
-    const E = this.input.slice(this.index, this.index + 10), { line: R, col: A } = BT(this.input, this.index);
+    const E = this.input.slice(this.index, this.index + 10), { line: R, col: A } = pT(this.input, this.index);
     return new Error(`Parse error: Unexpected "${E}" at line ${R} column ${A}.
 ${this.dialectInfo()}`);
   }
@@ -17336,8 +17384,8 @@ ${this.dialectInfo()}`);
 If possible, please select a more specific dialect (like sqlite, postgresql, etc).` : `SQL dialect used: "${this.dialectName}".`;
   }
   getWhitespace() {
-    sT.lastIndex = this.index;
-    const E = sT.exec(this.input);
+    nT.lastIndex = this.index;
+    const E = nT.exec(this.input);
     if (E)
       return this.index += E[0].length, E[0];
   }
@@ -17363,19 +17411,19 @@ If possible, please select a more specific dialect (like sqlite, postgresql, etc
     }
   }
 }
-const nT = /\/\*/uy, KI = /[\s\S]/uy, yI = /\*\//uy;
+const aT = /\/\*/uy, KI = /[\s\S]/uy, yI = /\*\//uy;
 class $I {
   constructor() {
     this.lastIndex = 0;
   }
   exec(E) {
     let R = "", A, S = 0;
-    if (A = this.matchSection(nT, E))
+    if (A = this.matchSection(aT, E))
       R += A, S++;
     else
       return null;
     for (; S > 0; )
-      if (A = this.matchSection(nT, E))
+      if (A = this.matchSection(aT, E))
         R += A, S++;
       else if (A = this.matchSection(yI, E))
         R += A, S--;
@@ -17422,7 +17470,7 @@ class gI {
       },
       {
         type: D.QUOTED_IDENTIFIER,
-        regex: rT(E.identTypes)
+        regex: oT(E.identTypes)
       },
       {
         type: D.NUMBER,
@@ -17535,9 +17583,9 @@ class gI {
     return this.validRules([
       {
         type: D.VARIABLE,
-        regex: E.variableTypes ? WI(E.variableTypes) : void 0
+        regex: E.variableTypes ? fI(E.variableTypes) : void 0
       },
-      { type: D.STRING, regex: rT(E.stringTypes) },
+      { type: D.STRING, regex: oT(E.stringTypes) },
       {
         type: D.IDENTIFIER,
         regex: XI(E.identChars)
@@ -17546,15 +17594,15 @@ class gI {
       { type: D.COMMA, regex: /[,]/y },
       {
         type: D.OPEN_PAREN,
-        regex: tT("open", E.extraParens)
+        regex: DT("open", E.extraParens)
       },
       {
         type: D.CLOSE_PAREN,
-        regex: tT("close", E.extraParens)
+        regex: DT("close", E.extraParens)
       },
       {
         type: D.OPERATOR,
-        regex: LT([
+        regex: iT([
           // standard operators
           "+",
           "-",
@@ -17572,7 +17620,7 @@ class gI {
       { type: D.ASTERISK, regex: /[*]/uy },
       {
         type: D.PROPERTY_ACCESS_OPERATOR,
-        regex: LT([".", ...(A = E.propertyAccessOperators) !== null && A !== void 0 ? A : []])
+        regex: iT([".", ...(A = E.propertyAccessOperators) !== null && A !== void 0 ? A : []])
       }
     ]);
   }
@@ -17590,20 +17638,20 @@ class gI {
     return this.validRules([
       {
         type: D.NAMED_PARAMETER,
-        regex: lE(n.named, HT(E.paramChars || E.identChars)),
+        regex: YE(n.named, mT(E.paramChars || E.identChars)),
         key: (O) => O.slice(1)
       },
       {
         type: D.QUOTED_PARAMETER,
-        regex: lE(n.quoted, lT(E.identTypes)),
-        key: (O) => (({ tokenKey: s, quoteChar: C }) => s.replace(new RegExp(V("\\" + C), "gu"), C))({
+        regex: YE(n.quoted, YT(E.identTypes)),
+        key: (O) => (({ tokenKey: t, quoteChar: C }) => t.replace(new RegExp(V("\\" + C), "gu"), C))({
           tokenKey: O.slice(2, -1),
           quoteChar: O.slice(-1)
         })
       },
       {
         type: D.NUMBERED_PARAMETER,
-        regex: lE(n.numbered, "[0-9]+"),
+        regex: YE(n.numbered, "[0-9]+"),
         key: (O) => O.slice(1)
       },
       {
@@ -17611,11 +17659,11 @@ class gI {
         regex: n.positional ? /[?]/y : void 0
       },
       ...n.custom.map((O) => {
-        var s;
+        var t;
         return {
           type: D.CUSTOM_PARAMETER,
           regex: g(O.regex),
-          key: (s = O.key) !== null && s !== void 0 ? s : (C) => C
+          key: (t = O.key) !== null && t !== void 0 ? t : (C) => C
         };
       })
     ]);
@@ -17625,13 +17673,13 @@ class gI {
     return E.filter((R) => !!R.regex);
   }
 }
-const F = (T) => j(T.toUpperCase()), DT = /* @__PURE__ */ new Map(), JI = (T) => {
-  let E = DT.get(T);
-  return E || (E = xI(T), DT.set(T, E)), E;
-}, xI = (T) => ({
+const F = (T) => j(T.toUpperCase()), MT = /* @__PURE__ */ new Map(), JI = (T) => {
+  let E = MT.get(T);
+  return E || (E = wI(T), MT.set(T, E)), E;
+}, wI = (T) => ({
   tokenizer: new gI(T.tokenizerOptions, T.name),
-  formatOptions: wI(T.formatOptions)
-}), wI = (T) => {
+  formatOptions: xI(T.formatOptions)
+}), xI = (T) => {
   var E;
   return {
     alwaysDenseOperators: T.alwaysDenseOperators || [],
@@ -17642,7 +17690,7 @@ const F = (T) => j(T.toUpperCase()), DT = /* @__PURE__ */ new Map(), JI = (T) =>
 function vI(T) {
   return T.indentStyle === "tabularLeft" || T.indentStyle === "tabularRight" ? " ".repeat(10) : T.useTabs ? "	" : " ".repeat(T.tabWidth);
 }
-function x(T) {
+function v(T) {
   return T.indentStyle === "tabularLeft" || T.indentStyle === "tabularRight";
 }
 class QI {
@@ -17669,44 +17717,44 @@ class QI {
   }
 }
 var ZI = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {};
-function qI(T) {
+function kI(T) {
   return T && T.__esModule && Object.prototype.hasOwnProperty.call(T, "default") ? T.default : T;
 }
-var uT = { exports: {} };
+var dT = { exports: {} };
 (function(T) {
   (function(E, R) {
     T.exports ? T.exports = R() : E.nearley = R();
   })(ZI, function() {
-    function E(O, s, C) {
-      return this.id = ++E.highestId, this.name = O, this.symbols = s, this.postprocess = C, this;
+    function E(O, t, C) {
+      return this.id = ++E.highestId, this.name = O, this.symbols = t, this.postprocess = C, this;
     }
     E.highestId = 0, E.prototype.toString = function(O) {
-      var s = typeof O > "u" ? this.symbols.map(n).join(" ") : this.symbols.slice(0, O).map(n).join(" ") + " ● " + this.symbols.slice(O).map(n).join(" ");
-      return this.name + " → " + s;
+      var t = typeof O > "u" ? this.symbols.map(n).join(" ") : this.symbols.slice(0, O).map(n).join(" ") + " ● " + this.symbols.slice(O).map(n).join(" ");
+      return this.name + " → " + t;
     };
-    function R(O, s, C, t) {
-      this.rule = O, this.dot = s, this.reference = C, this.data = [], this.wantedBy = t, this.isComplete = this.dot === O.symbols.length;
+    function R(O, t, C, s) {
+      this.rule = O, this.dot = t, this.reference = C, this.data = [], this.wantedBy = s, this.isComplete = this.dot === O.symbols.length;
     }
     R.prototype.toString = function() {
       return "{" + this.rule.toString(this.dot) + "}, from: " + (this.reference || 0);
     }, R.prototype.nextState = function(O) {
-      var s = new R(this.rule, this.dot + 1, this.reference, this.wantedBy);
-      return s.left = this, s.right = O, s.isComplete && (s.data = s.build(), s.right = void 0), s;
+      var t = new R(this.rule, this.dot + 1, this.reference, this.wantedBy);
+      return t.left = this, t.right = O, t.isComplete && (t.data = t.build(), t.right = void 0), t;
     }, R.prototype.build = function() {
-      var O = [], s = this;
+      var O = [], t = this;
       do
-        O.push(s.right.data), s = s.left;
-      while (s.left);
+        O.push(t.right.data), t = t.left;
+      while (t.left);
       return O.reverse(), O;
     }, R.prototype.finish = function() {
       this.rule.postprocess && (this.data = this.rule.postprocess(this.data, this.reference, N.fail));
     };
-    function A(O, s) {
-      this.grammar = O, this.index = s, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
+    function A(O, t) {
+      this.grammar = O, this.index = t, this.states = [], this.wants = {}, this.scannable = [], this.completed = {};
     }
     A.prototype.process = function(O) {
-      for (var s = this.states, C = this.wants, t = this.completed, i = 0; i < s.length; i++) {
-        var a = s[i];
+      for (var t = this.states, C = this.wants, s = this.completed, i = 0; i < t.length; i++) {
+        var a = t[i];
         if (a.isComplete) {
           if (a.finish(), a.data !== N.fail) {
             for (var U = a.wantedBy, o = U.length; o--; ) {
@@ -17725,8 +17773,8 @@ var uT = { exports: {} };
             continue;
           }
           if (C[P]) {
-            if (C[P].push(a), t.hasOwnProperty(P))
-              for (var H = t[P], o = 0; o < H.length; o++) {
+            if (C[P].push(a), s.hasOwnProperty(P))
+              for (var H = s[P], o = 0; o < H.length; o++) {
                 var l = H[o];
                 this.complete(a, l);
               }
@@ -17735,34 +17783,34 @@ var uT = { exports: {} };
         }
       }
     }, A.prototype.predict = function(O) {
-      for (var s = this.grammar.byName[O] || [], C = 0; C < s.length; C++) {
-        var t = s[C], i = this.wants[O], a = new R(t, 0, this.index, i);
+      for (var t = this.grammar.byName[O] || [], C = 0; C < t.length; C++) {
+        var s = t[C], i = this.wants[O], a = new R(s, 0, this.index, i);
         this.states.push(a);
       }
-    }, A.prototype.complete = function(O, s) {
-      var C = O.nextState(s);
+    }, A.prototype.complete = function(O, t) {
+      var C = O.nextState(t);
       this.states.push(C);
     };
-    function S(O, s) {
-      this.rules = O, this.start = s || this.rules[0].name;
+    function S(O, t) {
+      this.rules = O, this.start = t || this.rules[0].name;
       var C = this.byName = {};
-      this.rules.forEach(function(t) {
-        C.hasOwnProperty(t.name) || (C[t.name] = []), C[t.name].push(t);
+      this.rules.forEach(function(s) {
+        C.hasOwnProperty(s.name) || (C[s.name] = []), C[s.name].push(s);
       });
     }
-    S.fromCompiled = function(t, s) {
-      var C = t.Lexer;
-      t.ParserStart && (s = t.ParserStart, t = t.ParserRules);
-      var t = t.map(function(a) {
+    S.fromCompiled = function(s, t) {
+      var C = s.Lexer;
+      s.ParserStart && (t = s.ParserStart, s = s.ParserRules);
+      var s = s.map(function(a) {
         return new E(a.name, a.symbols, a.postprocess);
-      }), i = new S(t, s);
+      }), i = new S(s, t);
       return i.lexer = C, i;
     };
     function I() {
       this.reset("");
     }
-    I.prototype.reset = function(O, s) {
-      this.buffer = O, this.index = 0, this.line = s ? s.line : 1, this.lastLineBreak = s ? -s.col : 0;
+    I.prototype.reset = function(O, t) {
+      this.buffer = O, this.index = 0, this.line = t ? t.line : 1, this.lastLineBreak = t ? -t.col : 0;
     }, I.prototype.next = function() {
       if (this.index < this.buffer.length) {
         var O = this.buffer[this.index++];
@@ -17774,10 +17822,10 @@ var uT = { exports: {} };
         line: this.line,
         col: this.index - this.lastLineBreak
       };
-    }, I.prototype.formatError = function(O, s) {
+    }, I.prototype.formatError = function(O, t) {
       var C = this.buffer;
       if (typeof C == "string") {
-        var t = C.split(`
+        var s = C.split(`
 `).slice(
           Math.max(0, this.line - 5),
           this.line
@@ -17785,54 +17833,54 @@ var uT = { exports: {} };
 `, this.index);
         i === -1 && (i = C.length);
         var a = this.index - this.lastLineBreak, U = String(this.line).length;
-        return s += " at line " + this.line + " col " + a + `:
+        return t += " at line " + this.line + " col " + a + `:
 
-`, s += t.map(function(G, P) {
-          return o(this.line - t.length + P + 1, U) + " " + G;
+`, t += s.map(function(G, P) {
+          return o(this.line - s.length + P + 1, U) + " " + G;
         }, this).join(`
-`), s += `
+`), t += `
 ` + o("", U + a) + `^
-`, s;
+`, t;
       } else
-        return s + " at index " + (this.index - 1);
+        return t + " at index " + (this.index - 1);
       function o(G, P) {
         var H = String(G);
         return Array(P - H.length + 1).join(" ") + H;
       }
     };
-    function N(O, s, C) {
+    function N(O, t, C) {
       if (O instanceof S)
-        var t = O, C = s;
+        var s = O, C = t;
       else
-        var t = S.fromCompiled(O, s);
-      this.grammar = t, this.options = {
+        var s = S.fromCompiled(O, t);
+      this.grammar = s, this.options = {
         keepHistory: !1,
-        lexer: t.lexer || new I()
+        lexer: s.lexer || new I()
       };
       for (var i in C || {})
         this.options[i] = C[i];
       this.lexer = this.options.lexer, this.lexerState = void 0;
-      var a = new A(t, 0);
-      this.table = [a], a.wants[t.start] = [], a.predict(t.start), a.process(), this.current = 0;
+      var a = new A(s, 0);
+      this.table = [a], a.wants[s.start] = [], a.predict(s.start), a.process(), this.current = 0;
     }
     N.fail = {}, N.prototype.feed = function(O) {
-      var s = this.lexer;
-      s.reset(O, this.lexerState);
+      var t = this.lexer;
+      t.reset(O, this.lexerState);
       for (var C; ; ) {
         try {
-          if (C = s.next(), !C)
+          if (C = t.next(), !C)
             break;
         } catch (p) {
           var U = new A(this.grammar, this.current + 1);
           this.table.push(U);
-          var t = new Error(this.reportLexerError(p));
-          throw t.offset = this.current, t.token = p.token, t;
+          var s = new Error(this.reportLexerError(p));
+          throw s.offset = this.current, s.token = p.token, s;
         }
         var i = this.table[this.current];
         this.options.keepHistory || delete this.table[this.current - 1];
         var a = this.current + 1, U = new A(this.grammar, a);
         this.table.push(U);
-        for (var o = C.text !== void 0 ? C.text : C.value, G = s.constructor === I ? C.value : C, P = i.scannable, H = P.length; H--; ) {
+        for (var o = C.text !== void 0 ? C.text : C.value, G = t.constructor === I ? C.value : C, P = i.scannable, H = P.length; H--; ) {
           var l = P[H], B = l.rule.symbols[l.dot];
           if (B.test ? B.test(G) : B.type ? B.type === C.type : B.literal === o) {
             var u = l.nextState({ data: G, token: C, isToken: !0, reference: a - 1 });
@@ -17840,30 +17888,30 @@ var uT = { exports: {} };
           }
         }
         if (U.process(), U.states.length === 0) {
-          var t = new Error(this.reportError(C));
-          throw t.offset = this.current, t.token = C, t;
+          var s = new Error(this.reportError(C));
+          throw s.offset = this.current, s.token = C, s;
         }
-        this.options.keepHistory && (i.lexerState = s.save()), this.current++;
+        this.options.keepHistory && (i.lexerState = t.save()), this.current++;
       }
-      return i && (this.lexerState = s.save()), this.results = this.finish(), this;
+      return i && (this.lexerState = t.save()), this.results = this.finish(), this;
     }, N.prototype.reportLexerError = function(O) {
-      var s, C, t = O.token;
-      return t ? (s = "input " + JSON.stringify(t.text[0]) + " (lexer error)", C = this.lexer.formatError(t, "Syntax error")) : (s = "input (lexer error)", C = O.message), this.reportErrorCommon(C, s);
+      var t, C, s = O.token;
+      return s ? (t = "input " + JSON.stringify(s.text[0]) + " (lexer error)", C = this.lexer.formatError(s, "Syntax error")) : (t = "input (lexer error)", C = O.message), this.reportErrorCommon(C, t);
     }, N.prototype.reportError = function(O) {
-      var s = (O.type ? O.type + " token: " : "") + JSON.stringify(O.value !== void 0 ? O.value : O), C = this.lexer.formatError(O, "Syntax error");
-      return this.reportErrorCommon(C, s);
-    }, N.prototype.reportErrorCommon = function(O, s) {
+      var t = (O.type ? O.type + " token: " : "") + JSON.stringify(O.value !== void 0 ? O.value : O), C = this.lexer.formatError(O, "Syntax error");
+      return this.reportErrorCommon(C, t);
+    }, N.prototype.reportErrorCommon = function(O, t) {
       var C = [];
       C.push(O);
-      var t = this.table.length - 2, i = this.table[t], a = i.states.filter(function(o) {
+      var s = this.table.length - 2, i = this.table[s], a = i.states.filter(function(o) {
         var G = o.rule.symbols[o.dot];
         return G && typeof G != "string";
       });
       if (a.length === 0)
-        C.push("Unexpected " + s + `. I did not expect any more input. Here is the state of my parse table:
+        C.push("Unexpected " + t + `. I did not expect any more input. Here is the state of my parse table:
 `), this.displayStateStack(i.states, C);
       else {
-        C.push("Unexpected " + s + `. Instead, I was expecting to see one of the following:
+        C.push("Unexpected " + t + `. Instead, I was expecting to see one of the following:
 `);
         var U = a.map(function(o) {
           return this.buildFirstStateStack(o, []) || [o];
@@ -17875,43 +17923,43 @@ var uT = { exports: {} };
       }
       return C.push(""), C.join(`
 `);
-    }, N.prototype.displayStateStack = function(O, s) {
-      for (var C, t = 0, i = 0; i < O.length; i++) {
+    }, N.prototype.displayStateStack = function(O, t) {
+      for (var C, s = 0, i = 0; i < O.length; i++) {
         var a = O[i], U = a.rule.toString(a.dot);
-        U === C ? t++ : (t > 0 && s.push("    ^ " + t + " more lines identical to this"), t = 0, s.push("    " + U)), C = U;
+        U === C ? s++ : (s > 0 && t.push("    ^ " + s + " more lines identical to this"), s = 0, t.push("    " + U)), C = U;
       }
     }, N.prototype.getSymbolDisplay = function(O) {
       return e(O);
-    }, N.prototype.buildFirstStateStack = function(O, s) {
-      if (s.indexOf(O) !== -1)
+    }, N.prototype.buildFirstStateStack = function(O, t) {
+      if (t.indexOf(O) !== -1)
         return null;
       if (O.wantedBy.length === 0)
         return [O];
-      var C = O.wantedBy[0], t = [O].concat(s), i = this.buildFirstStateStack(C, t);
+      var C = O.wantedBy[0], s = [O].concat(t), i = this.buildFirstStateStack(C, s);
       return i === null ? null : [O].concat(i);
     }, N.prototype.save = function() {
       var O = this.table[this.current];
       return O.lexerState = this.lexerState, O;
     }, N.prototype.restore = function(O) {
-      var s = O.index;
-      this.current = s, this.table[s] = O, this.table.splice(s + 1), this.lexerState = O.lexerState, this.results = this.finish();
+      var t = O.index;
+      this.current = t, this.table[t] = O, this.table.splice(t + 1), this.lexerState = O.lexerState, this.results = this.finish();
     }, N.prototype.rewind = function(O) {
       if (!this.options.keepHistory)
         throw new Error("set option `keepHistory` to enable rewinding");
       this.restore(this.table[O]);
     }, N.prototype.finish = function() {
-      var O = [], s = this.grammar.start, C = this.table[this.table.length - 1];
-      return C.states.forEach(function(t) {
-        t.rule.name === s && t.dot === t.rule.symbols.length && t.reference === 0 && t.data !== N.fail && O.push(t);
-      }), O.map(function(t) {
-        return t.data;
+      var O = [], t = this.grammar.start, C = this.table[this.table.length - 1];
+      return C.states.forEach(function(s) {
+        s.rule.name === t && s.dot === s.rule.symbols.length && s.reference === 0 && s.data !== N.fail && O.push(s);
+      }), O.map(function(s) {
+        return s.data;
       });
     };
     function e(O) {
-      var s = typeof O;
-      if (s === "string")
+      var t = typeof O;
+      if (t === "string")
         return O;
-      if (s === "object") {
+      if (t === "object") {
         if (O.literal)
           return JSON.stringify(O.literal);
         if (O instanceof RegExp)
@@ -17924,10 +17972,10 @@ var uT = { exports: {} };
       }
     }
     function n(O) {
-      var s = typeof O;
-      if (s === "string")
+      var t = typeof O;
+      if (t === "string")
         return O;
-      if (s === "object") {
+      if (t === "object") {
         if (O.literal)
           return JSON.stringify(O.literal);
         if (O instanceof RegExp)
@@ -17945,57 +17993,57 @@ var uT = { exports: {} };
       Rule: E
     };
   });
-})(uT);
-var kI = uT.exports;
-const jI = /* @__PURE__ */ qI(kI);
+})(dT);
+var qI = dT.exports;
+const jI = /* @__PURE__ */ kI(qI);
 function zI(T) {
   return T.map(EO).map(TO).map(RO).map(AO).map(SO);
 }
 const EO = (T, E, R) => {
-  if (UT(T.type)) {
+  if (BT(T.type)) {
     const A = IO(R, E);
     if (A && A.type === D.PROPERTY_ACCESS_OPERATOR)
       return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
-    const S = v(R, E);
+    const S = Z(R, E);
     if (S && S.type === D.PROPERTY_ACCESS_OPERATOR)
       return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
   }
   return T;
 }, TO = (T, E, R) => {
   if (T.type === D.RESERVED_FUNCTION_NAME) {
-    const A = v(R, E);
-    if (!A || !FT(A))
+    const A = Z(R, E);
+    if (!A || !VT(A))
       return Object.assign(Object.assign({}, T), { type: D.IDENTIFIER, text: T.raw });
   }
   return T;
 }, RO = (T, E, R) => {
   if (T.type === D.RESERVED_DATA_TYPE) {
-    const A = v(R, E);
-    if (A && FT(A))
+    const A = Z(R, E);
+    if (A && VT(A))
       return Object.assign(Object.assign({}, T), { type: D.RESERVED_PARAMETERIZED_DATA_TYPE });
   }
   return T;
 }, AO = (T, E, R) => {
   if (T.type === D.IDENTIFIER) {
-    const A = v(R, E);
-    if (A && YT(A))
+    const A = Z(R, E);
+    if (A && hT(A))
       return Object.assign(Object.assign({}, T), { type: D.ARRAY_IDENTIFIER });
   }
   return T;
 }, SO = (T, E, R) => {
   if (T.type === D.RESERVED_DATA_TYPE) {
-    const A = v(R, E);
-    if (A && YT(A))
+    const A = Z(R, E);
+    if (A && hT(A))
       return Object.assign(Object.assign({}, T), { type: D.ARRAY_KEYWORD });
   }
   return T;
-}, IO = (T, E) => v(T, E, -1), v = (T, E, R = 1) => {
+}, IO = (T, E) => Z(T, E, -1), Z = (T, E, R = 1) => {
   let A = 1;
   for (; T[E + A * R] && OO(T[E + A * R]); )
     A++;
   return T[E + A * R];
-}, FT = (T) => T.type === D.OPEN_PAREN && T.text === "(", YT = (T) => T.type === D.OPEN_PAREN && T.text === "[", OO = (T) => T.type === D.BLOCK_COMMENT || T.type === D.LINE_COMMENT;
-class mT {
+}, VT = (T) => T.type === D.OPEN_PAREN && T.text === "(", hT = (T) => T.type === D.OPEN_PAREN && T.text === "[", OO = (T) => T.type === D.BLOCK_COMMENT || T.type === D.LINE_COMMENT;
+class WT {
   constructor(E) {
     this.tokenize = E, this.index = 0, this.tokens = [], this.input = "";
   }
@@ -18008,7 +18056,7 @@ class mT {
   save() {
   }
   formatError(E) {
-    const { line: R, col: A } = BT(this.input, E.start);
+    const { line: R, col: A } = pT(this.input, E.start);
     return `Parse error at token: ${E.text} at line ${R} column ${A}`;
   }
   has(E) {
@@ -18019,15 +18067,15 @@ var M;
 (function(T) {
   T.statement = "statement", T.clause = "clause", T.set_operation = "set_operation", T.function_call = "function_call", T.parameterized_data_type = "parameterized_data_type", T.array_subscript = "array_subscript", T.property_access = "property_access", T.parenthesis = "parenthesis", T.between_predicate = "between_predicate", T.case_expression = "case_expression", T.case_when = "case_when", T.case_else = "case_else", T.limit_clause = "limit_clause", T.all_columns_asterisk = "all_columns_asterisk", T.literal = "literal", T.identifier = "identifier", T.keyword = "keyword", T.data_type = "data_type", T.parameter = "parameter", T.operator = "operator", T.comma = "comma", T.line_comment = "line_comment", T.block_comment = "block_comment", T.disable_comment = "disable_comment";
 })(M = M || (M = {}));
-function HE(T) {
+function mE(T) {
   return T[0];
 }
-const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
+const c = new WT((T) => []), b = ([[T]]) => T, Y = (T) => ({
   type: M.keyword,
   tokenType: T.type,
   text: T.text,
   raw: T.raw
-}), iT = (T) => ({
+}), UT = (T) => ({
   type: M.data_type,
   text: T.text,
   raw: T.raw
@@ -18082,7 +18130,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
     { name: "limit_clause$ebnf$1$subexpression$1$ebnf$1", symbols: ["free_form_sql"] },
     { name: "limit_clause$ebnf$1$subexpression$1$ebnf$1", symbols: ["limit_clause$ebnf$1$subexpression$1$ebnf$1", "free_form_sql"], postprocess: (T) => T[0].concat([T[1]]) },
     { name: "limit_clause$ebnf$1$subexpression$1", symbols: [c.has("COMMA") ? { type: "COMMA" } : COMMA, "limit_clause$ebnf$1$subexpression$1$ebnf$1"] },
-    { name: "limit_clause$ebnf$1", symbols: ["limit_clause$ebnf$1$subexpression$1"], postprocess: HE },
+    { 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",
@@ -18157,7 +18205,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
     },
     { name: "expression_chain_$ebnf$1", symbols: ["expression_with_comments_"] },
     { name: "expression_chain_$ebnf$1", symbols: ["expression_chain_$ebnf$1", "expression_with_comments_"], postprocess: (T) => T[0].concat([T[1]]) },
-    { name: "expression_chain_", symbols: ["expression_chain_$ebnf$1"], postprocess: HE },
+    { 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: (T) => T[0].concat([T[1]]) },
     {
@@ -18311,7 +18359,7 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
         expr2: [m(N, { leading: I })]
       })
     },
-    { name: "case_expression$ebnf$1", symbols: ["expression_chain_"], postprocess: HE },
+    { 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: (T) => T[0].concat([T[1]]) },
@@ -18377,14 +18425,14 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
     {
       name: "data_type",
       symbols: ["data_type$subexpression$1"],
-      postprocess: ([[T]]) => iT(T)
+      postprocess: ([[T]]) => UT(T)
     },
     {
       name: "data_type",
       symbols: [c.has("RESERVED_PARAMETERIZED_DATA_TYPE") ? { type: "RESERVED_PARAMETERIZED_DATA_TYPE" } : RESERVED_PARAMETERIZED_DATA_TYPE, "_", "parenthesis"],
       postprocess: ([T, E, R]) => ({
         type: M.parameterized_data_type,
-        dataType: m(iT(T), { trailing: E }),
+        dataType: m(UT(T), { trailing: E }),
         parenthesis: R
       })
     },
@@ -18437,13 +18485,13 @@ const c = new mT((T) => []), b = ([[T]]) => T, Y = (T) => ({
     }
   ],
   ParserStart: "main"
-}, { Parser: CO, Grammar: sO } = jI;
-function tO(T) {
+}, { Parser: CO, Grammar: tO } = jI;
+function sO(T) {
   let E = {};
-  const R = new mT((S) => [
+  const R = new WT((S) => [
     ...zI(T.tokenize(S, E)),
-    MT(S.length)
-  ]), A = new CO(sO.fromCompiled(eO), { lexer: R });
+    HT(S.length)
+  ]), A = new CO(tO.fromCompiled(eO), { lexer: R });
   return {
     parse: (S, I) => {
       E = I;
@@ -18455,11 +18503,11 @@ ${JSON.stringify(N, void 0, 2)}`);
     }
   };
 }
-var _;
+var r;
 (function(T) {
   T[T.SPACE = 0] = "SPACE", T[T.NO_SPACE = 1] = "NO_SPACE", T[T.NO_NEWLINE = 2] = "NO_NEWLINE", T[T.NEWLINE = 3] = "NEWLINE", T[T.MANDATORY_NEWLINE = 4] = "MANDATORY_NEWLINE", T[T.INDENT = 5] = "INDENT", T[T.SINGLE_INDENT = 6] = "SINGLE_INDENT";
-})(_ = _ || (_ = {}));
-class pT {
+})(r = r || (r = {}));
+class fT {
   constructor(E) {
     this.indentation = E, this.items = [];
   }
@@ -18469,46 +18517,46 @@ class pT {
   add(...E) {
     for (const R of E)
       switch (R) {
-        case _.SPACE:
-          this.items.push(_.SPACE);
+        case r.SPACE:
+          this.items.push(r.SPACE);
           break;
-        case _.NO_SPACE:
+        case r.NO_SPACE:
           this.trimHorizontalWhitespace();
           break;
-        case _.NO_NEWLINE:
+        case r.NO_NEWLINE:
           this.trimWhitespace();
           break;
-        case _.NEWLINE:
-          this.trimHorizontalWhitespace(), this.addNewline(_.NEWLINE);
+        case r.NEWLINE:
+          this.trimHorizontalWhitespace(), this.addNewline(r.NEWLINE);
           break;
-        case _.MANDATORY_NEWLINE:
-          this.trimHorizontalWhitespace(), this.addNewline(_.MANDATORY_NEWLINE);
+        case r.MANDATORY_NEWLINE:
+          this.trimHorizontalWhitespace(), this.addNewline(r.MANDATORY_NEWLINE);
           break;
-        case _.INDENT:
+        case r.INDENT:
           this.addIndentation();
           break;
-        case _.SINGLE_INDENT:
-          this.items.push(_.SINGLE_INDENT);
+        case r.SINGLE_INDENT:
+          this.items.push(r.SINGLE_INDENT);
           break;
         default:
           this.items.push(R);
       }
   }
   trimHorizontalWhitespace() {
-    for (; LO(q(this.items)); )
+    for (; LO(k(this.items)); )
       this.items.pop();
   }
   trimWhitespace() {
-    for (; _O(q(this.items)); )
+    for (; _O(k(this.items)); )
       this.items.pop();
   }
   addNewline(E) {
     if (this.items.length > 0)
-      switch (q(this.items)) {
-        case _.NEWLINE:
+      switch (k(this.items)) {
+        case r.NEWLINE:
           this.items.pop(), this.items.push(E);
           break;
-        case _.MANDATORY_NEWLINE:
+        case r.MANDATORY_NEWLINE:
           break;
         default:
           this.items.push(E);
@@ -18517,7 +18565,7 @@ class pT {
   }
   addIndentation() {
     for (let E = 0; E < this.indentation.getLevel(); E++)
-      this.items.push(_.SINGLE_INDENT);
+      this.items.push(r.SINGLE_INDENT);
   }
   /**
    * Returns the final SQL string.
@@ -18533,31 +18581,31 @@ class pT {
   }
   itemToString(E) {
     switch (E) {
-      case _.SPACE:
+      case r.SPACE:
         return " ";
-      case _.NEWLINE:
-      case _.MANDATORY_NEWLINE:
+      case r.NEWLINE:
+      case r.MANDATORY_NEWLINE:
         return `
 `;
-      case _.SINGLE_INDENT:
+      case r.SINGLE_INDENT:
         return this.indentation.getSingleIndent();
       default:
         return E;
     }
   }
 }
-const LO = (T) => T === _.SPACE || T === _.SINGLE_INDENT, _O = (T) => T === _.SPACE || T === _.SINGLE_INDENT || T === _.NEWLINE;
-function PT(T, E) {
+const LO = (T) => T === r.SPACE || T === r.SINGLE_INDENT, _O = (T) => T === r.SPACE || T === r.SINGLE_INDENT || T === r.NEWLINE;
+function GT(T, E) {
   if (E === "standard")
     return T;
   let R = [];
   return T.length >= 10 && T.includes(" ") && ([T, ...R] = T.split(" ")), E === "tabularLeft" ? T = T.padEnd(9, " ") : T = T.padStart(9, " "), T + ["", ...R].join(" ");
 }
-function oT(T) {
+function cT(T) {
   return rR(T) || T === D.RESERVED_CLAUSE || T === D.RESERVED_SELECT || T === D.RESERVED_SET_OPERATION || T === D.RESERVED_JOIN || T === D.LIMIT;
 }
-const BE = "top-level", rO = "block-level";
-class dT {
+const pE = "top-level", rO = "block-level";
+class XT {
   /**
    * @param {string} indent A string to indent with
    */
@@ -18580,7 +18628,7 @@ class dT {
    * Increases indentation by one top-level indent.
    */
   increaseTopLevel() {
-    this.indentTypes.push(BE);
+    this.indentTypes.push(pE);
   }
   /**
    * Increases indentation by one block-level indent.
@@ -18593,7 +18641,7 @@ class dT {
    * Does nothing when the previous indent is not top-level.
    */
   decreaseTopLevel() {
-    this.indentTypes.length > 0 && q(this.indentTypes) === BE && this.indentTypes.pop();
+    this.indentTypes.length > 0 && k(this.indentTypes) === pE && this.indentTypes.pop();
   }
   /**
    * Decreases indentation by one block-level indent.
@@ -18601,32 +18649,32 @@ class dT {
    * throws away these as well.
    */
   decreaseBlockLevel() {
-    for (; this.indentTypes.length > 0 && this.indentTypes.pop() === BE; )
+    for (; this.indentTypes.length > 0 && this.indentTypes.pop() === pE; )
       ;
   }
 }
-class nO extends pT {
+class nO extends fT {
   constructor(E) {
-    super(new dT("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
+    super(new XT("")), this.expressionWidth = E, this.length = 0, this.trailingSpace = !1;
   }
   add(...E) {
     if (E.forEach((R) => this.addToLength(R)), this.length > this.expressionWidth)
-      throw new YE();
+      throw new hE();
     super.add(...E);
   }
   addToLength(E) {
     if (typeof E == "string")
       this.length += E.length, this.trailingSpace = !1;
     else {
-      if (E === _.MANDATORY_NEWLINE || E === _.NEWLINE)
-        throw new YE();
-      E === _.INDENT || E === _.SINGLE_INDENT || E === _.SPACE ? this.trailingSpace || (this.length++, this.trailingSpace = !0) : (E === _.NO_NEWLINE || E === _.NO_SPACE) && this.trailingSpace && (this.trailingSpace = !1, this.length--);
+      if (E === r.MANDATORY_NEWLINE || E === r.NEWLINE)
+        throw new hE();
+      E === r.INDENT || E === r.SINGLE_INDENT || E === r.SPACE ? this.trailingSpace || (this.length++, this.trailingSpace = !0) : (E === r.NO_NEWLINE || E === r.NO_SPACE) && this.trailingSpace && (this.trailingSpace = !1, this.length--);
     }
   }
 }
-class YE extends Error {
+class hE extends Error {
 }
-class EE {
+class TE {
   constructor({ cfg: E, dialectCfg: R, params: A, layout: S, inline: I = !1 }) {
     this.inline = !1, this.nodes = [], this.index = -1, this.cfg = E, this.dialectCfg = R, this.inline = I, this.params = A, this.layout = S;
   }
@@ -18716,64 +18764,64 @@ class EE {
     }), this.formatNode(E.parenthesis);
   }
   formatPropertyAccess(E) {
-    this.formatNode(E.object), this.layout.add(_.NO_SPACE, E.operator), this.formatNode(E.property);
+    this.formatNode(E.object), this.layout.add(r.NO_SPACE, E.operator), this.formatNode(E.property);
   }
   formatParenthesis(E) {
     const R = this.formatInlineExpression(E.children);
-    R ? (this.layout.add(E.openParen), this.layout.add(...R.getLayoutItems()), this.layout.add(_.NO_SPACE, E.closeParen, _.SPACE)) : (this.layout.add(E.openParen, _.NEWLINE), x(this.cfg) ? (this.layout.add(_.INDENT), this.layout = this.formatSubExpression(E.children)) : (this.layout.indentation.increaseBlockLevel(), this.layout.add(_.INDENT), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseBlockLevel()), this.layout.add(_.NEWLINE, _.INDENT, E.closeParen, _.SPACE));
+    R ? (this.layout.add(E.openParen), this.layout.add(...R.getLayoutItems()), this.layout.add(r.NO_SPACE, E.closeParen, r.SPACE)) : (this.layout.add(E.openParen, r.NEWLINE), v(this.cfg) ? (this.layout.add(r.INDENT), this.layout = this.formatSubExpression(E.children)) : (this.layout.indentation.increaseBlockLevel(), this.layout.add(r.INDENT), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseBlockLevel()), this.layout.add(r.NEWLINE, r.INDENT, E.closeParen, r.SPACE));
   }
   formatBetweenPredicate(E) {
-    this.layout.add(this.showKw(E.betweenKw), _.SPACE), this.layout = this.formatSubExpression(E.expr1), this.layout.add(_.NO_SPACE, _.SPACE, this.showNonTabularKw(E.andKw), _.SPACE), this.layout = this.formatSubExpression(E.expr2), this.layout.add(_.SPACE);
+    this.layout.add(this.showKw(E.betweenKw), r.SPACE), this.layout = this.formatSubExpression(E.expr1), this.layout.add(r.NO_SPACE, r.SPACE, this.showNonTabularKw(E.andKw), r.SPACE), this.layout = this.formatSubExpression(E.expr2), this.layout.add(r.SPACE);
   }
   formatCaseExpression(E) {
-    this.formatNode(E.caseKw), this.layout.indentation.increaseBlockLevel(), this.layout = this.formatSubExpression(E.expr), this.layout = this.formatSubExpression(E.clauses), this.layout.indentation.decreaseBlockLevel(), this.layout.add(_.NEWLINE, _.INDENT), this.formatNode(E.endKw);
+    this.formatNode(E.caseKw), this.layout.indentation.increaseBlockLevel(), this.layout = this.formatSubExpression(E.expr), this.layout = this.formatSubExpression(E.clauses), this.layout.indentation.decreaseBlockLevel(), this.layout.add(r.NEWLINE, r.INDENT), this.formatNode(E.endKw);
   }
   formatCaseWhen(E) {
-    this.layout.add(_.NEWLINE, _.INDENT), this.formatNode(E.whenKw), this.layout = this.formatSubExpression(E.condition), this.formatNode(E.thenKw), this.layout = this.formatSubExpression(E.result);
+    this.layout.add(r.NEWLINE, r.INDENT), this.formatNode(E.whenKw), this.layout = this.formatSubExpression(E.condition), this.formatNode(E.thenKw), this.layout = this.formatSubExpression(E.result);
   }
   formatCaseElse(E) {
-    this.layout.add(_.NEWLINE, _.INDENT), this.formatNode(E.elseKw), this.layout = this.formatSubExpression(E.result);
+    this.layout.add(r.NEWLINE, r.INDENT), this.formatNode(E.elseKw), this.layout = this.formatSubExpression(E.result);
   }
   formatClause(E) {
-    this.isOnelineClause(E) ? this.formatClauseInOnelineStyle(E) : x(this.cfg) ? this.formatClauseInTabularStyle(E) : this.formatClauseInIndentedStyle(E);
+    this.isOnelineClause(E) ? this.formatClauseInOnelineStyle(E) : v(this.cfg) ? this.formatClauseInTabularStyle(E) : this.formatClauseInIndentedStyle(E);
   }
   isOnelineClause(E) {
-    return x(this.cfg) ? this.dialectCfg.tabularOnelineClauses[E.nameKw.text] : this.dialectCfg.onelineClauses[E.nameKw.text];
+    return v(this.cfg) ? this.dialectCfg.tabularOnelineClauses[E.nameKw.text] : this.dialectCfg.onelineClauses[E.nameKw.text];
   }
   formatClauseInIndentedStyle(E) {
-    this.layout.add(_.NEWLINE, _.INDENT, this.showKw(E.nameKw), _.NEWLINE), this.layout.indentation.increaseTopLevel(), this.layout.add(_.INDENT), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseTopLevel();
+    this.layout.add(r.NEWLINE, r.INDENT, this.showKw(E.nameKw), r.NEWLINE), this.layout.indentation.increaseTopLevel(), this.layout.add(r.INDENT), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseTopLevel();
   }
   formatClauseInOnelineStyle(E) {
-    this.layout.add(_.NEWLINE, _.INDENT, this.showKw(E.nameKw), _.SPACE), this.layout = this.formatSubExpression(E.children);
+    this.layout.add(r.NEWLINE, r.INDENT, this.showKw(E.nameKw), r.SPACE), this.layout = this.formatSubExpression(E.children);
   }
   formatClauseInTabularStyle(E) {
-    this.layout.add(_.NEWLINE, _.INDENT, this.showKw(E.nameKw), _.SPACE), this.layout.indentation.increaseTopLevel(), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseTopLevel();
+    this.layout.add(r.NEWLINE, r.INDENT, this.showKw(E.nameKw), r.SPACE), this.layout.indentation.increaseTopLevel(), this.layout = this.formatSubExpression(E.children), this.layout.indentation.decreaseTopLevel();
   }
   formatSetOperation(E) {
-    this.layout.add(_.NEWLINE, _.INDENT, this.showKw(E.nameKw), _.NEWLINE), this.layout.add(_.INDENT), this.layout = this.formatSubExpression(E.children);
+    this.layout.add(r.NEWLINE, r.INDENT, this.showKw(E.nameKw), r.NEWLINE), this.layout.add(r.INDENT), this.layout = this.formatSubExpression(E.children);
   }
   formatLimitClause(E) {
     this.withComments(E.limitKw, () => {
-      this.layout.add(_.NEWLINE, _.INDENT, this.showKw(E.limitKw));
-    }), this.layout.indentation.increaseTopLevel(), x(this.cfg) ? this.layout.add(_.SPACE) : this.layout.add(_.NEWLINE, _.INDENT), E.offset ? (this.layout = this.formatSubExpression(E.offset), this.layout.add(_.NO_SPACE, ",", _.SPACE), this.layout = this.formatSubExpression(E.count)) : this.layout = this.formatSubExpression(E.count), this.layout.indentation.decreaseTopLevel();
+      this.layout.add(r.NEWLINE, r.INDENT, this.showKw(E.limitKw));
+    }), this.layout.indentation.increaseTopLevel(), v(this.cfg) ? this.layout.add(r.SPACE) : this.layout.add(r.NEWLINE, r.INDENT), E.offset ? (this.layout = this.formatSubExpression(E.offset), this.layout.add(r.NO_SPACE, ",", r.SPACE), this.layout = this.formatSubExpression(E.count)) : this.layout = this.formatSubExpression(E.count), this.layout.indentation.decreaseTopLevel();
   }
   formatAllColumnsAsterisk(E) {
-    this.layout.add("*", _.SPACE);
+    this.layout.add("*", r.SPACE);
   }
   formatLiteral(E) {
-    this.layout.add(E.text, _.SPACE);
+    this.layout.add(E.text, r.SPACE);
   }
   formatIdentifier(E) {
-    this.layout.add(this.showIdentifier(E), _.SPACE);
+    this.layout.add(this.showIdentifier(E), r.SPACE);
   }
   formatParameter(E) {
-    this.layout.add(this.params.get(E), _.SPACE);
+    this.layout.add(this.params.get(E), r.SPACE);
   }
   formatOperator({ text: E }) {
-    this.cfg.denseOperators || this.dialectCfg.alwaysDenseOperators.includes(E) ? this.layout.add(_.NO_SPACE, E) : E === ":" ? this.layout.add(_.NO_SPACE, E, _.SPACE) : this.layout.add(E, _.SPACE);
+    this.cfg.denseOperators || this.dialectCfg.alwaysDenseOperators.includes(E) ? this.layout.add(r.NO_SPACE, E) : E === ":" ? this.layout.add(r.NO_SPACE, E, r.SPACE) : this.layout.add(E, r.SPACE);
   }
   formatComma(E) {
-    this.inline ? this.layout.add(_.NO_SPACE, ",", _.SPACE) : this.layout.add(_.NO_SPACE, ",", _.NEWLINE, _.INDENT);
+    this.inline ? this.layout.add(r.NO_SPACE, ",", r.SPACE) : this.layout.add(r.NO_SPACE, ",", r.NEWLINE, r.INDENT);
   }
   withComments(E, R) {
     this.formatComments(E.leadingComments), R(), this.formatComments(E.trailingComments);
@@ -18784,15 +18832,15 @@ class EE {
     });
   }
   formatLineComment(E) {
-    cE(E.precedingWhitespace || "") ? this.layout.add(_.NEWLINE, _.INDENT, E.text, _.MANDATORY_NEWLINE, _.INDENT) : this.layout.getLayoutItems().length > 0 ? this.layout.add(_.NO_NEWLINE, _.SPACE, E.text, _.MANDATORY_NEWLINE, _.INDENT) : this.layout.add(E.text, _.MANDATORY_NEWLINE, _.INDENT);
+    FE(E.precedingWhitespace || "") ? this.layout.add(r.NEWLINE, r.INDENT, E.text, r.MANDATORY_NEWLINE, r.INDENT) : this.layout.getLayoutItems().length > 0 ? this.layout.add(r.NO_NEWLINE, r.SPACE, E.text, r.MANDATORY_NEWLINE, r.INDENT) : this.layout.add(E.text, r.MANDATORY_NEWLINE, r.INDENT);
   }
   formatBlockComment(E) {
     E.type === M.block_comment && this.isMultilineBlockComment(E) ? (this.splitBlockComment(E.text).forEach((R) => {
-      this.layout.add(_.NEWLINE, _.INDENT, R);
-    }), this.layout.add(_.NEWLINE, _.INDENT)) : this.layout.add(E.text, _.SPACE);
+      this.layout.add(r.NEWLINE, r.INDENT, R);
+    }), this.layout.add(r.NEWLINE, r.INDENT)) : this.layout.add(E.text, r.SPACE);
   }
   isMultilineBlockComment(E) {
-    return cE(E.text) || cE(E.precedingWhitespace || "");
+    return FE(E.text) || FE(E.precedingWhitespace || "");
   }
   isDocComment(E) {
     const R = E.split(/\n/);
@@ -18800,7 +18848,7 @@ class EE {
       // first line starts with /* or /**
       /^\/\*\*?$/.test(R[0]) && // intermediate lines start with *
       R.slice(1, R.length - 1).every((A) => /^\s*\*/.test(A)) && // last line ends with */
-      /^\s*\*\/$/.test(q(R))
+      /^\s*\*\/$/.test(k(R))
     );
   }
   // Breaks up block comment to multiple lines.
@@ -18834,7 +18882,7 @@ class EE {
     return this.isDocComment(E) ? E.split(/\n/).map((R) => /^\s*\*/.test(R) ? " " + R.replace(/^\s*/, "") : R) : E.split(/\n/).map((R) => R.replace(/^\s*/, ""));
   }
   formatSubExpression(E) {
-    return new EE({
+    return new TE({
       cfg: this.cfg,
       dialectCfg: this.dialectCfg,
       params: this.params,
@@ -18845,7 +18893,7 @@ class EE {
   formatInlineExpression(E) {
     const R = this.params.getPositionalParameterIndex();
     try {
-      return new EE({
+      return new TE({
         cfg: this.cfg,
         dialectCfg: this.dialectCfg,
         params: this.params,
@@ -18853,7 +18901,7 @@ class EE {
         inline: !0
       }).format(E);
     } catch (A) {
-      if (A instanceof YE) {
+      if (A instanceof hE) {
         this.params.setPositionalParameterIndex(R);
         return;
       } else
@@ -18873,19 +18921,19 @@ class EE {
     }
   }
   formatJoin(E) {
-    x(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(_.NEWLINE, _.INDENT, this.showKw(E), _.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(_.NEWLINE, _.INDENT, this.showKw(E), _.SPACE);
+    v(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(r.NEWLINE, r.INDENT, this.showKw(E), r.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(r.NEWLINE, r.INDENT, this.showKw(E), r.SPACE);
   }
   formatKeyword(E) {
-    this.layout.add(this.showKw(E), _.SPACE);
+    this.layout.add(this.showKw(E), r.SPACE);
   }
   formatLogicalOperator(E) {
-    this.cfg.logicalOperatorNewline === "before" ? x(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(_.NEWLINE, _.INDENT, this.showKw(E), _.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(_.NEWLINE, _.INDENT, this.showKw(E), _.SPACE) : this.layout.add(this.showKw(E), _.NEWLINE, _.INDENT);
+    this.cfg.logicalOperatorNewline === "before" ? v(this.cfg) ? (this.layout.indentation.decreaseTopLevel(), this.layout.add(r.NEWLINE, r.INDENT, this.showKw(E), r.SPACE), this.layout.indentation.increaseTopLevel()) : this.layout.add(r.NEWLINE, r.INDENT, this.showKw(E), r.SPACE) : this.layout.add(this.showKw(E), r.NEWLINE, r.INDENT);
   }
   formatDataType(E) {
-    this.layout.add(this.showDataType(E), _.SPACE);
+    this.layout.add(this.showDataType(E), r.SPACE);
   }
   showKw(E) {
-    return oT(E.tokenType) ? PT(this.showNonTabularKw(E), this.cfg.indentStyle) : this.showNonTabularKw(E);
+    return cT(E.tokenType) ? GT(this.showNonTabularKw(E), this.cfg.indentStyle) : this.showNonTabularKw(E);
   }
   // Like showKw(), but skips tabular formatting
   showNonTabularKw(E) {
@@ -18899,7 +18947,7 @@ class EE {
     }
   }
   showFunctionKw(E) {
-    return oT(E.tokenType) ? PT(this.showNonTabularFunctionKw(E), this.cfg.indentStyle) : this.showNonTabularFunctionKw(E);
+    return cT(E.tokenType) ? GT(this.showNonTabularFunctionKw(E), this.cfg.indentStyle) : this.showNonTabularFunctionKw(E);
   }
   // Like showFunctionKw(), but skips tabular formatting
   showNonTabularFunctionKw(E) {
@@ -18949,20 +18997,20 @@ class DO {
     return this.formatAst(R).trimEnd();
   }
   parse(E) {
-    return tO(this.dialect.tokenizer).parse(E, this.cfg.paramTypes || {});
+    return sO(this.dialect.tokenizer).parse(E, this.cfg.paramTypes || {});
   }
   formatAst(E) {
     return E.map((R) => this.formatStatement(R)).join(`
 `.repeat(this.cfg.linesBetweenQueries + 1));
   }
   formatStatement(E) {
-    const R = new EE({
+    const R = new TE({
       cfg: this.cfg,
       dialectCfg: this.dialect.formatOptions,
       params: this.params,
-      layout: new pT(new dT(vI(this.cfg)))
+      layout: new fT(new XT(vI(this.cfg)))
     }).format(E.children);
-    return E.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? R.add(_.NEWLINE, ";") : R.add(_.NO_NEWLINE, ";")), R.toString();
+    return E.hasSemicolon && (this.cfg.newlineBeforeSemicolon ? R.add(r.NEWLINE, ";") : R.add(r.NO_NEWLINE, ";")), R.toString();
   }
 }
 class z extends Error {
@@ -18999,7 +19047,7 @@ var aO = function(T, E) {
       E.indexOf(A[S]) < 0 && Object.prototype.propertyIsEnumerable.call(T, A[S]) && (R[A[S]] = T[A[S]]);
   return R;
 };
-const VT = {
+const bT = {
   bigquery: "bigquery",
   db2: "db2",
   db2i: "db2i",
@@ -19020,7 +19068,7 @@ const VT = {
   tsql: "transactsql",
   singlestoredb: "singlestoredb",
   snowflake: "snowflake"
-}, MO = Object.keys(VT), UO = {
+}, MO = Object.keys(bT), UO = {
   tabWidth: 2,
   useTabs: !1,
   keywordCase: "preserve",
@@ -19036,7 +19084,7 @@ const VT = {
 }, GO = (T, E = {}) => {
   if (typeof E.language == "string" && !MO.includes(E.language))
     throw new z(`Unsupported SQL dialect: ${E.language}`);
-  const R = VT[E.language || "sql"];
+  const R = bT[E.language || "sql"];
   return cO(T, Object.assign(Object.assign({}, E), { dialect: YI[R] }));
 }, cO = (T, E) => {
   var { dialect: R } = E, A = aO(E, ["dialect"]);
@@ -19045,7 +19093,7 @@ const VT = {
   const S = iO(Object.assign(Object.assign({}, UO), A));
   return new DO(JI(R), S).format(T);
 };
-function aT(T, E) {
+function lT(T, E) {
   try {
     return GO(T, {
       language: {
@@ -19061,15 +19109,15 @@ function aT(T, E) {
     return console.warn("SQL formatting failed:", R), T;
   }
 }
-class hE {
+class bE {
   // 5 minutes in milliseconds
   constructor(E) {
-    f(this, "cubes", /* @__PURE__ */ new Map());
-    f(this, "dbExecutor");
-    f(this, "metadataCache");
-    f(this, "metadataCacheTimestamp");
-    f(this, "METADATA_CACHE_TTL", 5 * 60 * 1e3);
-    E != null && E.databaseExecutor ? this.dbExecutor = E.databaseExecutor : E != null && E.drizzle && (this.dbExecutor = $E(
+    W(this, "cubes", /* @__PURE__ */ new Map());
+    W(this, "dbExecutor");
+    W(this, "metadataCache");
+    W(this, "metadataCacheTimestamp");
+    W(this, "METADATA_CACHE_TTL", 5 * 60 * 1e3);
+    E != null && E.databaseExecutor ? this.dbExecutor = E.databaseExecutor : E != null && E.drizzle && (this.dbExecutor = vE(
       E.drizzle,
       E.schema,
       E.engineType
@@ -19092,7 +19140,7 @@ class hE {
    * Set Drizzle instance and schema directly
    */
   setDrizzle(E, R, A) {
-    this.dbExecutor = $E(E, R, A);
+    this.dbExecutor = vE(E, R, A);
   }
   /**
    * Check if database executor is configured
@@ -19130,7 +19178,7 @@ class hE {
   async execute(E, R) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    return new IE(this.dbExecutor).execute(this.cubes, E, R);
+    return new tE(this.dbExecutor).execute(this.cubes, E, R);
   }
   /**
    * Execute a multi-cube query
@@ -19206,9 +19254,9 @@ class hE {
       throw new Error(`Cube '${E}' not found`);
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const N = await new IE(this.dbExecutor).generateSQL(S, R, A), e = this.dbExecutor.getEngineType();
+    const N = await new tE(this.dbExecutor).generateSQL(S, R, A), e = this.dbExecutor.getEngineType();
     return {
-      sql: aT(N.sql, e),
+      sql: lT(N.sql, e),
       params: N.params
     };
   }
@@ -19218,9 +19266,9 @@ class hE {
   async generateMultiCubeSQL(E, R) {
     if (!this.dbExecutor)
       throw new Error("Database executor not configured");
-    const S = await new IE(this.dbExecutor).generateMultiCubeSQL(this.cubes, E, R), I = this.dbExecutor.getEngineType();
+    const S = await new tE(this.dbExecutor).generateMultiCubeSQL(this.cubes, E, R), I = this.dbExecutor.getEngineType();
     return {
-      sql: aT(S.sql, I),
+      sql: lT(S.sql, I),
       params: S.params
     };
   }
@@ -19261,10 +19309,10 @@ class hE {
    * Ensures all referenced cubes and fields exist
    */
   validateQuery(E) {
-    return hT(this.cubes, E);
+    return KT(this.cubes, E);
   }
 }
-function hT(T, E) {
+function KT(T, E) {
   const R = [], A = /* @__PURE__ */ new Set();
   if (E.measures)
     for (const S of E.measures) {
@@ -19313,17 +19361,17 @@ function hT(T, E) {
     }
   if (E.filters)
     for (const S of E.filters)
-      fT(S, T, R, A);
+      yT(S, T, R, A);
   return A.size === 0 && R.push("Query must reference at least one cube through measures, dimensions, or filters"), {
     isValid: R.length === 0,
     errors: R
   };
 }
-function fT(T, E, R, A) {
+function yT(T, E, R, A) {
   if ("and" in T || "or" in T) {
     const e = T.and || T.or || [];
     for (const n of e)
-      fT(n, E, R, A);
+      yT(n, E, R, A);
     return;
   }
   if (!("member" in T)) {
@@ -19344,11 +19392,11 @@ function fT(T, E, R, A) {
   !N.dimensions[I] && !N.measures[I] && R.push(`Filter field '${I}' not found on cube '${S}' (must be a dimension or measure)`);
 }
 function YO(T) {
-  return new hE(T);
+  return new bE(T);
 }
-const lO = new hE(), mO = lO;
+const lO = new bE(), mO = lO;
 function pO(T) {
-  return new hE({
+  return new bE({
     drizzle: T.drizzle,
     schema: T.schema
   });
@@ -19460,26 +19508,26 @@ const dO = {
   }
 };
 export {
-  dE as BaseDatabaseExecutor,
+  fE as BaseDatabaseExecutor,
   zT as MySQLExecutor,
   jT as PostgresExecutor,
   AR as QueryBuilder,
-  IE as QueryExecutor,
+  tE as QueryExecutor,
   SR as QueryPlanner,
   TR as SQLiteExecutor,
-  hE as SemanticLayerCompiler,
+  bE as SemanticLayerCompiler,
   dO as SemanticLayerUtils,
-  $E as createDatabaseExecutor,
+  vE as createDatabaseExecutor,
   pO as createDrizzleSemanticLayer,
   uO as createMultiCubeContext,
   ER as createMySQLExecutor,
-  KE as createPostgresExecutor,
-  yE as createSQLiteExecutor,
+  wE as createPostgresExecutor,
+  xE as createSQLiteExecutor,
   YO as createSemanticLayer,
   mO as defaultSemanticLayer,
   FO as defineCube,
   RR as getJoinType,
-  gE as resolveCubeReference,
+  QE as resolveCubeReference,
   K as resolveSqlExpression,
   lO as semanticLayer
 };