Implement internal DefaultTransaction class instead of plain object

7k8m · 7k8m · commit 301c07a7169d · 2020-06-26T22:48:09.000+09:00
diff --git a/DirectSQL/Database.cs b/DirectSQL/Database.cs
@@ -151,11 +151,11 @@ private static int ExecuteNonQueryCore(
             string sql,
             P[] parameters,
             C connection,
-            Object transaction)
+            IDbTransaction transaction)
         {
             using( var command = (CMD) connection.CreateCommand())
             {                
-                if( transaction != defaultTransaction)
+                if( transaction != DefaultTransaction.defaultTransaction)
                     command.Transaction = (T) transaction;
 
                 command.CommandText = sql;
@@ -200,7 +200,8 @@ private static int ExecuteNonQuery(
                 sql,
                 parameters,
                 connection,
-                defaultTransaction);
+                DefaultTransaction.defaultTransaction
+            );
         }
 
         /// <summary>
@@ -242,7 +243,7 @@ C connection
                 sql,
                 ConvertToDbParameter(parameters),
                 connection,
-                defaultTransaction
+                DefaultTransaction.defaultTransaction
             );
         }
 
@@ -342,11 +343,11 @@ public static object ExecuteScalarCore(
             string sql,
             P[] parameters,
             C connection,
-            Object transaction)
+            IDbTransaction transaction)
         {
             using (var command = (CMD) connection.CreateCommand())
             {
-                if( transaction != defaultTransaction)
+                if( transaction != DefaultTransaction.defaultTransaction)
                 {
                     command.Transaction = (T)transaction;
                 }
@@ -397,7 +398,7 @@ public static object ExecuteScalar(
                 sql, 
                 new P[0], 
                 connection, 
-                defaultTransaction
+                DefaultTransaction.defaultTransaction
             );
         }
 
@@ -430,7 +431,12 @@ public static object ExecuteScalar(
             P[] parameters,
             C connection)
         {
-            return ExecuteScalarCore(sql,parameters,connection,defaultTransaction);
+            return ExecuteScalarCore(
+                sql,
+                parameters,
+                connection,
+                DefaultTransaction.defaultTransaction
+            );
         }
 
         /// <summary>
@@ -471,7 +477,7 @@ public static object ExecuteScalar(
                 sql,
                 ConvertToDbParameter(parameters),
                 connection,
-                defaultTransaction
+                DefaultTransaction.defaultTransaction
             );
         }
 
@@ -878,9 +884,6 @@ public static async Task<dynamic[]> LoadFormattableSqlResultAsync(
                 transaction);
         }
 
-        //Marker object indicates default transaction is used.
-        internal static readonly Object defaultTransaction = new Object();
-
         public class SqlResult: DirectSQL.SqlResult<R,CMD,T,C,P>
         {
             internal SqlResult(
@@ -891,5 +894,36 @@ internal SqlResult(
             {
             }
         }
+
+        internal class DefaultTransaction : IDbTransaction
+        {
+
+            //Marker object indicates default transaction is used.
+            internal static readonly DefaultTransaction defaultTransaction = new DefaultTransaction();
+
+            private DefaultTransaction()
+            {
+
+            }
+
+            public void Dispose()
+            {
+                throw new NotImplementedException();
+            }
+
+            public void Commit()
+            {
+                throw new NotImplementedException();
+            }
+
+            public void Rollback()
+            {
+                throw new NotImplementedException();
+            }
+
+            public IDbConnection Connection { get; }
+            public IsolationLevel IsolationLevel { get; }
+        }
+
     }
 }
diff --git a/DirectSQL/SqlResult.cs b/DirectSQL/SqlResult.cs
@@ -143,7 +143,7 @@ private SqlResult (
             String sql, 
             P[] parameters, 
             C connection, 
-            Object transaction)
+            IDbTransaction transaction)
         {
             _command = (CMD) connection.CreateCommand();
 
@@ -153,7 +153,10 @@ private SqlResult (
                 _command.Parameters.Add(param);
             }
 
-            if(transaction != Database<C,T,CMD,R,P>.defaultTransaction) {
+            if(transaction != 
+               Database<C,T,CMD,R,P>
+                   .DefaultTransaction
+                   .defaultTransaction) {
                 _command.Transaction = (T)transaction;
             }
 
@@ -164,14 +167,19 @@ internal SqlResult (
             String sql, 
             P[] parameters, 
             C connection, 
-            T transaction) : this( sql, parameters, connection, (Object) transaction)
+            T transaction) : this( sql, parameters, connection, (IDbTransaction) transaction)
         {
         }
 
         internal SqlResult ( 
             String sql, 
             P[] parameters, 
-            C connection) : this( sql, parameters, connection, Database<C, T, CMD, R, P>.defaultTransaction)
+            C connection) : 
+            this( 
+                sql, 
+                parameters, 
+                connection, 
+                Database<C, T, CMD, R, P>.DefaultTransaction.defaultTransaction)
         {
         }        
 

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ private SqlResult (`
`143`	`143`	`String sql,`
`144`	`144`	`P[] parameters,`
`145`	`145`	`C connection,`
`146`		`- Object transaction)`
	`146`	`+ IDbTransaction transaction)`
`147`	`147`	`{`
`148`	`148`	`_command = (CMD) connection.CreateCommand();`
`149`	`149`
`@@ -153,7 +153,10 @@ private SqlResult (`
`153`	`153`	`_command.Parameters.Add(param);`
`154`	`154`	`}`
`155`	`155`
`156`		`- if(transaction != Database<C,T,CMD,R,P>.defaultTransaction) {`
	`156`	`+ if(transaction !=`
	`157`	`+ Database<C,T,CMD,R,P>`
	`158`	`+ .DefaultTransaction`
	`159`	`+ .defaultTransaction) {`
`157`	`160`	`_command.Transaction = (T)transaction;`
`158`	`161`	`}`
`159`	`162`
`@@ -164,14 +167,19 @@ internal SqlResult (`
`164`	`167`	`String sql,`
`165`	`168`	`P[] parameters,`
`166`	`169`	`C connection,`
`167`		`- T transaction) : this( sql, parameters, connection, (Object) transaction)`
	`170`	`+ T transaction) : this( sql, parameters, connection, (IDbTransaction) transaction)`
`168`	`171`	`{`
`169`	`172`	`}`
`170`	`173`
`171`	`174`	`internal SqlResult (`
`172`	`175`	`String sql,`
`173`	`176`	`P[] parameters,`
`174`		`- C connection) : this( sql, parameters, connection, Database<C, T, CMD, R, P>.defaultTransaction)`
	`177`	`+ C connection) :`
	`178`	`+ this(`
	`179`	`+ sql,`
	`180`	`+ parameters,`
	`181`	`+ connection,`
	`182`	`+ Database<C, T, CMD, R, P>.DefaultTransaction.defaultTransaction)`
`175`	`183`	`{`
`176`	`184`	`}`
`177`	`185`