Commit: a3ce170d1e898fecf17babb0d2be480b6753bebe - CleanAuLait48.Db (git)

Commit MetaInfo

• Revision: a3ce170d1e898fecf17babb0d2be480b6753bebe (tree)
• Zeit: 2022-11-16 00:36:14
• Autor: yoshy <yoshy.org.bitbucket@gz.j...>
• Commiter: yoshy

Log Message

[MOD] DBコネクションラッパーを抽象化し、単純実装したクラスとそのファクトリを追加（各RDMBS固有の機能が必要な場合はアプリ側で実装する）

Ändern Zusammenfassung

• modified: CleanAuLait48.Db.csproj
• add: OuterEdge/Repository/Db/Tx/DbConnectionHelper.cs
• modified: OuterEdge/Repository/Db/Tx/IDbConnectionWrapper.cs
• modified: OuterEdge/Repository/Db/Tx/SimpleConnectionFactory.cs
• add: OuterEdge/Repository/Db/Tx/SimpleDbConnectionWrapper.cs
• delete: OuterEdge/Repository/Db/Tx/{DbConnectionWrapper.cs => AbstractDbConnectionWrapper.cs}

Diff

--- a/CleanAuLait48.Db.csproj
+++ b/CleanAuLait48.Db.csproj
@@ -49,7 +49,8 @@
     <Compile Include="OuterEdge\Repository\Db\Tx\AbstractConnectionFactory.cs" />
     <Compile Include="OuterEdge\Repository\Db\Tx\ConnectoinFactoryMap.cs" />
     <Compile Include="OuterEdge\Repository\Db\Tx\DataSource.cs" />
-    <Compile Include="OuterEdge\Repository\Db\Tx\DbConnectionWrapper.cs" />
+    <Compile Include="OuterEdge\Repository\Db\Tx\AbstractDbConnectionWrapper.cs" />
+    <Compile Include="OuterEdge\Repository\Db\Tx\DbConnectionHelper.cs" />
     <Compile Include="OuterEdge\Repository\Db\Tx\DbTransactionWrapper.cs" />
     <Compile Include="OuterEdge\Repository\Db\Tx\IConnectionFactory.cs" />
     <Compile Include="OuterEdge\Repository\Db\Tx\IConnectionFactoryMap.cs" />
@@ -58,6 +59,7 @@
     <Compile Include="OuterEdge\Repository\Db\Tx\IDbTransactionWrapper.cs" />
     <Compile Include="OuterEdge\Repository\Db\Tx\ITransactionManager.cs" />
     <Compile Include="OuterEdge\Repository\Db\Tx\SimpleConnectionFactory.cs" />
+    <Compile Include="OuterEdge\Repository\Db\Tx\SimpleDbConnectionWrapper.cs" />
     <Compile Include="OuterEdge\Repository\Db\Tx\TransactionManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

--- a/OuterEdge/Repository/Db/Tx/DbConnectionWrapper.cs
+++ b/OuterEdge/Repository/Db/Tx/AbstractDbConnectionWrapper.cs
@@ -5,12 +5,12 @@ using System.Text;
 
 namespace CleanAuLait48.OuterEdge.Repository.Db.Tx
 {
-    public class DbConnectionWrapper : IDbConnectionWrapper
+    public abstract class AbstractDbConnectionWrapper : IDbConnectionWrapper
     {
         private const string MANAGED_ERROR = "The transaction is managed by the transaction manager. So, we can't ";
 
-        private readonly IDbConnection conn;
-        private readonly string name;
+        protected readonly IDbConnection conn;
+        protected readonly string name;
 
         public string Database => this.conn.Database;
 
@@ -22,7 +22,7 @@ namespace CleanAuLait48.OuterEdge.Repository.Db.Tx
 
         public IDbConnection GetRawConnection() => this.conn;
 
-        public DbConnectionWrapper(IDbConnection conn, string name)
+        public AbstractDbConnectionWrapper(IDbConnection conn, string name)
         {
             this.conn = conn;
             this.name = name;
@@ -81,21 +81,17 @@ namespace CleanAuLait48.OuterEdge.Repository.Db.Tx
             return buf.ToString();
         }
 
-        public static IDbConnection GetRawConnection(IDbConnection conn)
+        public abstract void TestConnection();
+
+        protected void ExecuteTestQuery(string query)
         {
-            if (conn is IDbConnectionWrapper connWrapper)
+            using (IDbCommand cmd = this.GetRawConnection().CreateCommand())
             {
-                conn = connWrapper.GetRawConnection();
+                cmd.CommandText = query;
+                _ = cmd.ExecuteNonQuery();
             }
-
-            return conn;
         }
-#if false
-        public static IDatabase CreateDatabaseFromRawConnection(IDbConnection conn)
-        {
-            return new Database((DbConnection)GetRawConnection(conn));
-        }
-#endif
+
     }
 }
  
