GithubStar/Dapper
1
0
Fork 0
mirror of https://github.com/DapperLib/Dapper.git synced 2026-10-16 21:03:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert #2050 - see #2049 for more details (#2070)

Browse Source 
* revert #2050 - see #2049 for more details
This commit is contained in:
Marc Gravell
2024-04-12 11:13:05 +01:00
committed by GitHub
parent ad16263ac4
commit fa9c96aec0
2 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dapper/SqlMapper.cs
+9 -6
View File
@@ -193,9 +193,7 @@ namespace Dapper
public static readonly TypeMapEntry
DoNotSet = new((DbType)(-2), TypeMapEntryFlags.None),
DoNotSetFieldValue = new((DbType)(-2), TypeMapEntryFlags.UseGetFieldValue),
DecimalFieldValue = new(DbType.Decimal, TypeMapEntryFlags.SetType | TypeMapEntryFlags.UseGetFieldValue),
StringFieldValue = new(DbType.String, TypeMapEntryFlags.SetType | TypeMapEntryFlags.UseGetFieldValue),
BinaryFieldValue = new(DbType.Binary, TypeMapEntryFlags.SetType | TypeMapEntryFlags.UseGetFieldValue);
DecimalFieldValue = new(DbType.Decimal, TypeMapEntryFlags.SetType | TypeMapEntryFlags.UseGetFieldValue);
public static implicit operator TypeMapEntry(DbType dbType)
=> new(dbType, TypeMapEntryFlags.SetType);
@@ -221,13 +219,13 @@ namespace Dapper
[typeof(double)] = DbType.Double,
[typeof(decimal)] = DbType.Decimal,
[typeof(bool)] = DbType.Boolean,
[typeof(string)] = TypeMapEntry.StringFieldValue,
[typeof(string)] = DbType.String,
[typeof(char)] = DbType.StringFixedLength,
[typeof(Guid)] = DbType.Guid,
[typeof(DateTime)] = TypeMapEntry.DoNotSet,
[typeof(DateTimeOffset)] = DbType.DateTimeOffset,
[typeof(TimeSpan)] = TypeMapEntry.DoNotSet,
[typeof(byte[])] = TypeMapEntry.BinaryFieldValue,
[typeof(byte[])] = DbType.Binary,
[typeof(byte?)] = DbType.Byte,
[typeof(sbyte?)] = DbType.SByte,
[typeof(short?)] = DbType.Int16,
@@ -3928,7 +3926,12 @@ namespace Dapper
}
else
{
formattedValue = Convert.ToString(value) + " - " + Type.GetTypeCode(value.GetType());
formattedValue = Convert.ToString(value) + " - " + Identify(value.GetType());
}
static string Identify(Type type)
{
var tc = Type.GetTypeCode(type);
return tc == TypeCode.Object ? type.Name : tc.ToString();
}
}
catch (Exception valEx)
tests/Dapper.Tests/TypeHandlerTests.cs
+23 -12
View File
@@ -28,12 +28,18 @@ namespace Dapper.Tests
SqlMapper.PurgeQueryCache();
SqlMapper.AddTypeMap(typeof(string), DbType.AnsiString, true); // Change Default String Handling to AnsiString
var result02 = connection.Query<string>(sql, param).FirstOrDefault();
Assert.Equal("varchar", result02);
SqlMapper.AddTypeMap(typeof(string), DbType.AnsiString, false); // Change Default String Handling to AnsiString
try
{
var result02 = connection.Query<string>(sql, param).FirstOrDefault();
Assert.Equal("varchar", result02);
SqlMapper.PurgeQueryCache();
SqlMapper.AddTypeMap(typeof(string), DbType.String, true); // Restore Default to Unicode String
SqlMapper.PurgeQueryCache();
}
finally
{
SqlMapper.AddTypeMap(typeof(string), DbType.String, false); // Restore Default to Unicode String
}
}
[Fact]
@@ -46,13 +52,18 @@ namespace Dapper.Tests
Assert.Equal("nvarchar", result01);
SqlMapper.PurgeQueryCache();
SqlMapper.AddTypeMap(typeof(string), DbType.AnsiString, false); // Change Default String Handling to AnsiString
try
{
var result02 = connection.QueryFirstOrDefault<string>(sql, param);
Assert.Equal("varchar", result02);
SqlMapper.AddTypeMap(typeof(string), DbType.AnsiString, true); // Change Default String Handling to AnsiString
var result02 = connection.QueryFirstOrDefault<string>(sql, param);
Assert.Equal("varchar", result02);
SqlMapper.PurgeQueryCache();
SqlMapper.AddTypeMap(typeof(string), DbType.String, true); // Restore Default to Unicode String
SqlMapper.PurgeQueryCache();
}
finally
{
SqlMapper.AddTypeMap(typeof(string), DbType.String, false); // Restore Default to Unicode String
}
}
[Fact]
@@ -643,7 +654,7 @@ namespace Dapper.Tests
{
Guid guid = Guid.Parse("cf0ef7ac-b6fe-4e24-aeda-a2b45bb5654e");
var ex = Assert.ThrowsAny<Exception>(() => connection.Query<Issue149_Person>("select @guid as Id", new { guid }).First());
Assert.Equal("Error parsing column 0 (Id=n/a - Unable to cast object of type 'System.Guid' to type 'System.String'.)", ex.Message);
Assert.Equal("Error parsing column 0 (Id=cf0ef7ac-b6fe-4e24-aeda-a2b45bb5654e - Guid)", ex.Message);
}
public class Issue149_Person { public string? Id { get; set; } }