Explicitly roll back transaction

src/service/execution.ts

@@ -74,11 +74,5 @@ export async function executeOperation<T extends OperationContext>(
     await context.params.onFailed(result);
   }
 
-  if (result.error) {
-    logDb('Result:\n%O', result);
-
-    throw result.error;
-  }
-
   return result;
 }

src/util/db.ts

@@ -3,6 +3,7 @@ import { dbLogger, log } from './logger';
 import { getConnectionId } from '../config';
 import ConnectionConfig from '../domain/ConnectionConfig';
 import ConnectionReference from '../domain/ConnectionReference';
+import OperationResult from '../domain/operation/OperationResult';
 
 /**
  * Database connections given by the user or the CLI frontend.
@@ -63,39 +64,35 @@ export function createInstance(config: ConnectionConfig): Knex {
  * If `dryRun` is true, transaction will not be committed.
  *
  * @param {ConnectionReference} db
- * @param {(trx: Knex.Transaction) => Promise<T>} callback
+ * @param {(trx: Knex.Transaction) => Promise<OperationResult>} callback
  * @param {boolean} dryRun?
- * @returns {Promise<T>}
+ * @returns {Promise<OperationResult>}
  */
-export async function withTransaction<T>(
+export async function withTransaction(
   db: ConnectionReference,
-  callback: (trx: Knex.Transaction) => Promise<T>,
+  callback: (trx: Knex.Transaction) => Promise<OperationResult>,
   dryRun?: boolean
-): Promise<T> {
+): Promise<OperationResult> {
   const dbLog = dbLogger(db.id);
+  const trx = await db.connection.transaction();
 
-  if (dryRun) {
-    dbLog('BEGIN: Dry Run transaction');
+  dbLog(`BEGIN:${dryRun ? ' Dry Run ' : ' '}transaction`);
 
-    const trx = await db.connection.transaction();
-    const res = await callback(trx);
+  const result = await callback(trx);
 
+  if (dryRun || result.error) {
     trx.rollback();
 
-    dbLog('END: Dry Run transaction rolled back successfully');
+    dbLog('END: transaction rolled back');
 
-    return res;
+    return result;
   }
 
-  return db.connection.transaction(async trx => {
-    dbLog('BEGIN: transaction');
-
-    const result = await callback(trx);
+  trx.commit();
 
-    dbLog('END: transaction');
+  dbLog(`END: transaction committed`);
 
-    return result;
-  });
+  return result;
 }
 
 /**