提交: a9ac1a666fffd549e3ab015bdeebb01070e4d03e - CleanAuLait48.Db (git)

Commit MetaInfo

• 修訂: a9ac1a666fffd549e3ab015bdeebb01070e4d03e (tree)
• 時間: 2022-11-16 00:35:49
• 作者: yoshy <yoshy.org.bitbucket@gz.j...>
• Commiter: yoshy

Log Message

[MOD] コネクションファクトリ、コネクションファクトリマップ、データソース、トランザクションマネージャをコネクションラッパーに対応

Change Summary

• modified: OuterEdge/Repository/Db/Tx/AbstractConnectionFactory.cs
• modified: OuterEdge/Repository/Db/Tx/ConnectoinFactoryMap.cs
• modified: OuterEdge/Repository/Db/Tx/DataSource.cs
• modified: OuterEdge/Repository/Db/Tx/IConnectionFactory.cs
• modified: OuterEdge/Repository/Db/Tx/IConnectionFactoryMap.cs
• modified: OuterEdge/Repository/Db/Tx/IDataSource.cs
• modified: OuterEdge/Repository/Db/Tx/TransactionManager.cs

差異

--- a/OuterEdge/Repository/Db/Tx/AbstractConnectionFactory.cs
+++ b/OuterEdge/Repository/Db/Tx/AbstractConnectionFactory.cs
@@ -11,32 +11,48 @@ namespace CleanAuLait48.OuterEdge.Repository.Db.Tx
     {
         private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
 
+        protected readonly string name;
+
         private readonly DbProviderFactory factory;
         private readonly string connStr;
+
         private readonly ISet<IDbConnection> connSet;
+
         private bool disposedValue;
 
         public AbstractConnectionFactory(DbProviderFactory factory, string connStr)
+                : this(factory, connStr, "default")
+        {
+        }
+
+        public AbstractConnectionFactory(DbProviderFactory factory, string connStr, string name)
         {
             this.factory = factory;
+
             this.connStr = connStr;
+            this.name = name;
+
             this.connSet = new HashSet<IDbConnection>();
         }
 
-        public virtual IDbConnection GetConnection()
+        public virtual IDbConnectionWrapper GetConnection()
         {
-            IDbConnection conn = CreateConnection();
+            IDbConnection conn = CreateRawConnection();
 
-            _ = connSet.Add(conn);
-
-            return conn;
+            return CreateWrapper(conn, this.name);
         }
 
-        protected IDbConnection CreateConnection()
+        public abstract IDbConnectionWrapper CreateWrapper(IDbConnection conn, string name);
+
+        protected IDbConnection CreateRawConnection()
         {
             IDbConnection conn = factory.CreateConnection();
+
             conn.ConnectionString = connStr;
             conn.Open();
+
+            _ = connSet.Add(conn);
+
             return conn;
         }
 

--- a/OuterEdge/Repository/Db/Tx/ConnectoinFactoryMap.cs
+++ b/OuterEdge/Repository/Db/Tx/ConnectoinFactoryMap.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Data;
 
 namespace CleanAuLait48.OuterEdge.Repository.Db.Tx
 {
@@ -30,12 +29,12 @@ namespace CleanAuLait48.OuterEdge.Repository.Db.Tx
             factoryMap.Add(key, factory);
         }
 
-        public IDbConnection GetConnection()
+        public IDbConnectionWrapper GetConnection()
         {
             return GetConnection("");
         }
 
-        public IDbConnection GetConnection(string name)
+        public IDbConnectionWrapper GetConnection(string name)
         {
             if (name == null)
             {

--- a/OuterEdge/Repository/Db/Tx/DataSource.cs
+++ b/OuterEdge/Repository/Db/Tx/DataSource.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Data;
 
 namespace CleanAuLait48.OuterEdge.Repository.Db.Tx
 {
@@ -14,12 +13,12 @@ namespace CleanAuLait48.OuterEdge.Repository.Db.Tx
             this.factoryMap = factoryMap;
         }
 
-        public IDbConnection GetConnection()
+        public IDbConnectionWrapper GetConnection()
         {
             return factoryMap.GetConnection();
         }
 
-        public IDbConnection GetConnection(string name)
+        public IDbConnectionWrapper GetConnection(string name)
         {
             return factoryMap.GetConnection(name);
         }

--- a/OuterEdge/Repository/Db/Tx/IConnectionFactory.cs
+++ b/OuterEdge/Repository/Db/Tx/IConnectionFactory.cs
@@ -1,10 +1,9 @@
 using System;
-using System.Data;
 
 namespace CleanAuLait48.OuterEdge.Repository.Db.Tx
 {
     public interface IConnectionFactory : IDisposable
     {
-        IDbConnection GetConnection();
+        IDbConnectionWrapper GetConnection();
     }
 }

--- a/OuterEdge/Repository/Db/Tx/IConnectionFactoryMap.cs
+++ b/OuterEdge/Repository/Db/Tx/IConnectionFactoryMap.cs
@@ -1,12 +1,11 @@
 using System;
-using System.Data;
 
 namespace CleanAuLait48.OuterEdge.Repository.Db.Tx
 {
     public interface IConnectionFactoryMap : IDisposable
     {
-        IDbConnection GetConnection();
-        IDbConnection GetConnection(string name);
+        IDbConnectionWrapper GetConnection();
+        IDbConnectionWrapper GetConnection(string name);
 
         void Clear();
 

--- a/OuterEdge/Repository/Db/Tx/IDataSource.cs
+++ b/OuterEdge/Repository/Db/Tx/IDataSource.cs
@@ -1,11 +1,10 @@
 using System;
-using System.Data;
 
 namespace CleanAuLait48.OuterEdge.Repository.Db.Tx
 {
     public interface IDataSource : IDisposable
     {
-        IDbConnection GetConnection();
-        IDbConnection GetConnection(string name);
+        IDbConnectionWrapper GetConnection();
+        IDbConnectionWrapper GetConnection(string name);
     }
 }
\ No newline at end of file

--- a/OuterEdge/Repository/Db/Tx/TransactionManager.cs
+++ b/OuterEdge/Repository/Db/Tx/TransactionManager.cs
@@ -1,15 +1,11 @@
 using CleanAuLait48.Core.Log;
 using NLog;
+using System;
 using System.Collections.Generic;
 using System.Data;
 
 namespace CleanAuLait48.OuterEdge.Repository.Db.Tx
 {
-    /*
-     * TOOD: FactoryMapにアプリケーション設定を反映させるタイミングの検討
-     * TODO: Dialectの注入方法の検討（現状は型引数だが... DIから生成しなければ現状のままで良い？）
-     */
-
     public class TransactionManager : ITransactionManager
     {
         private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
@@ -35,7 +31,7 @@ namespace CleanAuLait48.OuterEdge.Repository.Db.Tx
             IDbConnectionWrapper conn = GetConnection(name);
             IDbTransaction tx = conn.GetRawConnection().BeginTransaction();
 
-            IDbTransactionWrapper txWrapper = new DbTransactionWrapper(this, conn,tx, name);
+            IDbTransactionWrapper txWrapper = new DbTransactionWrapper(this, conn, tx, name);
 
             txMap.Add(name, txWrapper);
 
@@ -83,6 +79,16 @@ namespace CleanAuLait48.OuterEdge.Repository.Db.Tx
         {
             if (connMap.TryGetValue(name, out IDbConnectionWrapper conn))
             {
+                try
+                {
+                    conn.TestConnection();
+                }
+                catch (Exception e)
+                {
+                    logger.Warn(e);
+                    logger.Warn("既存DB接続 [{0}] {1} は疎通テストに失敗しました。", name, ToConnectionID(conn));
+                }
+
                 logger.Trace("既存DB接続 [{0}] {1} の状態は [{2}] です.", name, ToConnectionID(conn), conn.State);
 
                 if (conn.State == ConnectionState.Open)
@@ -97,15 +103,13 @@ namespace CleanAuLait48.OuterEdge.Repository.Db.Tx
                 connMap.Remove(name);
             }
 
-            IDbConnection rawConn = dataSource.GetConnection(name);
-
-            conn = new DbConnectionWrapper(rawConn, name);
+            IDbConnectionWrapper wrapper = dataSource.GetConnection(name);
 
-            connMap.Add(name, conn);
+            connMap.Add(name, wrapper);
 
-            logger.Trace("新規DB接続 [{0}] {1} を取得しました.", name, ToConnectionID(conn));
+            logger.Trace("新規DB接続 [{0}] {1} を取得しました.", name, ToConnectionID(wrapper));
 
-            return conn;
+            return wrapper;
         }
 
         public void ClearConnectionCacheMap()