add TransactionMiddleware

add UseTransactionAttribute
dotnetcore · Apr 18, 2019 · d840e36 · d840e36
1 parent 47c2865
commit d840e36
Show file tree

Hide file tree

Showing 14 changed files with 184 additions and 6 deletions.
diff --git a/build/version.props b/build/version.props
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<VersionMajor>4</VersionMajor>
 		<VersionMinor>0</VersionMinor>
-		<VersionPatch>28</VersionPatch>
+		<VersionPatch>29</VersionPatch>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 	</PropertyGroup>
 </Project>
diff --git a/src/SmartSql.DyRepository/Annotations/UseTransactionAttribute.cs b/src/SmartSql.DyRepository/Annotations/UseTransactionAttribute.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace SmartSql.DyRepository.Annotations
+{
+    [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+    public class UseTransactionAttribute : Attribute
+    {
+        public IsolationLevel Level { get; set; } = IsolationLevel.Unspecified;
+    }
+}
diff --git a/src/SmartSql.DyRepository/EmitRepositoryBuilder.cs b/src/SmartSql.DyRepository/EmitRepositoryBuilder.cs
@@ -120,7 +120,7 @@ private void BuildMethod(Type interfaceType, TypeBuilder typeBuilder, MethodInfo
             EmitNewRequestContext(ilGen, isOnlyOneClassParam, firstParamType);
             EmitSetCommandType(ilGen, statementAttr);
             EmitSetDataSourceChoice(ilGen, statementAttr);
-
+            EmitSetTransaction(ilGen, methodInfo);
             if (String.IsNullOrEmpty(statementAttr.Sql))
             {
                 EmitSetScope(ilGen, statementAttr.Scope);
@@ -425,6 +425,16 @@ private static void EmitSetDataSourceChoice(ILGenerator ilGen, StatementAttribut
                 ilGen.Callvirt(RequestContextType.Method.SetDataSourceChoice);
             }
         }
+        private static void EmitSetTransaction(ILGenerator ilGen, MethodInfo methodInfo)
+        {
+            var useTransactionAttribute = methodInfo.GetCustomAttribute<UseTransactionAttribute>();
+            if (useTransactionAttribute != null)
+            {
+                ilGen.LoadLocalVar(0);
+                ilGen.LoadInt32(useTransactionAttribute.Level.GetHashCode());
+                ilGen.Callvirt(RequestContextType.Method.SetTransaction);
+            }
+        }
         private void EmitSetRealSql(ILGenerator ilGen, StatementAttribute statementAttr)
         {
             ilGen.LoadLocalVar(0);

diff --git a/src/SmartSql.Test.Unit/DbSessions/DbSessionTest.cs b/src/SmartSql.Test.Unit/DbSessions/DbSessionTest.cs
@@ -2,6 +2,7 @@
 using SmartSql.Reflection;
 using SmartSql.Test.Entities;
 using System;
+using System.Data;
 using System.Threading.Tasks;
 using SmartSql.Data;
 using Xunit;
@@ -98,6 +99,35 @@ public void Insert()
             });
         }
         [Fact]
+        public void InsertByRequestTransaction()
+        {
+            var id = DbSession.ExecuteScalar<long>(new RequestContext
+            {
+                Scope = nameof(AllPrimitive),
+                SqlId = "Insert",
+                Transaction = IsolationLevel.Unspecified,
+                Request = new AllPrimitive
+                {
+                    DateTime = DateTime.Now,
+                    String = "SmartSql",
+                }
+            });
+        }
+        [Fact]
+        public void InsertByStatementTransaction()
+        {
+            var id = DbSession.ExecuteScalar<long>(new RequestContext
+            {
+                Scope = nameof(AllPrimitive),
+                SqlId = "InsertByStatementTransaction",
+                Request = new AllPrimitive
+                {
+                    DateTime = DateTime.Now,
+                    String = "SmartSql",
+                }
+            });
+        }
+        [Fact]
         public void InsertByIdGen()
         {
             var id = DbSession.ExecuteScalar<long>(new RequestContext

diff --git a/src/SmartSql.Test.Unit/DyRepository/RepositoryBuilder_Test.cs b/src/SmartSql.Test.Unit/DyRepository/RepositoryBuilder_Test.cs
@@ -33,8 +33,19 @@ public void CreateInstance()
                 String = "",
                 DateTime = DateTime.Now
             });
-
         }