\ No newline at end of file

--- /dev/null
+++ b/OuterEdge/Repository/Db/Tx/DbConnectionHelper.cs
@@ -0,0 +1,24 @@
+using System.Data;
+
+namespace CleanAuLait48.OuterEdge.Repository.Db.Tx
+{
+    public static class DbConnectionHelper
+    {
+        public static IDbConnection GetRawConnection(IDbConnection conn)
+        {
+            if (conn is IDbConnectionWrapper connWrapper)
+            {
+                conn = connWrapper.GetRawConnection();
+            }
+
+            return conn;
+        }
+
+#if false
+        public static IDatabase CreateDatabaseFromRawConnection(IDbConnection conn)
+        {
+            return new Database((DbConnection)GetRawConnection(conn));
+        }
+#endif
+    }
+}

--- a/OuterEdge/Repository/Db/Tx/IDbConnectionWrapper.cs
+++ b/OuterEdge/Repository/Db/Tx/IDbConnectionWrapper.cs
@@ -5,5 +5,7 @@ namespace CleanAuLait48.OuterEdge.Repository.Db.Tx
     public interface IDbConnectionWrapper : IDbConnection
     {
         IDbConnection GetRawConnection();
+
+        void TestConnection();
     }
 }
\ No newline at end of file

--- a/OuterEdge/Repository/Db/Tx/SimpleConnectionFactory.cs
+++ b/OuterEdge/Repository/Db/Tx/SimpleConnectionFactory.cs
@@ -1,11 +1,23 @@
-using System.Data.Common;
+using System.Data;
+using System.Data.Common;
 
 namespace CleanAuLait48.OuterEdge.Repository.Db.Tx
 {
     public class SimpleConnectionFactory : AbstractConnectionFactory
     {
-        public SimpleConnectionFactory(DbProviderFactory factory, string connStr) : base(factory, connStr)
+        public SimpleConnectionFactory(DbProviderFactory factory, string connStr) :
+                base(factory, connStr)
         {
         }
+
+        public SimpleConnectionFactory(DbProviderFactory factory, string connStr, string name) :
+                base(factory, connStr, name)
+        {
+        }
+
+        public override IDbConnectionWrapper CreateWrapper(IDbConnection conn, string name)
+        {
+            return new SimpleDbConnectionWrapper(conn, this.name);
+        }
     }
 }

--- /dev/null
+++ b/OuterEdge/Repository/Db/Tx/SimpleDbConnectionWrapper.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Data;
+
+namespace CleanAuLait48.OuterEdge.Repository.Db.Tx
+{
+    internal class SimpleDbConnectionWrapper : AbstractDbConnectionWrapper
+    {
+        public SimpleDbConnectionWrapper(IDbConnection conn, string name) : base(conn, name)
+        {
+        }
+
+        public override void TestConnection()
+        {
+            throw new NotSupportedException();
+        }
+    }
+}