orchid-orm 1.47.0 → 1.48.0

package/dist/index.d.ts

@@ -43,6 +43,7 @@ type HasOneQuery<T extends RelationConfigSelf, Name extends string, TableQuery e
     } : K extends 'join' ? RelJoin : TableQuery[K];
 };
 interface HasOneInfo<T extends RelationConfigSelf, Name extends string, Rel extends HasOne, Q extends Query, CD = T['relations'][Name]['options'] extends RelationThroughOptions ? CreateData<Q, CreateBelongsToData<Q>> : CreateData<AddQueryDefaults<Q, HasOnePopulate<T, Name>>, CreateBelongsToData<Q>>> extends RelationConfigBase {
+    returnsOne: true;
     query: Q;
     params: HasOneParams<T, Rel>;
     maybeSingle: T['relations'][Name]['options']['required'] extends true ? QueryTake<Q> : QueryTakeOptional<Q>;
@@ -84,6 +85,7 @@ interface HasMany extends RelationThunkBase {
     options: HasOneOptions;
 }
 interface HasManyInfo<T extends RelationConfigSelf, Name extends string, Rel extends HasMany, Q extends Query> extends RelationConfigBase {
+    returnsOne: false;
     query: Q;
     params: HasOneParams<T, Rel>;
     maybeSingle: Q;
@@ -142,6 +144,7 @@ type BelongsToQuery<T extends Query, Name extends string> = {
     } : P extends 'join' ? RelJoin : P extends CreateMethodsNames | DeleteMethodsNames ? never : T[P];
 };
 interface BelongsToInfo<T extends RelationConfigSelf, Name extends string, Rel extends BelongsTo, FK extends string, Required, Q extends Query> extends RelationConfigBase {
+    returnsOne: true;
     query: Q;
     params: BelongsToParams<T, Rel>;
     maybeSingle: Required extends true ? QueryTake<Q> : QueryTakeOptional<Q>;
@@ -315,6 +318,7 @@ type HasAndBelongsToManyQuery<Name extends string, TableQuery extends Query> = {
     } : K extends 'join' ? RelJoin : TableQuery[K];
 };
 interface HasAndBelongsToManyInfo<T extends RelationConfigSelf, Name extends string, Rel extends HasAndBelongsToMany, Q extends Query> extends RelationConfigBase {
+    returnsOne: false;
     query: Q;
     params: HasAndBelongsToManyParams<T, Rel>;
     maybeSingle: Q;

package/dist/index.js

@@ -206,7 +206,10 @@ const selectIfNotSelected = (q, columns) => {
 };
 function joinHasThrough(q, baseQuery, joiningQuery, throughRelation, sourceRelation) {
   return q.whereExists(
-    throughRelation.joinQuery(throughRelation.query, baseQuery),
+    throughRelation.joinQuery(
+      throughRelation.query,
+      baseQuery
+    ),
     () => {
       const as = pqb.getQueryAs(joiningQuery);
       return sourceRelation.joinQuery(
@@ -231,17 +234,6 @@ function joinHasRelation(baseQuery, joiningQuery, primaryKeys, foreignKeys, len)
   }
   return q;
 }
-const joinQueryChainingHOF = (reverseJoin, joinQuery) => (joiningQuery, baseQuery) => {
-  const chain = joiningQuery.q.relChain;
-  if (!chain || chain.length === 1) {
-    return joinQuery(joiningQuery, baseQuery);
-  }
-  const last = chain[chain.length - 1];
-  const query = "relationConfig" in last ? last.relationConfig.joinQuery(last, baseQuery) : last;
-  return joiningQuery.where({
-    EXISTS: { q: reverseJoin(query, joiningQuery) }
-  });
-};
 const addAutoForeignKey = (tableConfig, from, to, primaryKeys, foreignKeys, options) => {
   var _a;
   const toTable = to.table;
@@ -298,6 +290,66 @@ const getColumnKeyFromDbName = (query, name) => {
   return name;
 };
 
+const joinQueryChainHOF = (relPKeys, reverseJoin, joinQuery) => (joiningQuery, baseQuery) => {
+  const jq = joiningQuery;
+  const chain = jq.q.relChain;
+  if (!chain || chain.length === 1) {
+    return joinQuery(jq, baseQuery);
+  }
+  const last = chain[chain.length - 1];
+  const query = "relationConfig" in last ? last.relationConfig.joinQuery(last, baseQuery) : last;
+  const result = jq.join(
+    { _internalJoin: reverseJoin(query, jq) },
+    void 0
+  );
+  if (!query.q.chainMultiple) {
+    return result;
+  }
+  const item = selectRowNumber(result, relPKeys);
+  combineOrdering(result, query);
+  return wrapQuery(jq, result, item);
+};
+const selectRowNumber = (result, relPKeys) => {
+  const hookSelect = result.q.hookSelect = new Map(
+    result.q.hookSelect && [...result.q.hookSelect]
+  );
+  const as = `"${pqb.getQueryAs(result)}"`;
+  const partitionColumns = relPKeys.map(
+    (key) => `${as}."${result.shape[key]?.data.name || key}"`
+  );
+  const item = {
+    select: {
+      sql: `row_number() OVER (PARTITION BY ${partitionColumns.join(", ")})`
+    }
+  };
+  hookSelect.set("r", item);
+  return item;
+};
+const combineOrdering = (result, joined) => {
+  const { order } = joined.q;
+  if (order) {
+    const as = pqb.getQueryAs(joined);
+    const add = order.map(
+      (o) => typeof o === "string" ? `${as}.${o}` : orchidCore.isExpression(o) ? o : Object.fromEntries(
+        Object.entries(o).map(([key, value]) => [`${as}.${key}`, value])
+      )
+    );
+    const arr = result.q.order;
+    result.q.order = arr ? [...add, ...arr] : add;
+  }
+};
+const wrapQuery = (joiningQuery, result, item) => {
+  const baseOuterQuery = pqb.cloneQueryBaseUnscoped(joiningQuery);
+  const outer = baseOuterQuery.clone();
+  outer.q.and = [new pqb.DynamicRawSQL(() => new pqb.RawSQL(`${item.as || "r"} = 1`))];
+  outer.q.useFromLimitOffset = true;
+  outer.shape = pqb.getShapeFromSelect(result, true);
+  outer.q.select = Object.keys(outer.shape);
+  outer.q.returnType = result.q.returnType;
+  result.q.returnsOne = true;
+  return result.wrap(outer);
+};
+
 class BelongsToVirtualColumn extends pqb.VirtualColumn {
   constructor(schema, key, state) {
     super(schema);
@@ -404,9 +456,15 @@ const makeBelongsToMethod = (tableConfig, table, relation, relationName, query)
       relationName,
       state
     ),
-    joinQuery: joinQueryChainingHOF(
+    joinQuery: joinQueryChainHOF(
+      pqb.getPrimaryKeys(query),
       reverseJoin,
-      (joiningQuery, baseQuery) => join(baseQuery, joiningQuery, primaryKeys, foreignKeys)
+      (joiningQuery, baseQuery) => join(
+        baseQuery,
+        joiningQuery,
+        primaryKeys,
+        foreignKeys
+      )
     ),
     reverseJoin
   };
@@ -643,6 +701,7 @@ class HasOneVirtualColumn extends pqb.VirtualColumn {
   }
 }
 const makeHasOneMethod = (tableConfig, table, relation, relationName, query) => {
+  const relPKeys = pqb.getPrimaryKeys(query);
   if ("through" in relation.options) {
     const { through, source } = relation.options;
     const throughRelation = getThroughRelation(table, through);
@@ -670,7 +729,8 @@ const makeHasOneMethod = (tableConfig, table, relation, relationName, query) =>
         const throughQuery = table.queryRelated(through, params);
         return query.whereExists(throughQuery, whereExistsCallback);
       },
-      joinQuery: joinQueryChainingHOF(
+      joinQuery: joinQueryChainHOF(
+        relPKeys,
         reverseJoin2,
         (joiningQuery, baseQuery) => joinHasThrough(
           joiningQuery,
@@ -728,7 +788,8 @@ const makeHasOneMethod = (tableConfig, table, relation, relationName, query) =>
       relationName,
       state
     ),
-    joinQuery: joinQueryChainingHOF(
+    joinQuery: joinQueryChainHOF(
+      relPKeys,
       reverseJoin,
       (joiningQuery, baseQuery) => joinHasRelation(
         baseQuery,
@@ -911,6 +972,7 @@ class HasManyVirtualColumn extends pqb.VirtualColumn {
   }
 }
 const makeHasManyMethod = (tableConfig, table, relation, relationName, query) => {
+  const relPKeys = pqb.getPrimaryKeys(query);
   if ("through" in relation.options) {
     const { through, source } = relation.options;
     const throughRelation = getThroughRelation(table, through);
@@ -941,7 +1003,8 @@ const makeHasManyMethod = (tableConfig, table, relation, relationName, query) =>
           whereExistsCallback
         );
       },
-      joinQuery: joinQueryChainingHOF(
+      joinQuery: joinQueryChainHOF(
+        relPKeys,
         reverseJoin2,
         (joiningQuery, baseQuery) => joinHasThrough(
           joiningQuery,
@@ -999,7 +1062,8 @@ const makeHasManyMethod = (tableConfig, table, relation, relationName, query) =>
       relationName,
       state
     ),
-    joinQuery: joinQueryChainingHOF(
+    joinQuery: joinQueryChainHOF(
+      relPKeys,
       reverseJoin,
       (joiningQuery, baseQuery) => joinHasRelation(
         baseQuery,
@@ -1388,7 +1452,8 @@ const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relatio
       relationName,
       state
     ),
-    joinQuery: joinQueryChainingHOF(
+    joinQuery: joinQueryChainHOF(
+      pqb.getPrimaryKeys(query),
       reverseJoin,
       (joiningQuery, baseQuery2) => joinQuery(
         joiningQuery,