fix: use runOps for running pre-post ops

packages/nocodb/src/db/BaseModelSqlv2.ts

@@ -3124,7 +3124,7 @@ class BaseModelSqlv2 {
 
       await this.prepareNocoData(insertObj, true, cookie);
 
-      await Promise.all(preInsertOps.map((f) => f(this.dbDriver)));
+      await this.runOps(preInsertOps.map((f) => f()));
 
       let response;
       const query = this.dbDriver(this.tnPath).insert(insertObj);
@@ -3206,7 +3206,7 @@ class BaseModelSqlv2 {
       }
       rowId = this.extractCompositePK({ ai, ag, rowId, insertObj });
 
-      await Promise.all(postInsertOps.map((f) => f(rowId)));
+      await this.runOps(postInsertOps.map((f) => f(rowId)));
 
       if (rowId !== null && rowId !== undefined) {
         response = await this.readRecord({
@@ -3267,8 +3267,8 @@ class BaseModelSqlv2 {
     data: Record<string, any>;
     insertObj: Record<string, any>;
   }) {
-    const postInsertOps: ((rowId: any, trx?: any) => Promise<void>)[] = [];
+    const postInsertOps: ((rowId: any) => Promise<string>)[] = [];
-    const preInsertOps: ((trx?: any) => Promise<void>)[] = [];
+    const preInsertOps: (() => Promise<string>)[] = [];
     for (const col of nestedCols) {
       if (col.title in data) {
         const colOptions = await col.getColOptions<LinkToAnotherRecordColumn>();
@@ -3302,15 +3302,16 @@ class BaseModelSqlv2 {
 
               if (isBt) {
                 // todo: unlink the ref record
-                preInsertOps.push(async (trx: any = this.dbDriver) => {
+                preInsertOps.push(async () => {
-                  await trx(this.getTnPath(childModel.table_name))
+                  return this.dbDriver(this.getTnPath(childModel.table_name))
                     .update({
                       [childCol.column_name]: null,
                     })
                     .where(
                       childCol.column_name,
                       nestedData[childModel.primaryKey.title],
-                    );
+                    )
+                    .toQuery();
                 });
 
                 if (typeof nestedData !== 'object') continue;
@@ -3318,15 +3319,16 @@ class BaseModelSqlv2 {
                 const parentCol = await colOptions.getParentColumn();
                 insertObj[childCol.column_name] = nestedData?.[parentCol.title];
               } else {
-                postInsertOps.push(async (rowId, trx: any = this.dbDriver) => {
+                postInsertOps.push(async (rowId) => {
-                  await trx(this.getTnPath(childModel.table_name))
+                  return this.dbDriver(this.getTnPath(childModel.table_name))
                     .update({
                       [childCol.column_name]: rowId,
                     })
                     .where(
                       childModel.primaryKey.column_name,
                       nestedData[childModel.primaryKey.title],
-                    );
+                    )
+                    .toQuery();
                 });
               }
             }
@@ -3338,47 +3340,38 @@ class BaseModelSqlv2 {
               const childModel = await childCol.getModel();
               await childModel.getColumns();
 
-              postInsertOps.push(
+              postInsertOps.push(async (rowId) => {
-                async (
+                return this.dbDriver(this.getTnPath(childModel.table_name))
-                  rowId,
+                  .update({
-                  // todo: use transaction type
+                    [childCol.column_name]: rowId,
-                  trx: any = this.dbDriver,
+                  })
-                ) => {
+                  .whereIn(
-                  await trx(this.getTnPath(childModel.table_name))
+                    childModel.primaryKey.column_name,
-                    .update({
+                    nestedData?.map((r) => r[childModel.primaryKey.title]),
-                      [childCol.column_name]: rowId,
+                  )
-                    })
+                  .toQuery();
-                    .whereIn(
+              });
-                      childModel.primaryKey.column_name,
-                      nestedData?.map((r) => r[childModel.primaryKey.title]),
-                    );
-                },
-              );
             }
             break;
           case RelationTypes.MANY_TO_MANY: {
             if (!Array.isArray(nestedData)) continue;
-            postInsertOps.push(
+            postInsertOps.push(async (rowId) => {
-              async (
+              const parentModel = await colOptions
-                rowId,
+                .getParentColumn()
-                // todo: use transaction type
+                .then((c) => c.getModel());
-                trx: any = this.dbDriver,
+              await parentModel.getColumns();
-              ) => {
+              const parentMMCol = await colOptions.getMMParentColumn();
-                const parentModel = await colOptions
+              const childMMCol = await colOptions.getMMChildColumn();
-                  .getParentColumn()
+              const mmModel = await colOptions.getMMModel();
-                  .then((c) => c.getModel());
+
-                await parentModel.getColumns();
+              const rows = nestedData.map((r) => ({
-                const parentMMCol = await colOptions.getMMParentColumn();
+                [parentMMCol.column_name]: r[parentModel.primaryKey.title],
-                const childMMCol = await colOptions.getMMChildColumn();
+                [childMMCol.column_name]: rowId,
-                const mmModel = await colOptions.getMMModel();
+              }));
-
+              return this.dbDriver(this.getTnPath(mmModel.table_name))
-                const rows = nestedData.map((r) => ({
+                .insert(rows)
-                  [parentMMCol.column_name]: r[parentModel.primaryKey.title],
+                .toQuery();
-                  [childMMCol.column_name]: rowId,
+            });
-                }));
-                await trx(this.getTnPath(mmModel.table_name)).insert(rows);
-              },
-            );
           }
         }
       }
@@ -3410,8 +3403,8 @@ class BaseModelSqlv2 {
     try {
       // TODO: ag column handling for raw bulk insert
       const insertDatas = raw ? datas : [];
-      let postInsertOps: ((rowId: any, trx?: any) => Promise<void>)[] = [];
+      let postInsertOps: ((rowId: any) => Promise<string>)[] = [];
-      let preInsertOps: ((trx?: any) => Promise<void>)[] = [];
+      let preInsertOps: (() => Promise<string>)[] = [];
       let aiPkCol: Column;
       let agPkCol: Column;
 
@@ -3596,7 +3589,10 @@ class BaseModelSqlv2 {
         }
       }
 
-      await Promise.all(preInsertOps.map((f) => f(trx)));
+      await this.runOps(
+        preInsertOps.map((f) => f()),
+        trx,
+      );
 
       let responses;
 
@@ -3661,7 +3657,10 @@ class BaseModelSqlv2 {
           });
         }
 
-        await Promise.all(postInsertOps.map((f) => f(rowId, trx)));
+        await this.runOps(
+          postInsertOps.map((f) => f(rowId)),
+          trx,
+        );
       }
 
       await trx.commit();
@@ -5248,6 +5247,13 @@ class BaseModelSqlv2 {
     return data;
   }
 
+  async runOps(ops: Promise<string>[], trx = this.dbDriver) {
+    const queries = await Promise.all(ops);
+    for (const query of queries) {
+      await trx.raw(query);
+    }
+  }
+
   protected async substituteColumnIdsWithColumnTitles(
     data: Record<string, any>[],
     dependencyColumns?: Column[],