orchid-orm 1.32.19 → 1.33.1

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { makeColumnTypes, SqlMethod, QueryHooks, defaultSchemaConfig, getColumnTypes, parseTableData, _queryHookAfterCreate, _queryHookAfterUpdate, getQueryAs, setQueryObjectValue, pushQueryOn, VirtualColumn, pushQueryValue, _queryCreateMany, isQueryReturnsAll, _queryHookBeforeUpdate, _queryFindBy, _queryCreate, _queryRows, _queryUpdate, _queryDelete, _queryDefaults, _queryUpdateOrThrow, _queryWhere, toSQLCacheKey, _queryJoinOn, OrchidOrmInternalError, _queryCreateFrom, NotFoundError, _queryFindByOptional, _querySelect, _queryWhereExists, _queryTake, _queryTakeOptional, _queryAll, Adapter, _initQueryBuilder, Db, getClonedQueryData } from 'pqb';
+import { makeColumnTypes, SqlMethod, QueryHooks, defaultSchemaConfig, getColumnTypes, parseTableData, _queryHookAfterCreate, _queryHookAfterUpdate, getQueryAs, setQueryObjectValue, pushQueryOnForOuter, VirtualColumn, pushQueryValue, _queryCreateMany, isQueryReturnsAll, _queryHookBeforeUpdate, _queryFindBy, _queryCreate, _queryRows, _queryUpdate, _queryDelete, _queryDefaults, _queryUpdateOrThrow, _queryWhere, toSQLCacheKey, _queryJoinOn, OrchidOrmInternalError, _queryCreateFrom, NotFoundError, _queryFindByOptional, _querySelect, _queryWhereExists, _queryTake, _queryTakeOptional, _queryAll, Adapter, _initQueryBuilder, Db, getClonedQueryData } from 'pqb';
 export * from 'pqb';
 import { getStackTrace, applyMixins, getCallerFilePath, snakeCaseKey, toSnakeCase, emptyObject, emptyArray, objectHasValues, toArray } from 'orchid-core';
 export * from 'orchid-core';
@@ -233,8 +233,15 @@ function joinHasRelation(baseQuery, joiningQuery, primaryKeys, foreignKeys, len)
     baseQuery.q.as || baseQuery.table,
     baseQuery.q.shape
   );
+  const baseAs = getQueryAs(baseQuery);
   for (let i = 0; i < len; i++) {
-    pushQueryOn(q, baseQuery, joiningQuery, foreignKeys[i], primaryKeys[i]);
+    pushQueryOnForOuter(
+      q,
+      baseQuery,
+      joiningQuery,
+      foreignKeys[i],
+      `${baseAs}.${primaryKeys[i]}`
+    );
   }
   return q;
 }
@@ -316,8 +323,15 @@ const makeBelongsToMethod = (relation, relationName, query) => {
       baseQuery.q.as || baseQuery.table,
       baseQuery.q.shape
     );
+    const baseAs = getQueryAs(baseQuery);
     for (let i = 0; i < len; i++) {
-      pushQueryOn(q, baseQuery, joiningQuery, primaryKeys2[i], foreignKeys2[i]);
+      pushQueryOnForOuter(
+        q,
+        baseQuery,
+        joiningQuery,
+        primaryKeys2[i],
+        `${baseAs}.${foreignKeys2[i]}`
+      );
     }
     return q;
   };