'修复当返回类型为枚举集合时无法获取到TypeHandler' (#241)

xiangxiren · web-flow · commit e75f35e71c23 · 2023-12-08T20:16:36.000+08:00
diff --git a/src/SmartSql.Test.Unit/DB/init-mysql-db.sql b/src/SmartSql.Test.Unit/DB/init-mysql-db.sql
@@ -16,7 +16,7 @@ create table T_AllPrimitive
     String                varchar(100) not null,
     Guid                  char(36)     not null,
     TimeSpan              time         not null,
-    NumericalEnum         tinyint(1)   not null,
+    NumericalEnum         smallint   not null,
     NullableBoolean       tinyint(1)   null,
     NullableChar          char         null,
     NullableInt16         mediumint    null,
@@ -27,7 +27,7 @@ create table T_AllPrimitive
     NullableDateTime      datetime     null,
     NullableGuid          char(36)     null,
     NullableTimeSpan      time         null,
-    NullableNumericalEnum tinyint(1)   null,
+    NullableNumericalEnum smallint   null,
     NullableString        varchar(100) null
 ) engine = InnoDb;
 
diff --git a/src/SmartSql.Test.Unit/DyRepository/AllPrimitiveRepositoryTest.cs b/src/SmartSql.Test.Unit/DyRepository/AllPrimitiveRepositoryTest.cs
@@ -1,20 +1,19 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
+﻿using SmartSql.Test.Entities;
+using System.Linq;
 using SmartSql.Test.Repositories;
 using Xunit;
-using Microsoft.Extensions.Logging;
-using SmartSql.DyRepository;
 
 namespace SmartSql.Test.Unit.DyRepository
 {
     [Collection("GlobalSmartSql")]
-    public class AllPrimitiveRepositoryTest 
+    public class AllPrimitiveRepositoryTest
     {
-        private IAllPrimitiveRepository _repository;
+        private readonly IAllPrimitiveRepository _repository;
+        private ISqlMapper _mapper;
         public AllPrimitiveRepositoryTest(SmartSqlFixture smartSqlFixture)
         {
             _repository = smartSqlFixture.AllPrimitiveRepository;
+            _mapper = smartSqlFixture.SqlMapper;
         }
 
         [Fact]
@@ -24,14 +23,33 @@ public void GetByPage_ValueTuple()
 
             Assert.NotNull(result);
         }
-        
+
         [Fact]
         public void QueryDictionary()
         {
             var result = _repository.QueryDictionary(10);
 
             Assert.NotNull(result);
         }
-        
+
+        [Theory]
+        [InlineData(1, NumericalEnum11.One)]
+        [InlineData(2, NumericalEnum11.Two)]
+        public void GetNumericalEnums(int id, NumericalEnum11 numericalEnum)
+        {
+            var list = _mapper.Query<NumericalEnum11?>(new RequestContext
+            {
+                RealSql = "SELECT NumericalEnum FROM T_AllPrimitive WHERE Id = ?id",
+                Request = new { id }
+            });
+
+            Assert.NotNull(list);
+            Assert.True(list.All(t => t == numericalEnum));
+
+            var result = _repository.GetNumericalEnums(id);
+
+            Assert.NotNull(result);
+            Assert.True(result.All(t => t == numericalEnum));
+        }
     }
 }
diff --git a/src/SmartSql.Test.Unit/SmartSqlFixture.cs b/src/SmartSql.Test.Unit/SmartSqlFixture.cs
@@ -62,9 +62,13 @@ public SmartSqlFixture()
 
         protected void InitTestData()
         {
+            AllPrimitiveRepository.Truncate();
             for (int i = 0; i < 10; i++)
             {
-                AllPrimitiveRepository.Insert(new AllPrimitive());
+                AllPrimitiveRepository.Insert(new AllPrimitive()
+                {
+                    NumericalEnum = i % 2 == 0 ? NumericalEnum.One : NumericalEnum.Two
+                });
             }
         }
 
diff --git a/src/SmartSql.Test.Unit/init-db.sql b/src/SmartSql.Test.Unit/init-db.sql
@@ -4,8 +4,7 @@ use SmartSqlTestDB;
 
 create table T_AllPrimitive
 (
-    Id                    bigint auto_increment
-        primary key,
+    Id                    bigint auto_increment primary key,
     Boolean               tinyint(1)   not null,
     `Char`                char         not null,
     Int16                 mediumint    not null,
@@ -17,7 +16,7 @@ create table T_AllPrimitive
     String                varchar(100) not null,
     Guid                  char(36)     not null,
     TimeSpan              time         not null,
-    NumericalEnum         tinyint(1)   not null,
+    NumericalEnum         smallint   not null,
     NullableBoolean       tinyint(1)   null,
     NullableChar          char         null,
     NullableInt16         mediumint    null,
@@ -28,10 +27,9 @@ create table T_AllPrimitive
     NullableDateTime      datetime     null,
     NullableGuid          char(36)     null,
     NullableTimeSpan      time         null,
-    NullableNumericalEnum tinyint(1)   null,
+    NullableNumericalEnum smallint   null,
     NullableString        varchar(100) null
-) engine = InnoDb
-;
+) engine = InnoDb;
 
 create table t_column_annotation_entity
 (
diff --git a/src/SmartSql.Test/Entities/NumericalEnum.cs b/src/SmartSql.Test/Entities/NumericalEnum.cs
@@ -1,6 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace SmartSql.Test.Entities
 {
@@ -9,4 +7,10 @@ public enum NumericalEnum : Byte
         One = 1,
         Two = 2
     }
+
+    public enum NumericalEnum11 : Byte
+    {
+        One = 1,
+        Two = 2
+    }
 }