+        [Fact]
+        public void InsertByAnnotationTransaction()
+        {
+            var sqlMapper = SmartSqlBuilder.GetSqlMapper();
+            var repository = _repositoryFactory.CreateInstance(typeof(IAllPrimitiveRepository), sqlMapper) as IAllPrimitiveRepository;
+            var id = repository.InsertByAnnotationTransaction(new Entities.AllPrimitive
+            {
+                String = "",
+                DateTime = DateTime.Now
+            });
+        }
+
 
         [Fact]
         public void NoMapperRepository_GetGuidFromDb()

diff --git a/src/SmartSql.Test.Unit/Maps/AllPrimitive.xml b/src/SmartSql.Test.Unit/Maps/AllPrimitive.xml
@@ -199,6 +199,69 @@
       )
       ;Select Scope_Identity();
     </Statement>
+    <Statement Id="InsertByStatementTransaction" Transaction="Unspecified">
+      INSERT INTO T_AllPrimitive
+      (
+      Boolean,
+      Char,
+      Byte,
+      Int16,
+      Int32,
+      Int64,
+      Single,
+      Decimal,
+      DateTime,
+      String,
+      Guid,
+      TimeSpan,
+      NumericalEnum,
+      NullableBoolean,
+      NullableChar,
+      NullableByte,
+      NullableInt16,
+      NullableInt32,
+      NullableInt64,
+      NullableSingle,
+      NullableDouble,
+      NullableDecimal,
+      NullableDateTime,
+      NullableGuid,
+      NullableTimeSpan,
+      NullableNumericalEnum,
+      NullableString
+      )
+      VALUES
+      (
+      @Boolean,
+      @Char,
+      @Byte,
+      @Int16,
+      @Int32,
+      @Int64,
+      @Single,
+      @Decimal,
+      @DateTime,
+      @String,
+      @Guid,
+      @TimeSpan,
+      @NumericalEnum,
+      @NullableBoolean,
+      @NullableChar,
+      @NullableByte,
+      @NullableInt16,
+      @NullableInt32,
+      @NullableInt64,
+      @NullableSingle,
+      @NullableDouble,
+      @NullableDecimal,
+      @NullableDateTime,
+      @NullableGuid,
+      @NullableTimeSpan,
+      @NullableNumericalEnum,
+      @NullableString
+      )
+      ;Select Scope_Identity();
+    </Statement>
     <Statement Id="InsertByIdGen">
       <IdGenerator Id="Int64"/>
       INSERT INTO T_AllPrimitive

diff --git a/src/SmartSql.Test.Unit/Maps/User.xml b/src/SmartSql.Test.Unit/Maps/User.xml
@@ -41,7 +41,7 @@
     </Statement>
 
     <!--删除-->
-    <Statement Id="Delete">
+    <Statement Id="Delete" Transaction="Unspecified">
       Delete From T_User
       Where Id=@Id
     </Statement>

diff --git a/src/SmartSql.Test/Repositories/IAllPrimitiveRepository.cs b/src/SmartSql.Test/Repositories/IAllPrimitiveRepository.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Text;
 using SmartSql.DyRepository.Annotations;
 using SmartSql.Test.Entities;
@@ -13,5 +14,8 @@ public interface IAllPrimitiveRepository
         long Insert(AllPrimitive entity);
 
         (IList<AllPrimitive>, int) GetByPage_ValueTuple(int PageSize = 10, int PageIndex = 1);
+        [UseTransaction]
+        [Statement(Id = "Insert")]
+        long InsertByAnnotationTransaction(AllPrimitive entity);
     }
 }
diff --git a/src/SmartSql/Configuration/Statement.cs b/src/SmartSql/Configuration/Statement.cs
@@ -13,7 +13,6 @@ public class Statement
         public StatementType StatementType { get; set; } = StatementType.Unknown;
         public CommandType? CommandType { get; set; }
         public DataSourceChoice? SourceChoice { get; set; }
-        [Obsolete("弃用")]
         public IsolationLevel? Transaction { get; set; }
         public String ReadDb { get; set; }
         public String FullSqlId => $"{SqlMap.Scope}.{Id}";

