orchid-orm 1.9.15 → 1.9.17

package/dist/index.js

@@ -1255,11 +1255,12 @@ const applyRelation = (qb, { relationName, relation, dbTable, otherDbTable }, de
   }
   if (data.returns === "one") {
     query._take();
+    query.query.returnsOne = true;
   }
   if (data.virtualColumn) {
     dbTable.shape[relationName] = dbTable.query.shape[relationName] = data.virtualColumn;
   }
-  makeRelationQuery(dbTable, definedAs, relationName, data);
+  makeRelationQuery(dbTable, relationName, data, query);
   baseQuery.joinQuery = data.joinQuery;
   dbTable.relations[relationName] = {
     type,
@@ -1278,17 +1279,14 @@ const applyRelation = (qb, { relationName, relation, dbTable, otherDbTable }, de
     applyRelation(qb, data2, delayedRelations);
   });
 };
-const makeRelationQuery = (table, definedAs, relationName, data) => {
+const makeRelationQuery = (table, relationName, data, q) => {
   Object.defineProperty(table, relationName, {
     get() {
       var _a;
-      const toTable = this.db[definedAs].as(relationName);
-      if (data.returns === "one") {
-        toTable._take();
-      }
+      const toTable = q.clone();
       const query = this.isSubQuery ? toTable : toTable._whereExists(
         this.baseQuery,
-        (q) => data.reverseJoin(this, toTable)
+        (q2) => data.reverseJoin(this, toTable)
       );
       query.query[pqb.relationQueryKey] = {
         relationName,