diff --git a/src/SmartSql.Test/Repositories/IAllPrimitiveRepository.cs b/src/SmartSql.Test/Repositories/IAllPrimitiveRepository.cs
@@ -26,6 +26,12 @@ public interface IAllPrimitiveRepository
         long InsertByAnnotationAOPTransaction(AllPrimitive entity);
 
         [Statement(Id = "QueryDictionary", Sql = "SELECT T.* From T_AllPrimitive T limit ?Taken")]
-        IList<IDictionary<String, Object>> QueryDictionary([Param("Taken")] int taken);
+        IList<IDictionary<string, object>> QueryDictionary([Param("Taken")] int taken);
+
+        [Statement(Sql = "SELECT NumericalEnum FROM T_AllPrimitive WHERE Id = ?id")]
+        List<NumericalEnum11> GetNumericalEnums(int id);
+
+        [Statement(Sql = "truncate table T_AllPrimitive")]
+        void Truncate();
     }
 }
diff --git a/src/SmartSql/Deserializer/ValueTypeDeserializer.cs b/src/SmartSql/Deserializer/ValueTypeDeserializer.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using SmartSql.Exceptions;
 using SmartSql.Reflection.TypeConstants;
 using SmartSql.TypeHandlers;
 
@@ -17,7 +18,7 @@ public bool CanDeserialize(ExecutionContext executionContext, Type resultType, b
         public TResult ToSingle<TResult>(ExecutionContext executionContext)
         {
             var dataReader = executionContext.DataReaderWrapper;
-            if (!dataReader.HasRows) return default(TResult);
+            if (!dataReader.HasRows) return default;
             dataReader.Read();
             return TypeHandlerCache<TResult, AnyFieldType>.Handler.GetValue(dataReader, VALUE_ORDINAL, executionContext.Result.ResultType); ;
         }
@@ -28,6 +29,16 @@ public IList<TResult> ToList<TResult>(ExecutionContext executionContext)
             if (!dataReader.HasRows) return list;
 
             var typeHandler = TypeHandlerCache<TResult, AnyFieldType>.Handler;
+
+            var resultType = typeof(TResult);
+            if (typeHandler == null)
+            {
+                typeHandler =
+                    (ITypeHandler<TResult, AnyFieldType>)executionContext.SmartSqlConfig.TypeHandlerFactory
+                        .GetTypeHandler(resultType) ??
+                    throw new SmartSqlException($"Not Find TypeHandler.Type:{resultType.FullName}.");
+            }
+
             while (dataReader.Read())
             {
                 var val = typeHandler.GetValue(dataReader, VALUE_ORDINAL, executionContext.Result.ResultType);
@@ -39,7 +50,7 @@ public IList<TResult> ToList<TResult>(ExecutionContext executionContext)
         public async Task<TResult> ToSingleAsync<TResult>(ExecutionContext executionContext)
         {
             var dataReader = executionContext.DataReaderWrapper;
-            if (!dataReader.HasRows) return default(TResult);
+            if (!dataReader.HasRows) return default;
             await dataReader.ReadAsync();
             return TypeHandlerCache<TResult, AnyFieldType>.Handler.GetValue(dataReader, VALUE_ORDINAL, executionContext.Result.ResultType);
         }

Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,13 @@ public SmartSqlFixture()`
`62`	`62`
`63`	`63`	`protected void InitTestData()`
`64`	`64`	`{`
	`65`	`+ AllPrimitiveRepository.Truncate();`
`65`	`66`	`for (int i = 0; i < 10; i++)`
`66`	`67`	`{`
`67`		`- AllPrimitiveRepository.Insert(new AllPrimitive());`
	`68`	`+ AllPrimitiveRepository.Insert(new AllPrimitive()`
	`69`	`+ {`
	`70`	`+ NumericalEnum = i % 2 == 0 ? NumericalEnum.One : NumericalEnum.Two`
	`71`	`+ });`
`68`	`72`	`}`
`69`	`73`	`}`
`70`	`74`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Text;`
`4`	`2`
`5`	`3`	`namespace SmartSql.Test.Entities`
`6`	`4`	`{`
`@@ -9,4 +7,10 @@ public enum NumericalEnum : Byte`
`9`	`7`	`One = 1,`
`10`	`8`	`Two = 2`
`11`	`9`	`}`
	`10`	`+`
	`11`	`+ public enum NumericalEnum11 : Byte`
	`12`	`+ {`
	`13`	`+ One = 1,`
	`14`	`+ Two = 2`
	`15`	`+ }`
`12`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,12 @@ public interface IAllPrimitiveRepository`
`26`	`26`	`long InsertByAnnotationAOPTransaction(AllPrimitive entity);`
`27`	`27`
`28`	`28`	`[Statement(Id = "QueryDictionary", Sql = "SELECT T.* From T_AllPrimitive T limit ?Taken")]`
`29`		`- IList<IDictionary<String, Object>> QueryDictionary([Param("Taken")] int taken);`
	`29`	`+ IList<IDictionary<string, object>> QueryDictionary([Param("Taken")] int taken);`
	`30`	`+`
	`31`	`+ [Statement(Sql = "SELECT NumericalEnum FROM T_AllPrimitive WHERE Id = ?id")]`
	`32`	`+ List<NumericalEnum11> GetNumericalEnums(int id);`
	`33`	`+`
	`34`	`+ [Statement(Sql = "truncate table T_AllPrimitive")]`
	`35`	`+ void Truncate();`
`30`	`36`	`}`
`31`	`37`	`}`