Skip to content

Preserve Size set by type handlers for string parameters #2221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FirmaSpring wants to merge 1 commit into
base: main
Choose a base branch
from
+53 −12
Open

Preserve Size set by type handlers for string parameters #2221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions Dapper/SqlMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2852,21 +2852,21 @@ private static bool IsValueTuple(Type? type) => (type?.IsValueType == true
else
{
il.EmitCall(OpCodes.Callvirt, typeof(IDataParameter).GetProperty(nameof(IDataParameter.Value))!.GetSetMethod()!, null);// stack is now [parameters] [[parameters]] [parameter]
}

if (prop.PropertyType == typeof(string))
{
var endOfSize = il.DefineLabel();
var sizeLocal = GetSizeLocal();
// don't set if 0
il.Emit(OpCodes.Ldloc, sizeLocal); // [parameters] [[parameters]] [parameter] [size]
il.Emit(OpCodes.Brfalse_S, endOfSize); // [parameters] [[parameters]] [parameter]
if (prop.PropertyType == typeof(string))
{
var endOfSize = il.DefineLabel();
var sizeLocal = GetSizeLocal();
// don't set if 0
il.Emit(OpCodes.Ldloc, sizeLocal); // [parameters] [[parameters]] [parameter] [size]
il.Emit(OpCodes.Brfalse_S, endOfSize); // [parameters] [[parameters]] [parameter]

il.Emit(OpCodes.Dup);// stack is now [parameters] [[parameters]] [parameter] [parameter]
il.Emit(OpCodes.Ldloc, sizeLocal); // stack is now [parameters] [[parameters]] [parameter] [parameter] [size]
il.EmitCall(OpCodes.Callvirt, typeof(IDbDataParameter).GetProperty(nameof(IDbDataParameter.Size))!.GetSetMethod()!, null); // stack is now [parameters] [[parameters]] [parameter]
il.Emit(OpCodes.Dup);// stack is now [parameters] [[parameters]] [parameter] [parameter]
il.Emit(OpCodes.Ldloc, sizeLocal); // stack is now [parameters] [[parameters]] [parameter] [parameter] [size]
il.EmitCall(OpCodes.Callvirt, typeof(IDbDataParameter).GetProperty(nameof(IDbDataParameter.Size))!.GetSetMethod()!, null); // stack is now [parameters] [[parameters]] [parameter]

il.MarkLabel(endOfSize);
il.MarkLabel(endOfSize);
}
}
if (checkForDuplicates)
{
Expand Down
41 changes: 41 additions & 0 deletions tests/Dapper.Tests/Providers/SqliteTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Microsoft.Data.Sqlite;
using System;
using System.Data;
using System.Data.Common;
using System.Linq;
using System.Threading;
Expand Down Expand Up @@ -65,6 +66,46 @@ public void Issue466_SqliteHatesOptimizations()
Assert.Equal(42, row.Id);
}

[FactSqlite]
public void TypeHandlerSetValue_StringParameterSizeIsNotOverwritten_Issue2141()
{
using var connection = GetSQLiteConnection();

SqlMapper.ResetTypeHandlers();
SqlMapper.RemoveTypeMap(typeof(string));
var handler = new SizedStringTypeHandler();
SqlMapper.AddTypeHandler(handler);
try
{
// anonymous object parameters take the IL generator path, where the
// generated code used to overwrite the Size set by the handler
connection.Execute("select @p", new { p = "abc" });

Assert.NotNull(handler.LastParameter);
Assert.Equal(SizedStringTypeHandler.ExpectedSize, handler.LastParameter.Size);
}
finally
{
SqlMapper.ResetTypeHandlers();
SqlMapper.AddTypeMap(typeof(string), DbType.String);
}
}

private sealed class SizedStringTypeHandler : SqlMapper.TypeHandler<string>
{
public const int ExpectedSize = 12345;
public IDbDataParameter? LastParameter { get; private set; }

public override void SetValue(IDbDataParameter parameter, string? value)
{
parameter.Value = value;
parameter.Size = ExpectedSize;
LastParameter = parameter;
}

public override string Parse(object value) => (string)value;
}

[FactSqlite]
public async Task Issue466_SqliteHatesOptimizations_Async()
{
Expand Down