orchid-orm 1.35.18 → 1.35.20

package/dist/index.js

@@ -1111,8 +1111,8 @@ const nestedUpdate$1 = ({ query, primaryKeys, foreignKeys }) => {
 };
 
 var __defProp$3 = Object.defineProperty;
-var __defProps$1 = Object.defineProperties;
-var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
+var __defProps$2 = Object.defineProperties;
+var __getOwnPropDescs$2 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$3 = Object.getOwnPropertySymbols;
 var __hasOwnProp$3 = Object.prototype.hasOwnProperty;
 var __propIsEnum$3 = Object.prototype.propertyIsEnumerable;
@@ -1128,7 +1128,7 @@ var __spreadValues$3 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
+var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
 class HasAndBelongsToManyVirtualColumn extends pqb.VirtualColumn {
   constructor(joinTable, schema, key, state) {
     super(schema);
@@ -1163,7 +1163,7 @@ const removeColumnName = (column) => {
   if (!column.data.name)
     return column;
   const cloned = Object.create(column);
-  cloned.data = __spreadProps$1(__spreadValues$3({}, column.data), { name: void 0 });
+  cloned.data = __spreadProps$2(__spreadValues$3({}, column.data), { name: void 0 });
   return cloned;
 };
 const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query) => {
@@ -1205,7 +1205,7 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
     );
   }
   baseQuery.shape = shape;
-  baseQuery.q = __spreadProps$1(__spreadValues$3({}, baseQuery.q), {
+  baseQuery.q = __spreadProps$2(__spreadValues$3({}, baseQuery.q), {
     shape: baseQuery.shape
   });
   const subQuery = Object.create(baseQuery);
@@ -1245,7 +1245,7 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
   const selectPrimaryKeysAsForeignKeys = [{ selectAs: obj }];
   const reverseJoin = (baseQuery2, joiningQuery) => {
     const foreignAs = pqb.getQueryAs(joiningQuery);
-    return joinQuery(baseQuery2, pqb.getQueryAs(baseQuery2), foreignAs, __spreadProps$1(__spreadValues$3({}, baseQuery2.q.joinedShapes), {
+    return joinQuery(baseQuery2, pqb.getQueryAs(baseQuery2), foreignAs, __spreadProps$2(__spreadValues$3({}, baseQuery2.q.joinedShapes), {
       [foreignAs]: joiningQuery.q.shape
     }));
   };
@@ -1275,7 +1275,7 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
     ),
     joinQuery: joinQueryChainingHOF(
       reverseJoin,
-      (joiningQuery, baseQuery2) => joinQuery(joiningQuery, pqb.getQueryAs(baseQuery2), pqb.getQueryAs(joiningQuery), __spreadProps$1(__spreadValues$3({}, joiningQuery.q.joinedShapes), {
+      (joiningQuery, baseQuery2) => joinQuery(joiningQuery, pqb.getQueryAs(baseQuery2), pqb.getQueryAs(joiningQuery), __spreadProps$2(__spreadValues$3({}, joiningQuery.q.joinedShapes), {
         [baseQuery2.q.as || baseQuery2.table]: baseQuery2.q.shape
       }))
     ),
@@ -1586,6 +1586,8 @@ const nestedUpdate = (state) => {
 };
 
 var __defProp$2 = Object.defineProperty;
+var __defProps$1 = Object.defineProperties;
+var __getOwnPropDescs$1 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$2 = Object.getOwnPropertySymbols;
 var __hasOwnProp$2 = Object.prototype.hasOwnProperty;
 var __propIsEnum$2 = Object.prototype.propertyIsEnumerable;
@@ -1601,6 +1603,7 @@ var __spreadValues$2 = (a, b) => {
     }
   return a;
 };
+var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
 const applyRelations = (qb, tables, result) => {
   var _a;
   const tableEntries = Object.entries(tables);
@@ -1778,6 +1781,13 @@ const makeRelationQuery = (table, relationName, data, q) => {
       } else {
         query.q.relChain = [this];
       }
+      const aliases = this.q.as ? __spreadValues$2({}, this.q.aliases) : __spreadProps$1(__spreadValues$2({}, this.q.aliases), { [this.table]: this.table });
+      const relAliases = query.q.aliases;
+      for (const as in relAliases) {
+        aliases[as] = pqb._queryResolveAlias(aliases, as);
+      }
+      query.q.as = aliases[query.q.as];
+      query.q.aliases = aliases;
       query.q.joinedShapes = __spreadValues$2({
         [pqb.getQueryAs(this)]: this.q.shape
       }, this.q.joinedShapes);