Fixed up MongoDB unit of work

Yuck · Sep 15, 2023 · 6fd4733 · 6fd4733
1 parent 79cf016
commit 6fd4733
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 17 deletions.
diff --git a/src/YuckQi.Data.DocumentDb.DynamoDb/YuckQi.Data.DocumentDb.DynamoDb.csproj b/src/YuckQi.Data.DocumentDb.DynamoDb/YuckQi.Data.DocumentDb.DynamoDb.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.3.5</Version>
+    <Version>6.3.6</Version>
     <Description>An implementation of YuckQi.Data for Amazon DynamoDB databases.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.DocumentDb.MongoDb/Extensions/DocumentModelExtensions.cs b/src/YuckQi.Data.DocumentDb.MongoDb/Extensions/DocumentModelExtensions.cs
@@ -10,9 +10,9 @@ public static class DocumentModelExtensions
 {
     private const String DefaultObjectIdPropertyName = "_id";
 
-    private static readonly ConcurrentDictionary<Type, String> CollectionNameByType = new();
-    private static readonly ConcurrentDictionary<Type, String> DatabaseNameByType = new();
-    private static readonly ConcurrentDictionary<Type, PropertyInfo> IdentifierByType = new();
+    private static readonly ConcurrentDictionary<Type, String> CollectionNameByType = new ();
+    private static readonly ConcurrentDictionary<Type, String> DatabaseNameByType = new ();
+    private static readonly ConcurrentDictionary<Type, PropertyInfo> IdentifierByType = new ();
 
     public static String? GetCollectionName(this Type? type) => type != null ? CollectionNameByType.GetOrAdd(type, identifier => GetCollectionAttribute(identifier)?.Name ?? identifier.Name) : null;
 

diff --git a/src/YuckQi.Data.DocumentDb.MongoDb/UnitOfWork.cs b/src/YuckQi.Data.DocumentDb.MongoDb/UnitOfWork.cs
@@ -6,7 +6,7 @@ namespace YuckQi.Data.DocumentDb.MongoDb;
 public class UnitOfWork : IUnitOfWork<IClientSessionHandle>
 {
     private readonly IMongoClient _client;
-    private readonly Object _lock = new();
+    private readonly Object _lock = new ();
     private readonly ClientSessionOptions? _options;
     private Lazy<IClientSessionHandle>? _session;
 
@@ -24,7 +24,9 @@ public void Dispose()
         if (_session == null)
             return;
 
-        Scope.AbortTransaction();
+        if (Scope.IsInTransaction)
+            Scope.AbortTransaction();
+
         Scope.Dispose();
 
         _session = null;
@@ -37,8 +39,8 @@ public void SaveChanges()
             if (_session == null)
                 throw new InvalidOperationException();
 
-            Scope.CommitTransaction();
-            Scope.Dispose();
+            if (Scope.IsInTransaction)
+                Scope.CommitTransaction();
 
             _session = new Lazy<IClientSessionHandle>(() => _client.StartSession(_options));
         }

diff --git a/src/YuckQi.Data.DocumentDb.MongoDb/YuckQi.Data.DocumentDb.MongoDb.csproj b/src/YuckQi.Data.DocumentDb.MongoDb/YuckQi.Data.DocumentDb.MongoDb.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.3.5</Version>
+    <Version>6.3.6</Version>
     <Description>An implementation of YuckQi.Data for MongoDB databases.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.MemDb/YuckQi.Data.MemDb.csproj b/src/YuckQi.Data.MemDb/YuckQi.Data.MemDb.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.3.5</Version>
+    <Version>6.3.6</Version>
     <Description>An implementation of YuckQi.Data for a in-memory "database" (ConcurrentDictionary), ideal for rapid development without external dependencies.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.Sql.Dapper.MySql/YuckQi.Data.Sql.Dapper.MySql.csproj b/src/YuckQi.Data.Sql.Dapper.MySql/YuckQi.Data.Sql.Dapper.MySql.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.3.5</Version>
+    <Version>6.3.6</Version>
     <Description>An implementation of YuckQi.Data for MySQL databases using Dapper and SimpleCRUD.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.Sql.Dapper.Oracle/YuckQi.Data.Sql.Dapper.Oracle.csproj b/src/YuckQi.Data.Sql.Dapper.Oracle/YuckQi.Data.Sql.Dapper.Oracle.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.3.5</Version>
+    <Version>6.3.6</Version>
     <Description>An implementation of YuckQi.Data for Oracle databases using Dapper and SimpleCRUD.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.Sql.Dapper.SqlServer/YuckQi.Data.Sql.Dapper.SqlServer.csproj b/src/YuckQi.Data.Sql.Dapper.SqlServer/YuckQi.Data.Sql.Dapper.SqlServer.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.3.5</Version>
+    <Version>6.3.6</Version>
     <Description>An implementation of YuckQi.Data for MSSQL databases using Dapper and SimpleCRUD.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.Sql.Dapper/YuckQi.Data.Sql.Dapper.csproj b/src/YuckQi.Data.Sql.Dapper/YuckQi.Data.Sql.Dapper.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.3.5</Version>
+    <Version>6.3.6</Version>
     <Description>An implementation of YuckQi.Data for SQL databases using Dapper and SimpleCRUD.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data.Sql.EntityFramework/YuckQi.Data.Sql.EntityFramework.csproj b/src/YuckQi.Data.Sql.EntityFramework/YuckQi.Data.Sql.EntityFramework.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.3.5</Version>
+    <Version>6.3.6</Version>
     <Description>An implementation of YuckQi.Data for SQL databases using Entity Framework.</Description>
     <Product>YuckQi.Data</Product>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>

diff --git a/src/YuckQi.Data/Sql/UnitOfWork.cs b/src/YuckQi.Data/Sql/UnitOfWork.cs
@@ -7,7 +7,7 @@ public class UnitOfWork<TScope, TDbConnection> : IUnitOfWork<TScope> where TScop
 {
     private TDbConnection? _connection;
     private readonly IsolationLevel _isolation;
-    private readonly Object _lock = new();
+    private readonly Object _lock = new ();
     private Lazy<TScope>? _transaction;
 
     public TScope Scope => _transaction != null ? _transaction.Value : throw new NullReferenceException();

diff --git a/src/YuckQi.Data/YuckQi.Data.csproj b/src/YuckQi.Data/YuckQi.Data.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>6.3.5</Version>
+    <Version>6.3.6</Version>
     <Description>A .NET library of lightweight data access handlers which can be used to compose repositories and domain services.</Description>
     <RepositoryUrl>https://github.com/Yuck/YuckQi.Data.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>