Moved actor merge queries inside try/catch.

src/actors.js

@@ -585,29 +585,33 @@ export async function mergeActors(targetActorId, sourceActorId, reqUser) {
 
 	const trx = await knex.transaction();
 
-	await trx('actors')
-		.update('alias_for', targetActorId)
-		.where('id', sourceActorId);
-
-	const mergedProfiles = await trx('actors_profiles')
-		.update('actor_id', targetActorId)
-		.where('actor_id', sourceActorId)
-		.returning('id');
-
-	const mergedScenes = await trx('releases_actors')
-		.update({
-			actor_id: targetActorId,
-			alias_id: sourceActorId,
-		})
-		.where('actor_id', sourceActorId)
-		.returning('release_id');
-
-	await trx('stashes_actors')
-		.update('actor_id', targetActorId)
-		.where('actor_id', sourceActorId)
-		.returning('id');
+	let mergedProfiles;
+	let mergedScenes;
 
 	try {
+		await trx('actors')
+			.update('alias_for', targetActorId)
+			.where('id', sourceActorId)
+			.returning(['id', 'alias_for']);
+
+		mergedProfiles = await trx('actors_profiles')
+			.update('actor_id', targetActorId)
+			.where('actor_id', sourceActorId)
+			.returning('id');
+
+		mergedScenes = await trx('releases_actors')
+			.update({
+				actor_id: targetActorId,
+				alias_id: sourceActorId,
+			})
+			.where('actor_id', sourceActorId)
+			.returning('release_id');
+
+		await trx('stashes_actors')
+			.update('actor_id', targetActorId)
+			.where('actor_id', sourceActorId)
+			.returning('id');
+
 		await trx.commit();
 	} catch (error) {
 		await trx.rollback();