orchid-orm 1.40.1 → 1.40.2

package/dist/index.d.ts

@@ -114,6 +114,7 @@ interface HasManyInfo<T extends RelationConfigSelf, Name extends string, Rel ext
             data: UpdateData<Q>;
         };
         set?: MaybeArray<WhereArg<Q>>;
+        add?: MaybeArray<WhereArg<Q>>;
         create?: CreateData<T['relations'][Name]['options'] extends RelationThroughOptions ? Q : AddQueryDefaults<Q, HasOnePopulate<T, Name>>>[];
     };
 }
@@ -332,6 +333,7 @@ interface HasAndBelongsToManyInfo<T extends RelationConfigSelf, Name extends str
     dataForUpdate: {
         disconnect?: MaybeArray<WhereArg<Q>>;
         set?: MaybeArray<WhereArg<Q>>;
+        add?: MaybeArray<WhereArg<Q>>;
         delete?: MaybeArray<WhereArg<Q>>;
         update?: {
             where: MaybeArray<WhereArg<Q>>;
@@ -342,6 +344,7 @@ interface HasAndBelongsToManyInfo<T extends RelationConfigSelf, Name extends str
     dataForUpdateOne: {
         disconnect?: MaybeArray<WhereArg<Q>>;
         set?: MaybeArray<WhereArg<Q>>;
+        add?: MaybeArray<WhereArg<Q>>;
         delete?: MaybeArray<WhereArg<Q>>;
         update?: {
             where: MaybeArray<WhereArg<Q>>;

package/dist/index.js

@@ -181,7 +181,7 @@ const hasRelationHandleCreate = (q, ctx, item, rowIndex, key, primaryKeys, neste
 };
 const hasRelationHandleUpdate = (q, set, key, primaryKeys, nestedUpdate) => {
   const value = set[key];
-  if (!value.set && !("upsert" in value) && (!value.disconnect || Array.isArray(value.disconnect) && value.disconnect.length === 0) && (!value.delete || Array.isArray(value.delete) && value.delete.length === 0) && (!value.update || Array.isArray(value.update.where) && value.update.where.length === 0) && (!value.create || Array.isArray(value.create) && value.create.length === 0))
+  if (!value.set && !("upsert" in value) && (!value.add || Array.isArray(value.add) && value.add.length === 0) && (!value.disconnect || Array.isArray(value.disconnect) && value.disconnect.length === 0) && (!value.delete || Array.isArray(value.delete) && value.delete.length === 0) && (!value.update || Array.isArray(value.update.where) && value.update.where.length === 0) && (!value.create || Array.isArray(value.create) && value.create.length === 0))
     return;
   selectIfNotSelected(q, primaryKeys);
   q.q.wrapInTransaction = true;
@@ -1131,6 +1131,29 @@ const nestedUpdate$1 = ({ query, primaryKeys, foreignKeys }) => {
       );
       delete t.q.sqlCache;
     }
+    if (params.add) {
+      if (data.length > 1) {
+        throw new pqb.OrchidOrmInternalError(
+          query,
+          "`connect` is not available when updating multiple records, it is only applicable for a single record update"
+        );
+      }
+      const obj = {};
+      for (let i = 0; i < len; i++) {
+        obj[foreignKeys[i]] = data[0][primaryKeys[i]];
+      }
+      const relatedWheres = orchidCore.toArray(params.add);
+      const count = await pqb._queryUpdate(
+        t.orWhere(...relatedWheres),
+        obj
+      );
+      if (count < relatedWheres.length) {
+        throw new pqb.OrchidOrmInternalError(
+          query,
+          `Expected to find at least ${relatedWheres.length} record(s) based on \`add\` conditions, but found ${count}`
+        );
+      }
+    }
     if (params.disconnect || params.set) {
       const obj = {};
       for (const foreignKey of foreignKeys) {
@@ -1242,10 +1265,11 @@ const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relatio
   baseQuery.baseQuery = baseQuery;
   baseQuery.table = joinTable;
   const shape = {};
+  const primaryKeysShape = {};
   for (let i = 0; i < len; i++) {
-    shape[foreignKeys[i]] = removeColumnName(
-      table.shape[primaryKeys[i]]
-    );
+    const pk = primaryKeys[i];
+    shape[foreignKeys[i]] = removeColumnName(table.shape[pk]);
+    primaryKeysShape[pk] = table.shape[pk];
   }
   for (let i = 0; i < throughLen; i++) {
     shape[throughForeignKeys[i]] = removeColumnName(
@@ -1283,7 +1307,8 @@ const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relatio
     throughPrimaryKeys,
     foreignKeysFull,
     throughForeignKeysFull,
-    throughPrimaryKeysFull
+    throughPrimaryKeysFull,
+    primaryKeysShape
   };
   const joinQuery = (joiningQuery, tableAs, foreignAs, joinedShapes) => {
     const cloned = joiningQuery.clone();
@@ -1580,7 +1605,7 @@ const nestedInsert = ({
 const nestedUpdate = (state) => {
   const len = state.primaryKeys.length;
   const throughLen = state.throughPrimaryKeys.length;
-  return async (_, data, params) => {
+  return async (query, data, params) => {
     if (params.create) {
       const idsRows = await pqb._queryCreateMany(
         pqb._queryRows(state.relatedTableQuery.select(...state.throughPrimaryKeys)),
@@ -1628,6 +1653,58 @@ const nestedUpdate = (state) => {
         params.update.data
       );
     }
+    if (params.add) {
+      const as = query.table;
+      const relatedWheres = orchidCore.toArray(params.add);
+      const joinTableColumns = [
+        ...state.foreignKeys,
+        ...state.throughForeignKeys
+      ];
+      try {
+        const count = await state.joinTableQuery.insertManyFrom(
+          pqb._querySelect(
+            state.relatedTableQuery.orWhere(...relatedWheres),
+            [
+              Object.fromEntries([
+                ...state.primaryKeys.map((key, i) => [
+                  state.foreignKeys[i],
+                  as + "." + (state.primaryKeysShape[key].data.name || key)
+                ]),
+                ...state.throughForeignKeys.map((key, i) => [
+                  key,
+                  state.throughPrimaryKeys[i]
+                ])
+              ])
+            ]
+          ).joinData(
+            as,
+            () => Object.fromEntries(
+              state.primaryKeys.map((key) => [
+                key,
+                state.primaryKeysShape[key]
+              ])
+            ),
+            data.map((x) => orchidCore.pick(x, state.primaryKeys))
+          )
+        ).onConflict(joinTableColumns).merge([state.foreignKeys[0]]);
+        if (count < data.length * relatedWheres.length) {
+          throw new pqb.OrchidOrmInternalError(
+            query,
+            `Expected to find at least ${relatedWheres.length} record(s) based on \`connect\` conditions, but found ${count / data.length}`
+          );
+        }
+      } catch (err) {
+        if (err.code === "42P10") {
+          throw new pqb.OrchidOrmInternalError(
+            query,
+            `"${state.joinTableQuery.table}" must have a primary key or a unique index on columns (${joinTableColumns.join(
+              ", "
+            )}) for this kind of query.`
+          );
+        }
+        throw err;
+      }
+    }
     if (params.disconnect) {
       await pqb._queryDelete(
         queryJoinTable(state, data, params.disconnect)