diff --git a/src/SmartSql/Middlewares/InitializerMiddleware.cs b/src/SmartSql/Middlewares/InitializerMiddleware.cs
@@ -68,6 +68,7 @@ private void InitByStatement(AbstractRequestContext requestContext, SqlMap sqlMa
             {
                 requestContext.CommandType = requestContext.Statement.CommandType.Value;
             }
+            requestContext.Transaction = requestContext.Transaction ?? requestContext.Statement.Transaction;
             requestContext.ReadDb = requestContext.Statement.ReadDb;
             requestContext.CacheId = requestContext.Statement.CacheId;
             requestContext.Cache = requestContext.Statement.Cache;

diff --git a/src/SmartSql/Middlewares/TransactionMiddleware.cs b/src/SmartSql/Middlewares/TransactionMiddleware.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SmartSql.Middlewares
+{
+    public class TransactionMiddleware : IMiddleware
+    {
+        public IMiddleware Next { get; set; }
+        public void Invoke<TResult>(ExecutionContext executionContext)
+        {
+            var isTransaction = executionContext.DbSession.Transaction != null;
+            if (isTransaction || !executionContext.Request.Transaction.HasValue)
+            {
+                Next.Invoke<TResult>(executionContext);
+            }
+            else
+            {
+                executionContext.DbSession.TransactionWrap(executionContext.Request.Transaction.Value,
+                    () => { Next.Invoke<TResult>(executionContext); });
+            }
+        }
+
+        public async Task InvokeAsync<TResult>(ExecutionContext executionContext)
+        {
+            var isTransaction = executionContext.DbSession.Transaction != null;
+            if (isTransaction || !executionContext.Request.Transaction.HasValue)
+            {
+                await Next.InvokeAsync<TResult>(executionContext);
+            }
+            else
+            {
+                await executionContext.DbSession.TransactionWrapAsync(executionContext.Request.Transaction.Value,
+                      async () => { await Next.InvokeAsync<TResult>(executionContext); });
+            }
+        }
+    }
+}
diff --git a/src/SmartSql/Reflection/TypeConstants/RequestContextType.cs b/src/SmartSql/Reflection/TypeConstants/RequestContextType.cs
@@ -25,6 +25,7 @@ public static class Method
         {
             public static readonly MethodInfo SetDataSourceChoice = AbstractType.GetMethod("set_DataSourceChoice");
             public static readonly MethodInfo SetCommandType = AbstractType.GetMethod("set_CommandType");
+            public static readonly MethodInfo SetTransaction = AbstractType.GetMethod("SetTransaction");
             public static readonly MethodInfo SetScope = AbstractType.GetMethod("set_Scope");
             public static readonly MethodInfo SetSqlId = AbstractType.GetMethod("set_SqlId");
             public static readonly MethodInfo SetRequest = AbstractType.GetMethod("SetRequest");

diff --git a/src/SmartSql/RequestContext.cs b/src/SmartSql/RequestContext.cs
@@ -17,6 +17,7 @@ public abstract class AbstractRequestContext
         public ExecutionType ExecutionType { get; set; }
         public DataSourceChoice DataSourceChoice { get; set; } = DataSourceChoice.Unknow;
         public CommandType CommandType { get; set; } = CommandType.Text;
+        public IsolationLevel? Transaction { get; set; }
         public String ReadDb { get; set; }
         public Statement Statement { get; internal set; }
         public StringBuilder SqlBuilder { get; internal set; }
@@ -53,6 +54,11 @@ public ResultMap GetCurrentResultMap()
                 MultipleResultMap.Results[ExecutionContext.DataReaderWrapper.ResultIndex]?.Map : ResultMap;
         }
 
+        public void SetTransaction(IsolationLevel isolationLevel)
+        {
+            Transaction = isolationLevel;
+        }
+
         public abstract void SetupParameters();
         public abstract void SetRequest(object requestObj);
     }

diff --git a/src/SmartSql/SmartSqlBuilder.cs b/src/SmartSql/SmartSqlBuilder.cs
@@ -11,7 +11,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using SmartSql.TypeHandlers;
 
 namespace SmartSql
 {
@@ -92,6 +91,7 @@ private void BuildPipeline()
                 SmartSqlConfig.CacheManager = new CacheManager(SmartSqlConfig);
                 SmartSqlConfig.Pipeline = new PipelineBuilder()
                      .Add(new InitializerMiddleware(SmartSqlConfig))
+                     .Add(new TransactionMiddleware())
                      .Add(new PrepareStatementMiddleware(SmartSqlConfig))
                      .Add(new CachingMiddleware(SmartSqlConfig))
                      .Add(new DataSourceFilterMiddleware(SmartSqlConfig))
@@ -103,6 +103,7 @@ private void BuildPipeline()
                 SmartSqlConfig.CacheManager = new NoneCacheManager();
                 SmartSqlConfig.Pipeline = new PipelineBuilder()
                      .Add(new InitializerMiddleware(SmartSqlConfig))
+                     .Add(new TransactionMiddleware())
                      .Add(new PrepareStatementMiddleware(SmartSqlConfig))
                      .Add(new DataSourceFilterMiddleware(SmartSqlConfig))
                      .Add(new CommandExecuterMiddleware(SmartSqlConfig))