Improve DB connection and transaction cleanup logic

Author: hoseinzadehashraf

Olive.Entities.Data.SqlServer/Olive.Entities.Data.SqlServer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>8.0.1</Version>
+    <Version>8.0.2</Version>
   </PropertyGroup>
 
   <ItemGroup>

Olive.Entities.Data/Ado.Net/DataAccess.cs

@@ -179,6 +179,9 @@ public async Task<IDataReader> ExecuteReader(string command, CommandType command
             }
             catch (Exception ex)
             {
+                // Close connection on error when not in a transaction
+                CloseConnection(dbCommand.Connection);
+
                 throw new Exception("Error in running SQL Query.", ex).AddData("Command", command)
                     .AddData("Parameters", @params?.Select(p => p.ParameterName + "=" + p.Value).ToString(" | "))
                     .AddData("ConnectionString", dbCommand.Connection.ConnectionString);

Olive.Entities.Data/Ado.Net/DbTransactionScope.cs

@@ -90,7 +90,18 @@ async Task Setup(string connectionString)
             {
                 var access = Context.Current.Database().GetAccess(connectionString);
                 var connection = (DbConnection)await access.CreateConnection();
-                var transaction = connection.BeginTransaction(IsolationLevel);
+
+                DbTransaction transaction;
+                try
+                {
+                    transaction = connection.BeginTransaction(IsolationLevel);
+                }
+                catch
+                {
+                    connection.Close();
+                    connection.Dispose();
+                    throw;
+                }
 
                 Connections.Add(connectionString, (connection, transaction));
             }
@@ -109,10 +120,15 @@ public void Dispose()
                     // Root is not completed.
                     IsAborted = true;
                     Connections.Do(x => x.Value.Transaction.Rollback());
-                    Connections.Do(x => x.Value.Transaction.Dispose());
                 }
 
-                Connections.Do(x => x.Value.Connection.Close());
+                // Always dispose transactions and connections
+                Connections.Do(x => x.Value.Transaction.Dispose());
+                Connections.Do(x =>
+                {
+                    x.Value.Connection.Close();
+                    x.Value.Connection.Dispose();
+                });
             }
             else
             {

Olive.Entities.Data/Olive.Entities.Data.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>8.0.3</Version>
+    <Version>8.0.4</Version>
   </PropertyGroup>
 
   <ItemGroup>