1. add ParamAttribute.FieldType

dotnetcore · Mar 29, 2019 · f686227 · f686227
1 parent 68e8dec
commit f686227
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 22 deletions.
diff --git a/src/SmartSql.DyRepository/Annotations/ParamAttribute.cs b/src/SmartSql.DyRepository/Annotations/ParamAttribute.cs
@@ -16,5 +16,6 @@ public ParamAttribute(string name)
         /// DbDataParameter.Name
         /// </summary>
         public String Name { get; set; }
+        public Type FieldType { get; set; }
     }
 }
diff --git a/src/SmartSql.DyRepository/EmitRepositoryBuilder.cs b/src/SmartSql.DyRepository/EmitRepositoryBuilder.cs
@@ -164,8 +164,7 @@ private void BuildMethod(Type interfaceType, TypeBuilder typeBuilder, MethodInfo
                     ilGen.LoadType(reqParam.ParameterType);
                     ilGen.New(SqlParameterType.Ctor.SqlParameter);
                     ilGen.Dup();
-                    var column = reqParam.GetCustomAttribute<ColumnAttribute>();
-                    var getHandlerMethod = column?.FieldType != null ? TypeHandlerCacheType.GetHandlerMethod(reqParam.ParameterType, column?.FieldType)
+                    var getHandlerMethod = paramAttr?.FieldType != null ? TypeHandlerCacheType.GetHandlerMethod(reqParam.ParameterType, paramAttr?.FieldType)
                         : PropertyTypeHandlerCacheType.GetHandlerMethod(reqParam.ParameterType);
                     ilGen.Call(getHandlerMethod);
                     ilGen.Call(SqlParameterType.Method.SetTypeHandler);

diff --git a/src/SmartSql.Test.Unit/DI/DITest.cs b/src/SmartSql.Test.Unit/DI/DITest.cs
@@ -5,6 +5,7 @@
 using Microsoft.Extensions.Logging;
 using SmartSql.DataSource;
 using SmartSql.DbSession;
+using SmartSql.Test.Repositories;
 using SmartSql.Test.Unit.DyRepository;
 using Xunit;
 
@@ -57,10 +58,10 @@ public void AddRepositoryFromAssembly()
             services.AddSmartSql()
             .AddRepositoryFromAssembly(o =>
             {
-                o.AssemblyString = "SmartSql.Test.Unit";
+                o.AssemblyString = "SmartSql.Test";
                 o.Filter = (type) =>
                 {
-                    return type.Namespace == "SmartSql.Test.Unit.DyRepository";
+                    return type.Namespace == "SmartSql.Test.Repositories";
                 };
             });
             var serviceProvider = services.BuildServiceProvider();
@@ -75,10 +76,10 @@ public void AddRepositoryFromAssembly_Alias()
             .AddRepositoryFromAssembly(o =>
             {
                 o.SmartSqlAlias = "AddRepositoryFromAssembly_Alias";
-                o.AssemblyString = "SmartSql.Test.Unit";
+                o.AssemblyString = "SmartSql.Test";
                 o.Filter = (type) =>
                 {
-                    return type.Namespace == "SmartSql.Test.Unit.DyRepository";
+                    return type.Namespace == "SmartSql.Test.Repositories";
                 };
             });
             var serviceProvider = services.BuildServiceProvider();

diff --git a/src/SmartSql.Test.Unit/DyRepository/AllPrimitiveRepositoryTest.cs b/src/SmartSql.Test.Unit/DyRepository/AllPrimitiveRepositoryTest.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using SmartSql.Test.Repositories;
+using Xunit;
+
+namespace SmartSql.Test.Unit.DyRepository
+{
+    public class AllPrimitiveRepositoryTest : DyRepositoryTest
+    {
+        [Fact]
+        public void Build()
+        {
+            var smartSqlBuilder = new SmartSqlBuilder().UseXmlConfig().Build();
+            var repositoryType = RepositoryBuilder.Build(typeof(IAllPrimitiveRepository), smartSqlBuilder.SmartSqlConfig);
+            Assert.NotNull(repositoryType);
+        }
+    }
+}
diff --git a/src/SmartSql.Test.Unit/DyRepository/DyRepositoryTest.cs b/src/SmartSql.Test.Unit/DyRepository/DyRepositoryTest.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using SmartSql.DyRepository;
+
+namespace SmartSql.Test.Unit.DyRepository
+{
+    public class DyRepositoryTest
+    {
+        protected IRepositoryBuilder  RepositoryBuilder { get; set; }
+        protected IRepositoryFactory RepositoryFactory { get; set; }
+        public DyRepositoryTest()
+        {
+            RepositoryBuilder = new EmitRepositoryBuilder(null, null, Microsoft.Extensions.Logging.Abstractions.NullLogger.Instance);
+            RepositoryFactory = new RepositoryFactory(RepositoryBuilder, Microsoft.Extensions.Logging.Abstractions.NullLogger.Instance);
+        }
+    }
+}
diff --git a/src/SmartSql.Test.Unit/DyRepository/IAllPrimitiveRepository.cs b/src/SmartSql.Test.Unit/DyRepository/IAllPrimitiveRepository.cs
diff --git a/src/SmartSql.Test.Unit/DyRepository/RepositoryBuilder_Test.cs b/src/SmartSql.Test.Unit/DyRepository/RepositoryBuilder_Test.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using SmartSql.Test.Repositories;
 using Xunit;
 
 namespace SmartSql.Test.Unit.DyRepository
@@ -35,7 +36,6 @@ public void CreateInstance()
 
         }
 
-
         [Fact]
         public void NoMapperRepository_GetGuidFromDb()
         {

diff --git a/src/SmartSql.Test/Repositories/IAllPrimitiveRepository.cs b/src/SmartSql.Test/Repositories/IAllPrimitiveRepository.cs
@@ -10,5 +10,6 @@ public interface IAllPrimitiveRepository
     {
         [Statement(Sql = "SELECT Top (@Taken) T.* From T_AllPrimitive T With(NoLock)")]
         IEnumerable<AllPrimitive> Query([Param("Taken")]int taken);
+        long Insert(AllPrimitive entity);
     }
 }
diff --git a/....Unit/DyRepository/INoMapperRepository.cs → ....Test/Repositories/INoMapperRepository.cs b/....Unit/DyRepository/INoMapperRepository.cs → ....Test/Repositories/INoMapperRepository.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace SmartSql.Test.Unit.DyRepository
+namespace SmartSql.Test.Repositories
 {
     public interface INoMapperRepository
     {