pqb 0.40.11 → 0.40.12

package/dist/index.js

@@ -119,25 +119,25 @@ const sqlFn = (...args) => {
   return (...args2) => new RawSQL(args2, arg);
 };
 
-var __defProp$m = Object.defineProperty;
-var __defProps$d = Object.defineProperties;
-var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$n = Object.getOwnPropertySymbols;
-var __hasOwnProp$n = Object.prototype.hasOwnProperty;
-var __propIsEnum$n = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$m = (obj, key, value) => key in obj ? __defProp$m(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$m = (a, b) => {
+var __defProp$n = Object.defineProperty;
+var __defProps$e = Object.defineProperties;
+var __getOwnPropDescs$e = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$o = Object.getOwnPropertySymbols;
+var __hasOwnProp$o = Object.prototype.hasOwnProperty;
+var __propIsEnum$o = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$n = (obj, key, value) => key in obj ? __defProp$n(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$n = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$n.call(b, prop))
-      __defNormalProp$m(a, prop, b[prop]);
-  if (__getOwnPropSymbols$n)
-    for (var prop of __getOwnPropSymbols$n(b)) {
-      if (__propIsEnum$n.call(b, prop))
-        __defNormalProp$m(a, prop, b[prop]);
+    if (__hasOwnProp$o.call(b, prop))
+      __defNormalProp$n(a, prop, b[prop]);
+  if (__getOwnPropSymbols$o)
+    for (var prop of __getOwnPropSymbols$o(b)) {
+      if (__propIsEnum$o.call(b, prop))
+        __defNormalProp$n(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
+var __spreadProps$e = (a, b) => __defProps$e(a, __getOwnPropDescs$e(b));
 class ColumnType extends orchidCore.ColumnTypeBase {
   /**
    * Mark the column as a primary key.
@@ -336,13 +336,13 @@ class ColumnType extends orchidCore.ColumnTypeBase {
    */
   searchIndex(...args) {
     return orchidCore.pushColumnData(this, "indexes", {
-      options: __spreadValues$m(__spreadValues$m({}, typeof args[0] === "string" ? args[1] : args[0]), this.dataType === "tsvector" ? { using: "GIN" } : { tsVector: true }),
+      options: __spreadValues$n(__spreadValues$n({}, typeof args[0] === "string" ? args[1] : args[0]), this.dataType === "tsvector" ? { using: "GIN" } : { tsVector: true }),
       name: typeof args[0] === "string" ? args[0] : void 0
     });
   }
   unique(...args) {
     return orchidCore.pushColumnData(this, "indexes", {
-      options: __spreadProps$d(__spreadValues$m({}, typeof args[0] === "string" ? args[1] : args[0]), {
+      options: __spreadProps$e(__spreadValues$n({}, typeof args[0] === "string" ? args[1] : args[0]), {
         unique: true
       }),
       name: typeof args[0] === "string" ? args[0] : void 0
@@ -385,25 +385,25 @@ class ColumnType extends orchidCore.ColumnTypeBase {
   }
 }
 
-var __defProp$l = Object.defineProperty;
-var __defProps$c = Object.defineProperties;
-var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$m = Object.getOwnPropertySymbols;
-var __hasOwnProp$m = Object.prototype.hasOwnProperty;
-var __propIsEnum$m = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$l = (obj, key, value) => key in obj ? __defProp$l(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$l = (a, b) => {
+var __defProp$m = Object.defineProperty;
+var __defProps$d = Object.defineProperties;
+var __getOwnPropDescs$d = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$n = Object.getOwnPropertySymbols;
+var __hasOwnProp$n = Object.prototype.hasOwnProperty;
+var __propIsEnum$n = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$m = (obj, key, value) => key in obj ? __defProp$m(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$m = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$m.call(b, prop))
-      __defNormalProp$l(a, prop, b[prop]);
-  if (__getOwnPropSymbols$m)
-    for (var prop of __getOwnPropSymbols$m(b)) {
-      if (__propIsEnum$m.call(b, prop))
-        __defNormalProp$l(a, prop, b[prop]);
+    if (__hasOwnProp$n.call(b, prop))
+      __defNormalProp$m(a, prop, b[prop]);
+  if (__getOwnPropSymbols$n)
+    for (var prop of __getOwnPropSymbols$n(b)) {
+      if (__propIsEnum$n.call(b, prop))
+        __defNormalProp$m(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
+var __spreadProps$d = (a, b) => __defProps$d(a, __getOwnPropDescs$d(b));
 const knownDefaults = {
   current_timestamp: "now()",
   "transaction_timestamp()": "now()"
@@ -419,7 +419,7 @@ const simplifyColumnDefault = (value) => {
 const instantiateColumn = (typeFn, params) => {
   const column = typeFn();
   const { dateTimePrecision } = params;
-  Object.assign(column.data, __spreadProps$c(__spreadValues$l({}, params), {
+  Object.assign(column.data, __spreadProps$d(__spreadValues$m({}, params), {
     dateTimePrecision: (
       // 0 is default for date, 6 is default for timestamp
       dateTimePrecision && dateTimePrecision !== 6 ? dateTimePrecision : void 0
@@ -858,25 +858,25 @@ const getSqlText = (sql) => {
   throw new Error(`Batch SQL is not supported in this query`);
 };
 
-var __defProp$k = Object.defineProperty;
-var __defProps$b = Object.defineProperties;
-var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$l = Object.getOwnPropertySymbols;
-var __hasOwnProp$l = Object.prototype.hasOwnProperty;
-var __propIsEnum$l = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$k = (obj, key, value) => key in obj ? __defProp$k(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$k = (a, b) => {
+var __defProp$l = Object.defineProperty;
+var __defProps$c = Object.defineProperties;
+var __getOwnPropDescs$c = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$m = Object.getOwnPropertySymbols;
+var __hasOwnProp$m = Object.prototype.hasOwnProperty;
+var __propIsEnum$m = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$l = (obj, key, value) => key in obj ? __defProp$l(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$l = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$l.call(b, prop))
-      __defNormalProp$k(a, prop, b[prop]);
-  if (__getOwnPropSymbols$l)
-    for (var prop of __getOwnPropSymbols$l(b)) {
-      if (__propIsEnum$l.call(b, prop))
-        __defNormalProp$k(a, prop, b[prop]);
+    if (__hasOwnProp$m.call(b, prop))
+      __defNormalProp$l(a, prop, b[prop]);
+  if (__getOwnPropSymbols$m)
+    for (var prop of __getOwnPropSymbols$m(b)) {
+      if (__propIsEnum$m.call(b, prop))
+        __defNormalProp$l(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
+var __spreadProps$c = (a, b) => __defProps$c(a, __getOwnPropDescs$c(b));
 function setQueryOperators(query, operators) {
   const q = query.q;
   if (q.operators !== operators) {
@@ -965,7 +965,7 @@ const base = {
     (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteValue(value, ctx, quotedAs)}`
   )
 };
-const boolean = __spreadProps$b(__spreadValues$k({}, base), {
+const boolean = __spreadProps$c(__spreadValues$l({}, base), {
   and: make(
     (key, value, ctx, quotedAs) => `${key} AND ${value.q.expr.toSQL(ctx, quotedAs)}`
   ),
@@ -973,7 +973,7 @@ const boolean = __spreadProps$b(__spreadValues$k({}, base), {
     (key, value, ctx, quotedAs) => `(${key}) OR (${value.q.expr.toSQL(ctx, quotedAs)})`
   )
 });
-const numeric = __spreadProps$b(__spreadValues$k({}, base), {
+const numeric = __spreadProps$c(__spreadValues$l({}, base), {
   lt: make(
     (key, value, ctx, quotedAs) => `${key} < ${quoteValue(value, ctx, quotedAs)}`
   ),
@@ -994,7 +994,7 @@ const numeric = __spreadProps$b(__spreadValues$k({}, base), {
     )}`
   )
 });
-const text = __spreadProps$b(__spreadValues$k({}, base), {
+const text = __spreadProps$c(__spreadValues$l({}, base), {
   contains: make(
     (key, value, ctx, quotedAs) => `${key} ILIKE '%' || ${quoteLikeValue(value, ctx, quotedAs)} || '%'`
   ),
@@ -1016,7 +1016,7 @@ const text = __spreadProps$b(__spreadValues$k({}, base), {
 });
 const encodeJsonPath = (ctx, path) => orchidCore.addValue(ctx.values, `{${Array.isArray(path) ? path.join(", ") : path}}`);
 const jsonPathQueryOp = (key, [path, options], ctx) => `jsonb_path_query_first(${key}, ${orchidCore.addValue(ctx.values, path)}${(options == null ? void 0 : options.vars) ? `, ${orchidCore.addValue(ctx.values, JSON.stringify(options.vars))}${options.silent ? ", true" : ""}` : (options == null ? void 0 : options.silent) ? ", NULL, true" : ""})`;
-const json = __spreadProps$b(__spreadValues$k({}, base), {
+const json = __spreadProps$c(__spreadValues$l({}, base), {
   jsonPathQueryFirst: Object.assign(
     function(path, options) {
       var _a, _b, _c, _d, _e;
@@ -1079,25 +1079,25 @@ const Operators = {
   array: base
 };
 
-var __defProp$j = Object.defineProperty;
-var __defProps$a = Object.defineProperties;
-var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$k = Object.getOwnPropertySymbols;
-var __hasOwnProp$k = Object.prototype.hasOwnProperty;
-var __propIsEnum$k = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$j = (obj, key, value) => key in obj ? __defProp$j(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$j = (a, b) => {
+var __defProp$k = Object.defineProperty;
+var __defProps$b = Object.defineProperties;
+var __getOwnPropDescs$b = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$l = Object.getOwnPropertySymbols;
+var __hasOwnProp$l = Object.prototype.hasOwnProperty;
+var __propIsEnum$l = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$k = (obj, key, value) => key in obj ? __defProp$k(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$k = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$k.call(b, prop))
-      __defNormalProp$j(a, prop, b[prop]);
-  if (__getOwnPropSymbols$k)
-    for (var prop of __getOwnPropSymbols$k(b)) {
-      if (__propIsEnum$k.call(b, prop))
-        __defNormalProp$j(a, prop, b[prop]);
+    if (__hasOwnProp$l.call(b, prop))
+      __defNormalProp$k(a, prop, b[prop]);
+  if (__getOwnPropSymbols$l)
+    for (var prop of __getOwnPropSymbols$l(b)) {
+      if (__propIsEnum$l.call(b, prop))
+        __defNormalProp$k(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
+var __spreadProps$b = (a, b) => __defProps$b(a, __getOwnPropDescs$b(b));
 class TextBaseColumn extends ColumnType {
   constructor(schema, schemaType = schema.stringSchema()) {
     super(schema, schemaType);
@@ -1151,7 +1151,7 @@ class StringColumn extends VarCharColumn {
   }
 }
 const textColumnToCode = (column, ctx, key) => {
-  const data = __spreadValues$j({}, column.data);
+  const data = __spreadValues$k({}, column.data);
   let args = "";
   const hasMax = data.maxArg !== void 0 && data.max === data.maxArg;
   if (data.minArg !== void 0 && data.min === data.minArg || hasMax) {
@@ -1456,7 +1456,7 @@ class UUIDColumn extends ColumnType {
       key,
       `uuid()`,
       // don't output the default default
-      data.default instanceof orchidCore.RawSQLBase && data.default._sql === uuidDefaultSQL ? __spreadProps$a(__spreadValues$j({}, data), { default: void 0 }) : data
+      data.default instanceof orchidCore.RawSQLBase && data.default._sql === uuidDefaultSQL ? __spreadProps$b(__spreadValues$k({}, data), { default: void 0 }) : data
     );
   }
 }
@@ -1747,7 +1747,7 @@ const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) =
   if (key === "*") {
     return ((_a = data.joinedShapes) == null ? void 0 : _a[table]) ? select ? `row_to_json("${table}".*)` : `"${table}".*` : column;
   }
-  const tableName = ((_b = data.joinOverrides) == null ? void 0 : _b[table]) || table;
+  const tableName = ((_b = data.aliases) == null ? void 0 : _b[table]) || table;
   const quoted = `"${table}"`;
   const col = quoted === quotedAs ? shape[key] : (_d = (_c = data.joinedShapes) == null ? void 0 : _c[tableName]) == null ? void 0 : _d[key];
   if (col) {
@@ -1798,7 +1798,7 @@ const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, sel
     }
     return column;
   }
-  const tableName = ((_b = data.joinOverrides) == null ? void 0 : _b[table]) || table;
+  const tableName = ((_b = data.aliases) == null ? void 0 : _b[table]) || table;
   const quoted = `"${table}"`;
   const col = quoted === quotedAs ? data.shape[key] : (_c = data.joinedShapes) == null ? void 0 : _c[tableName][key];
   if (col) {
@@ -2139,9 +2139,9 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
         const item = value;
         const joinAs = `"${getJoinItemSource(item.joinFrom)}"`;
         const { on } = item;
-        const q = item.useOuterJoinOverrides ? {
+        const q = item.useOuterAliases ? {
           joinedShapes: query.joinedShapes,
-          joinOverrides: query.outerJoinOverrides,
+          aliases: query.outerAliases,
           shape: query.shape
         } : query;
         ands.push(
@@ -2269,25 +2269,25 @@ const pushIn = (ctx, query, ands, quotedAs, arg) => {
   ands.push(`${multiple ? `(${columnsSql})` : columnsSql} IN ${value}`);
 };
 
-var __defProp$i = Object.defineProperty;
-var __defProps$9 = Object.defineProperties;
-var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
-var __hasOwnProp$j = Object.prototype.hasOwnProperty;
-var __propIsEnum$j = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$i = (obj, key, value) => key in obj ? __defProp$i(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$i = (a, b) => {
+var __defProp$j = Object.defineProperty;
+var __defProps$a = Object.defineProperties;
+var __getOwnPropDescs$a = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$k = Object.getOwnPropertySymbols;
+var __hasOwnProp$k = Object.prototype.hasOwnProperty;
+var __propIsEnum$k = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$j = (obj, key, value) => key in obj ? __defProp$j(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$j = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$j.call(b, prop))
-      __defNormalProp$i(a, prop, b[prop]);
-  if (__getOwnPropSymbols$j)
-    for (var prop of __getOwnPropSymbols$j(b)) {
-      if (__propIsEnum$j.call(b, prop))
-        __defNormalProp$i(a, prop, b[prop]);
+    if (__hasOwnProp$k.call(b, prop))
+      __defNormalProp$j(a, prop, b[prop]);
+  if (__getOwnPropSymbols$k)
+    for (var prop of __getOwnPropSymbols$k(b)) {
+      if (__propIsEnum$k.call(b, prop))
+        __defNormalProp$j(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
+var __spreadProps$a = (a, b) => __defProps$a(a, __getOwnPropDescs$a(b));
 const processJoinItem = (ctx, table, query, args, quotedAs) => {
   let target;
   let on;
@@ -2349,8 +2349,8 @@ const processJoinItem = (ctx, table, query, args, quotedAs) => {
       const whereSql = whereToSql(
         ctx,
         q,
-        __spreadProps$9(__spreadValues$i({}, q.q), {
-          joinedShapes: __spreadProps$9(__spreadValues$i(__spreadValues$i({}, query.joinedShapes), q.q.joinedShapes), {
+        __spreadProps$a(__spreadValues$j({}, q.q), {
+          joinedShapes: __spreadProps$a(__spreadValues$j(__spreadValues$j({}, query.joinedShapes), q.q.joinedShapes), {
             [table.q.as || table.table]: table.q.shape
           })
         }),
@@ -2453,7 +2453,7 @@ const pushJoinSql = (ctx, table, query, quotedAs) => {
       const { aliasValue } = ctx;
       ctx.aliasValue = true;
       const as = item[2];
-      sql = `${item[0]} LATERAL (${getSqlText(q.toSQL(ctx))}) "${((_a = query.joinOverrides) == null ? void 0 : _a[as]) || as}" ON true`;
+      sql = `${item[0]} LATERAL (${getSqlText(q.toSQL(ctx))}) "${((_a = query.aliases) == null ? void 0 : _a[as]) || as}" ON true`;
       ctx.aliasValue = aliasValue;
     } else {
       const { target, on = "true" } = processJoinItem(
@@ -2482,7 +2482,8 @@ const skipQueryKeysForSubQuery = {
   or: true,
   returnType: true,
   joinedShapes: true,
-  returnsOne: true
+  returnsOne: true,
+  aliases: true
 };
 const getIsJoinSubQuery = (query) => {
   const {
@@ -2497,25 +2498,25 @@ const getIsJoinSubQuery = (query) => {
   return false;
 };
 
-var __defProp$h = Object.defineProperty;
-var __defProps$8 = Object.defineProperties;
-var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
-var __hasOwnProp$i = Object.prototype.hasOwnProperty;
-var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$h = (obj, key, value) => key in obj ? __defProp$h(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$h = (a, b) => {
+var __defProp$i = Object.defineProperty;
+var __defProps$9 = Object.defineProperties;
+var __getOwnPropDescs$9 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$j = Object.getOwnPropertySymbols;
+var __hasOwnProp$j = Object.prototype.hasOwnProperty;
+var __propIsEnum$j = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$i = (obj, key, value) => key in obj ? __defProp$i(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$i = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$i.call(b, prop))
-      __defNormalProp$h(a, prop, b[prop]);
-  if (__getOwnPropSymbols$i)
-    for (var prop of __getOwnPropSymbols$i(b)) {
-      if (__propIsEnum$i.call(b, prop))
-        __defNormalProp$h(a, prop, b[prop]);
+    if (__hasOwnProp$j.call(b, prop))
+      __defNormalProp$i(a, prop, b[prop]);
+  if (__getOwnPropSymbols$j)
+    for (var prop of __getOwnPropSymbols$j(b)) {
+      if (__propIsEnum$j.call(b, prop))
+        __defNormalProp$i(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
+var __spreadProps$9 = (a, b) => __defProps$9(a, __getOwnPropDescs$9(b));
 const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
   var _a;
   if (typeof first === "string") {
@@ -2552,13 +2553,13 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
         logger: joinToQ.logger
       };
       j.baseQuery = j;
-      const joinedShapes = __spreadProps$8(__spreadValues$h({}, joinToQ.joinedShapes), {
+      const joinedShapes = __spreadProps$9(__spreadValues$i({}, joinToQ.joinedShapes), {
         [joinToQ.as || joinTo.table]: joinTo.shape
       });
       const r = args[0](
         makeJoinQueryBuilder(
           j,
-          j.q.joinedShapes ? __spreadValues$h(__spreadValues$h({}, j.q.joinedShapes), joinedShapes) : joinedShapes,
+          j.q.joinedShapes ? __spreadValues$i(__spreadValues$i({}, j.q.joinedShapes), joinedShapes) : joinedShapes,
           joinTo
         )
       );
@@ -2585,16 +2586,16 @@ const processJoinArgs = (joinTo, first, args, joinSubQuery, whereExists) => {
         pushQueryArray(q, "or", query.or);
       }
       if (query.scopes) {
-        q.q.scopes = __spreadValues$h(__spreadValues$h({}, q.q.scopes), query.scopes);
+        q.q.scopes = __spreadValues$i(__spreadValues$i({}, q.q.scopes), query.scopes);
       }
     }
-    const joinedShapes = __spreadProps$8(__spreadValues$h({}, joinTo.q.joinedShapes), {
+    const joinedShapes = __spreadProps$9(__spreadValues$i({}, joinTo.q.joinedShapes), {
       [joinTo.q.as || joinTo.table]: joinTo.shape
     });
     const r = args0(
       makeJoinQueryBuilder(
         q,
-        q.q.joinedShapes ? __spreadValues$h(__spreadValues$h({}, q.q.joinedShapes), joinedShapes) : joinedShapes,
+        q.q.joinedShapes ? __spreadValues$i(__spreadValues$i({}, q.q.joinedShapes), joinedShapes) : joinedShapes,
         joinTo
       )
     );
@@ -2649,25 +2650,25 @@ const _queryNone = (q) => {
 };
 const isQueryNone = (q) => q.then === noneMethods.then;
 
-var __defProp$g = Object.defineProperty;
-var __defProps$7 = Object.defineProperties;
-var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
-var __hasOwnProp$h = Object.prototype.hasOwnProperty;
-var __propIsEnum$h = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$g = (obj, key, value) => key in obj ? __defProp$g(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$g = (a, b) => {
+var __defProp$h = Object.defineProperty;
+var __defProps$8 = Object.defineProperties;
+var __getOwnPropDescs$8 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$i = Object.getOwnPropertySymbols;
+var __hasOwnProp$i = Object.prototype.hasOwnProperty;
+var __propIsEnum$i = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$h = (obj, key, value) => key in obj ? __defProp$h(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$h = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$h.call(b, prop))
-      __defNormalProp$g(a, prop, b[prop]);
-  if (__getOwnPropSymbols$h)
-    for (var prop of __getOwnPropSymbols$h(b)) {
-      if (__propIsEnum$h.call(b, prop))
-        __defNormalProp$g(a, prop, b[prop]);
+    if (__hasOwnProp$i.call(b, prop))
+      __defNormalProp$h(a, prop, b[prop]);
+  if (__getOwnPropSymbols$i)
+    for (var prop of __getOwnPropSymbols$i(b)) {
+      if (__propIsEnum$i.call(b, prop))
+        __defNormalProp$h(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
+var __spreadProps$8 = (a, b) => __defProps$8(a, __getOwnPropDescs$8(b));
 const _join = (query, require2, type, first, args) => {
   var _a, _b, _c, _d;
   let joinKey;
@@ -2709,7 +2710,7 @@ const _join = (query, require2, type, first, args) => {
       computeds = w == null ? void 0 : w.computeds;
       if (shape) {
         if (!require2)
-          shape = __spreadValues$g({}, shape);
+          shape = __spreadValues$h({}, shape);
         parsers = {};
         for (const key in shape) {
           const parser = shape[key].parseFn;
@@ -2813,7 +2814,7 @@ const _joinLateral = (self, type, arg, cb, as) => {
         t.table = arg;
         t.shape = w.shape;
         t.computeds = w.computeds;
-        t.q = __spreadProps$7(__spreadValues$g({}, t.q), {
+        t.q = __spreadProps$8(__spreadValues$h({}, t.q), {
           shape: w.shape
         });
         t.baseQuery = t;
@@ -3302,25 +3303,25 @@ class QueryLog {
   }
 }
 
-var __defProp$f = Object.defineProperty;
-var __defProps$6 = Object.defineProperties;
-var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
-var __hasOwnProp$g = Object.prototype.hasOwnProperty;
-var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$f = (obj, key, value) => key in obj ? __defProp$f(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$f = (a, b) => {
+var __defProp$g = Object.defineProperty;
+var __defProps$7 = Object.defineProperties;
+var __getOwnPropDescs$7 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$h = Object.getOwnPropertySymbols;
+var __hasOwnProp$h = Object.prototype.hasOwnProperty;
+var __propIsEnum$h = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$g = (obj, key, value) => key in obj ? __defProp$g(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$g = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$g.call(b, prop))
-      __defNormalProp$f(a, prop, b[prop]);
-  if (__getOwnPropSymbols$g)
-    for (var prop of __getOwnPropSymbols$g(b)) {
-      if (__propIsEnum$g.call(b, prop))
-        __defNormalProp$f(a, prop, b[prop]);
+    if (__hasOwnProp$h.call(b, prop))
+      __defNormalProp$g(a, prop, b[prop]);
+  if (__getOwnPropSymbols$h)
+    for (var prop of __getOwnPropSymbols$h(b)) {
+      if (__propIsEnum$h.call(b, prop))
+        __defNormalProp$g(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
+var __spreadProps$7 = (a, b) => __defProps$7(a, __getOwnPropDescs$7(b));
 const commitSql$1 = {
   text: "COMMIT"
 };
@@ -3485,7 +3486,7 @@ const runAfterCommit = async (afterCommit, result) => {
       let r = 0;
       for (let i = 0, len = afterCommit.length; i < len; i += 3) {
         for (const fn of afterCommit[i + 2]) {
-          resultsWithNames.push(__spreadProps$6(__spreadValues$f({}, hookResults[r++]), {
+          resultsWithNames.push(__spreadProps$7(__spreadValues$g({}, hookResults[r++]), {
             name: fn.name
           }));
         }
@@ -3547,25 +3548,25 @@ const finalizeNestedHookSelect = (batches, returnType, tempColumns, renames, key
   }
 };
 
-var __defProp$e = Object.defineProperty;
-var __defProps$5 = Object.defineProperties;
-var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
-var __hasOwnProp$f = Object.prototype.hasOwnProperty;
-var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$e = (obj, key, value) => key in obj ? __defProp$e(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$e = (a, b) => {
+var __defProp$f = Object.defineProperty;
+var __defProps$6 = Object.defineProperties;
+var __getOwnPropDescs$6 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$g = Object.getOwnPropertySymbols;
+var __hasOwnProp$g = Object.prototype.hasOwnProperty;
+var __propIsEnum$g = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$f = (obj, key, value) => key in obj ? __defProp$f(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$f = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$f.call(b, prop))
-      __defNormalProp$e(a, prop, b[prop]);
-  if (__getOwnPropSymbols$f)
-    for (var prop of __getOwnPropSymbols$f(b)) {
-      if (__propIsEnum$f.call(b, prop))
-        __defNormalProp$e(a, prop, b[prop]);
+    if (__hasOwnProp$g.call(b, prop))
+      __defNormalProp$f(a, prop, b[prop]);
+  if (__getOwnPropSymbols$g)
+    for (var prop of __getOwnPropSymbols$g(b)) {
+      if (__propIsEnum$g.call(b, prop))
+        __defNormalProp$f(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
+var __spreadProps$6 = (a, b) => __defProps$6(a, __getOwnPropDescs$6(b));
 class ComputedColumn {
   constructor(kind, deps, fn) {
     this.kind = kind;
@@ -3582,7 +3583,7 @@ const applyComputedColumns = (q, fn) => {
   for (const key in computed) {
     const item = computed[key];
     if (item instanceof ComputedColumn) {
-      q.q.computeds = __spreadProps$5(__spreadValues$e({}, q.q.computeds), { [key]: item });
+      q.q.computeds = __spreadProps$6(__spreadValues$f({}, q.q.computeds), { [key]: item });
     } else {
       const data = (q.shape[key] = item.result.value || UnknownColumn.instance).data;
       data.computed = item;
@@ -3692,25 +3693,25 @@ const saveBatchComputed = (key, result, res, blanks) => {
   }
 };
 
-var __defProp$d = Object.defineProperty;
-var __defProps$4 = Object.defineProperties;
-var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$e = Object.getOwnPropertySymbols;
-var __hasOwnProp$e = Object.prototype.hasOwnProperty;
-var __propIsEnum$e = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$d(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$d = (a, b) => {
+var __defProp$e = Object.defineProperty;
+var __defProps$5 = Object.defineProperties;
+var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$f = Object.getOwnPropertySymbols;
+var __hasOwnProp$f = Object.prototype.hasOwnProperty;
+var __propIsEnum$f = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$e = (obj, key, value) => key in obj ? __defProp$e(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$e = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$e.call(b, prop))
-      __defNormalProp$d(a, prop, b[prop]);
-  if (__getOwnPropSymbols$e)
-    for (var prop of __getOwnPropSymbols$e(b)) {
-      if (__propIsEnum$e.call(b, prop))
-        __defNormalProp$d(a, prop, b[prop]);
+    if (__hasOwnProp$f.call(b, prop))
+      __defNormalProp$e(a, prop, b[prop]);
+  if (__getOwnPropSymbols$f)
+    for (var prop of __getOwnPropSymbols$f(b)) {
+      if (__propIsEnum$f.call(b, prop))
+        __defNormalProp$e(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
+var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 const queryMethodByReturnType = {
   undefined: "query",
   all: "query",
@@ -3954,7 +3955,7 @@ const then = async (q, adapter, trx, beforeHooks, afterHooks, afterCommitHooks,
             if (hookResults.some((result2) => result2.status === "rejected")) {
               _afterCommitError(
                 result,
-                hookResults.map((result2, i) => __spreadProps$4(__spreadValues$d({}, result2), {
+                hookResults.map((result2, i) => __spreadProps$5(__spreadValues$e({}, result2), {
                   name: afterCommitHooks[i].name
                 })),
                 q.q.catchAfterCommitError
@@ -4196,7 +4197,7 @@ const filterResult = (q, returnType, queryResult, result, tempColumns, hasAfterH
       return row;
     } else {
       if (hasAfterHook)
-        row = __spreadValues$d({}, row);
+        row = __spreadValues$e({}, row);
       for (const column of tempColumns) {
         delete row[column];
       }
@@ -4239,7 +4240,7 @@ const filterAllResult = (result, tempColumns, hasAfterHook) => {
   if (tempColumns == null ? void 0 : tempColumns.size) {
     if (hasAfterHook) {
       return result.map((data) => {
-        const record = __spreadValues$d({}, data);
+        const record = __spreadValues$e({}, data);
         for (const key of tempColumns) {
           delete record[key];
         }
@@ -4256,25 +4257,25 @@ const filterAllResult = (result, tempColumns, hasAfterHook) => {
   return result;
 };
 
-var __defProp$c = Object.defineProperty;
-var __defProps$3 = Object.defineProperties;
-var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
-var __hasOwnProp$d = Object.prototype.hasOwnProperty;
-var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
-var __defNormalProp$c = (obj, key, value) => key in obj ? __defProp$c(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues$c = (a, b) => {
+var __defProp$d = Object.defineProperty;
+var __defProps$4 = Object.defineProperties;
+var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$e = Object.getOwnPropertySymbols;
+var __hasOwnProp$e = Object.prototype.hasOwnProperty;
+var __propIsEnum$e = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$d = (obj, key, value) => key in obj ? __defProp$d(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$d = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp$d.call(b, prop))
-      __defNormalProp$c(a, prop, b[prop]);
-  if (__getOwnPropSymbols$d)
-    for (var prop of __getOwnPropSymbols$d(b)) {
-      if (__propIsEnum$d.call(b, prop))
-        __defNormalProp$c(a, prop, b[prop]);
+    if (__hasOwnProp$e.call(b, prop))
+      __defNormalProp$d(a, prop, b[prop]);
+  if (__getOwnPropSymbols$e)
+    for (var prop of __getOwnPropSymbols$e(b)) {
+      if (__propIsEnum$e.call(b, prop))
+        __defNormalProp$d(a, prop, b[prop]);
     }
   return a;
 };
-var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
+var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 const addParserForRawExpression = (q, key, raw) => {
   const type = raw.result.value;
   if (type == null ? void 0 : type.parseFn)
@@ -4496,11 +4497,12 @@ const collectNestedSelectBatches = (batches, rows, path, last) => {
 };
 const emptyArrSQL = new RawSQL("'[]'");
 const processSelectArg = (q, as, arg, columnAs) => {
-  var _a, _b, _c, _d;
+  var _a, _b;
   if (typeof arg === "string") {
     return setParserForSelectedString(q, arg, as, columnAs);
   }
   const selectAs = {};
+  let aliases;
   for (const key in arg) {
     let value = arg[key];
     if (typeof value === "function") {
@@ -4535,17 +4537,11 @@ const processSelectArg = (q, as, arg, columnAs) => {
             query = value;
           }
         }
-        let asOverride = key;
-        if ((_a = value.q.joinedShapes) == null ? void 0 : _a[key]) {
-          let suffix = 2;
-          const joinOverrides = (_c = (_b = q.q).joinOverrides) != null ? _c : _b.joinOverrides = {};
-          while (joinOverrides[asOverride = `${key}${suffix}`]) {
-            suffix++;
-          }
-          joinOverrides[asOverride] = asOverride;
-          joinOverrides[key] = asOverride;
-        }
+        const asOverride = (_a = value.q.aliases[key]) != null ? _a : key;
         value.q.joinedForSelect = asOverride;
+        if (asOverride !== key) {
+          aliases = __spreadProps$4(__spreadValues$d({}, q.q.aliases), { [key]: asOverride });
+        }
         _joinLateral(
           q,
           value.q.innerJoinLateral ? "JOIN" : "LEFT JOIN",
@@ -4553,10 +4549,12 @@ const processSelectArg = (q, as, arg, columnAs) => {
           (q2) => q2,
           key
         );
-      } else if (((_d = value.q) == null ? void 0 : _d.subQuery) && value.q.expr) {
+      } else if (((_b = value.q) == null ? void 0 : _b.subQuery) && value.q.expr) {
         value = value.q.expr;
       }
     }
+    if (aliases)
+      q.q.aliases = aliases;
     selectAs[key] = addParserForSelectItem(
       q,
       as,
@@ -4601,7 +4599,7 @@ const setParserForSelectedString = (q, arg, as, columnAs) => {
         for (const column2 of computed.deps) {
           map.set(column2, { select: `${table}.${column2}` });
         }
-        q.q.selectedComputeds = __spreadProps$3(__spreadValues$c({}, q.q.selectedComputeds), {
+        q.q.selectedComputeds = __spreadProps$4(__spreadValues$d({}, q.q.selectedComputeds), {
           [column]: computed
         });
         return;
@@ -4625,7 +4623,7 @@ const handleComputed = (q, computeds, column) => {
     for (const column2 of computed.deps) {
       map.set(column2, { select: column2 });
     }
-    q.q.selectedComputeds = __spreadProps$3(__spreadValues$c({}, q.q.selectedComputeds), { [column]: computed });
+    q.q.selectedComputeds = __spreadProps$4(__spreadValues$d({}, q.q.selectedComputeds), { [column]: computed });
     return;
   }
   return column;
@@ -4823,10 +4821,43 @@ function _queryGetOptional(self, arg) {
   return _get(self, "value", arg);
 }
 
+var __defProp$c = Object.defineProperty;
+var __defProps$3 = Object.defineProperties;
+var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols$d = Object.getOwnPropertySymbols;
+var __hasOwnProp$d = Object.prototype.hasOwnProperty;
+var __propIsEnum$d = Object.prototype.propertyIsEnumerable;
+var __defNormalProp$c = (obj, key, value) => key in obj ? __defProp$c(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues$c = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp$d.call(b, prop))
+      __defNormalProp$c(a, prop, b[prop]);
+  if (__getOwnPropSymbols$d)
+    for (var prop of __getOwnPropSymbols$d(b)) {
+      if (__propIsEnum$d.call(b, prop))
+        __defNormalProp$c(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
 const _queryAs = (self, as) => {
-  self.q.as = as;
+  const { q } = self;
+  q.as = as;
+  q.aliases = __spreadProps$3(__spreadValues$c({}, q.aliases), {
+    [as]: q.aliases ? _queryResolveAlias(q.aliases, as) : as
+  });
   return self;
 };
+const _queryResolveAlias = (aliases, as) => {
+  if (!aliases[as])
+    return as;
+  let suffix = 2;
+  let privateAs;
+  while (aliases[privateAs = as + suffix]) {
+    suffix++;
+  }
+  return privateAs;
+};
 class AsMethods {
   /**
    * Sets table alias:
@@ -6192,14 +6223,14 @@ const makeRegexToFindInSql = (value) => {
   return new RegExp(`${value}(?=(?:[^']*'[^']*')*[^']*$)`, "g");
 };
 const resolveSubQueryCallback = (q, cb) => {
-  const { subQuery, relChain, outerJoinOverrides } = q.q;
+  const { subQuery, relChain, outerAliases } = q.q;
   q.q.subQuery = 1;
   q.q.relChain = void 0;
-  q.q.outerJoinOverrides = q.q.joinOverrides;
+  q.q.outerAliases = q.q.aliases;
   const result = cb(q);
   q.q.subQuery = subQuery;
   q.q.relChain = relChain;
-  q.q.outerJoinOverrides = outerJoinOverrides;
+  q.q.outerAliases = outerAliases;
   return result;
 };
 const joinSubQuery = (q, sub) => {
@@ -9353,7 +9384,7 @@ const pushQueryOnForOuter = (q, joinFrom, joinTo, ...on) => {
     ON: {
       joinTo: joinFrom,
       joinFrom: joinTo,
-      useOuterJoinOverrides: true,
+      useOuterAliases: true,
       on
     }
   });
@@ -9762,7 +9793,7 @@ const resolveCallbacksInArgs = (q, args) => {
       qb.q = getClonedQueryData(q.q);
       qb.q.and = qb.q.or = qb.q.scopes = void 0;
       qb.q.subQuery = 1;
-      qb.q.outerJoinOverrides = qb.q.joinOverrides;
+      qb.q.outerAliases = qb.q.aliases;
       args[i] = resolveSubQueryCallback(qb, arg);
     }
   }
@@ -13349,6 +13380,7 @@ exports._queryJoinOnJsonPathEquals = _queryJoinOnJsonPathEquals;
 exports._queryJoinOrOn = _queryJoinOrOn;
 exports._queryOr = _queryOr;
 exports._queryOrNot = _queryOrNot;
+exports._queryResolveAlias = _queryResolveAlias;
 exports._queryRows = _queryRows;
 exports._querySelect = _querySelect;
 exports._queryTake = _queryTake;