🐞fix: LockAsync does not honour transactions

ApplicationLock.LockAsync did not pass open transaction to the underlying
connections, causing exceptions.

Author: lukaferlez

src/Simpleverse.Repository.Db/Simpleverse.Repository.Db.csproj

@@ -13,10 +13,10 @@
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageTags>Dapper, Bulk, Merge, Upsert, Delete, Insert, Update, Repository</PackageTags>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <Version>2.1.23</Version>
+    <Version>2.1.24</Version>
     <Description>High performance operation for MS SQL Server built for Dapper ORM. Including bulk operations Insert, Update, Delete, Get as well as Upsert both single and bulk.</Description>
-    <AssemblyVersion>2.1.23.0</AssemblyVersion>
-    <FileVersion>2.1.23.0</FileVersion>
+    <AssemblyVersion>2.1.24.0</AssemblyVersion>
+    <FileVersion>2.1.24.0</FileVersion>
     <RepositoryUrl>https://github.com/lukaferlez/Simpleverse.Repository</RepositoryUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <EmbedAllSources>true</EmbedAllSources>

src/Simpleverse.Repository.Db/SqlServer/ApplicationLock.cs

@@ -1,7 +1,6 @@
 using Microsoft.Data.SqlClient;
 using System;
 using System.Data;
-using System.Data.Common;
 using System.IO.Hashing;
 using System.Text;
 using System.Threading.Tasks;
@@ -29,7 +28,7 @@ public class ApplicationLockScope : IDisposable
 
 		private bool wasClosed;
 		private readonly SqlConnection connection;
-		private DbTransaction transaction;
+		private IDbTransaction transaction;
 
 		public ApplicationLockScope(SqlConnection connection)
 		{
@@ -50,7 +49,7 @@ public async Task<bool> LockAsync(params object[] keyItems)
 				transaction = await connection.BeginTransactionAsync(IsolationLevel.ReadCommitted);
 			}
 
-			return await connection.GetAppLockAsync(key);
+			return await connection.GetAppLockAsync(key, transaction: transaction);
 		}
 
 		protected virtual void Dispose(bool disposing)

src/Simpleverse.Repository.Db/SqlServer/SqlConnectionExtensions.cs

@@ -37,7 +37,10 @@ UNION ALL
 			return insertedTableName;
 		}
 
-		public static async Task<R> ExecuteAsyncWithTransaction<R>(this SqlConnection conn, Func<SqlConnection, SqlTransaction, Task<R>> function)
+		public static async Task<R> ExecuteAsyncWithTransaction<R>(
+			this SqlConnection conn,
+			Func<SqlConnection, IDbTransaction, Task<R>> function
+		)
 		{
 			using (var tran = conn.BeginTransaction())
 			{
@@ -49,7 +52,7 @@ public static async Task<R> ExecuteAsyncWithTransaction<R>(this SqlConnection co
 
 		#region AppLock
 
-		public static async Task<bool> GetAppLockAsync(this SqlConnection connection, string key, SqlTransaction transaction = null)
+		public static async Task<bool> GetAppLockAsync(this SqlConnection connection, string key, IDbTransaction transaction = null)
 		{
 			if (key.Length > 255)
 				throw new ArgumentOutOfRangeException(nameof(key), "ength of the key used for locking must be less then 256 characters.");
@@ -67,7 +70,7 @@ select @result
 			return result == 0 || result == 1;
 		}
 
-		public static async Task<bool> ReleaseAppLockAsync(this SqlConnection connection, string key, SqlTransaction transaction = null)
+		public static async Task<bool> ReleaseAppLockAsync(this SqlConnection connection, string key, IDbTransaction transaction = null)
 		{
 			if (key.Length > 255)
 				throw new ArgumentOutOfRangeException(nameof(key), "Length of the key used for locking must be less then 256 characters.");
@@ -88,7 +91,7 @@ select @result
 		public static Task<R> ExecuteWithAppLockAsync<R>(
 			this SqlConnection conn,
 			string resourceIdentifier,
-			Func<SqlConnection, SqlTransaction, Task<R>> function
+			Func<SqlConnection, IDbTransaction, Task<R>> function
 		)
 		{
 			return conn.ExecuteAsyncWithTransaction(
@@ -97,9 +100,9 @@ Func<SqlConnection, SqlTransaction, Task<R>> function
 		}
 
 		public static async Task<R> ExecuteWithAppLockAsync<R>(
-			this (SqlConnection conn, SqlTransaction tran) context,
+			this (SqlConnection conn, IDbTransaction tran) context,
 			string resourceIdentifier,
-			Func<SqlConnection, SqlTransaction, Task<R>> function
+			Func<SqlConnection, IDbTransaction, Task<R>> function
 		)
 		{
 			var lockResult = await context.conn.GetAppLockAsync(resourceIdentifier, transaction: context.tran);

src/Simpleverse.Repository.Db/SqlServer/SqlRepository.cs

@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Configuration;
 using StackExchange.Profiling.Data;
 using System;
+using System.Data;
 using System.Data.Common;
 using System.Threading.Tasks;
 
@@ -34,12 +35,12 @@ public SqlRepository(Func<DbConnection> connectionFactory)
 		public SqlRepository(Func<ProfiledDbConnection> connectionFactory)
 			: base(connectionFactory) { }
 
-		public async Task<R> ExecuteWithAppLockAsync<R>(string resourceIdentifier, Func<DbConnection, DbTransaction, Task<R>> function)
+		public async Task<R> ExecuteWithAppLockAsync<R>(string resourceIdentifier, Func<DbConnection, IDbTransaction, Task<R>> function)
 		{
 			return await ExecuteAsyncWithTransaction(
 				async (conn, tran) =>
 				{
-					return await ((SqlConnection)conn, (SqlTransaction)tran).ExecuteWithAppLockAsync(resourceIdentifier, function);
+					return await ((SqlConnection)conn, tran).ExecuteWithAppLockAsync(resourceIdentifier, function);
 				}
 			);
 		}