Skip to content
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

Fix to #17923 - FormatParameterValue results in @__prm='' for parameters whose value is NULL #18217

Merged
merged 1 commit into from
Oct 16, 2019
Merged

Fix to #17923 - FormatParameterValue results in @__prm='' for parameters whose value is NULL #18217

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
4 changes: 2 additions & 2 deletions src/EFCore.Relational/Storage/Internal/DbParameterCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ public static string FormatParameter(

private static void FormatParameterValue(StringBuilder builder, object parameterValue)
{
if (parameterValue == null)
if (parameterValue == null || parameterValue == DBNull.Value)
{
builder.Append("''");
builder.Append("NULL");
}
else if (parameterValue.GetType() == typeof(DateTime))
{
Expand Down
8 changes: 4 additions & 4 deletions test/EFCore.Relational.Tests/Utilities/DbParameterCollectionExtensionsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public void Formats_non_unicode_non_nullable_sized_string_parameter()
public void Formats_null_string_parameter()
{
Assert.Equal(
"@param=''",
"@param=NULL",
DbParameterCollectionExtensions.FormatParameter(
"@param", null, true, ParameterDirection.Input, DbType.String, true, 0, 0, 0));
}
Expand All @@ -107,7 +107,7 @@ public void Formats_null_string_parameter()
public void Formats_null_non_unicode_string_parameter()
{
Assert.Equal(
"@param='' (DbType = AnsiString)",
"@param=NULL (DbType = AnsiString)",
DbParameterCollectionExtensions.FormatParameter(
"@param", null, true, ParameterDirection.Input, DbType.AnsiString, true, 0, 0, 0));
}
Expand Down Expand Up @@ -143,7 +143,7 @@ public void Formats_fixed_length_non_nullable_sized_string_parameter()
public void Formats_null_fixed_length_string_parameter()
{
Assert.Equal(
"@param='' (DbType = StringFixedLength)",
"@param=NULL (DbType = StringFixedLength)",
DbParameterCollectionExtensions.FormatParameter(
"@param", null, true, ParameterDirection.Input, DbType.StringFixedLength, true, 0, 0, 0));
}
Expand Down Expand Up @@ -206,7 +206,7 @@ public void Formats_int_parameter_with_no_type()
public void Formats_null_nullable_int_parameter()
{
Assert.Equal(
"@param='' (DbType = Int32)",
"@param=NULL (DbType = Int32)",
DbParameterCollectionExtensions.FormatParameter(
"@param", null, true, ParameterDirection.Input, DbType.Int32, true, 0, 0, 0));
}
Expand Down
280 changes: 140 additions & 140 deletions test/EFCore.SqlServer.FunctionalTests/BuiltInDataTypesSqlServerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,57 +1052,57 @@ public virtual void Can_insert_and_read_back_all_mapped_data_types_set_to_null()
var parameters = DumpParameters();
Assert.Equal(
@"@p0='78'
@p1=''
@p2='' (DbType = Byte)
@p3='' (Size = 8000) (DbType = Binary)
@p4='' (Size = 8000) (DbType = Binary)
@p5='' (Size = 8000) (DbType = Binary)
@p6='' (Size = 1) (DbType = AnsiString)
@p7='' (Size = 1) (DbType = AnsiString)
@p8='' (DbType = Int32)
@p9='' (Size = 1)
@p10='' (Size = 1)
@p11='' (Size = 1)
@p12='' (Size = 1)
@p13='' (Size = 1) (DbType = AnsiString)
@p14='' (Size = 1) (DbType = AnsiString)
@p15='' (DbType = Date)
@p16='' (DbType = DateTime)
@p17='' (DbType = DateTime2)
@p18='' (DbType = DateTime)
@p19='' (DbType = DateTimeOffset)
@p20=''
@p21=''
@p22=''
@p23=''
@p24=''
@p25=''
@p26=''
@p27='' (Size = 20)
@p28='' (Size = 8000) (DbType = AnsiString)
@p29=''
@p30='' (DbType = Guid)
@p31='' (DbType = Int64)
@p32='' (DbType = Int16)
@p33='' (DbType = Byte)
@p34='' (DbType = Int16)
@p35=''
@p36=''
@p37='' (Size = 8000) (DbType = AnsiString)
@p38='' (Size = 8000) (DbType = AnsiString)
@p39='' (Size = 4000)
@p40='' (Size = 4000)
@p41='' (Size = 4000)
@p42='' (Size = 4000)
@p43='' (Size = 8000) (DbType = AnsiString)
@p44='' (Size = 8000) (DbType = AnsiString)
@p45=''
@p46='' (DbType = Int32)
@p47='' (DbType = Int16)
@p48='' (DbType = Int64)
@p49='' (DbType = Int32)
@p50='' (DbType = Int64)
@p51=''",
@p1=NULL
@p2=NULL (DbType = Byte)
@p3=NULL (Size = 8000) (DbType = Binary)
@p4=NULL (Size = 8000) (DbType = Binary)
@p5=NULL (Size = 8000) (DbType = Binary)
@p6=NULL (Size = 1) (DbType = AnsiString)
@p7=NULL (Size = 1) (DbType = AnsiString)
@p8=NULL (DbType = Int32)
@p9=NULL (Size = 1)
@p10=NULL (Size = 1)
@p11=NULL (Size = 1)
@p12=NULL (Size = 1)
@p13=NULL (Size = 1) (DbType = AnsiString)
@p14=NULL (Size = 1) (DbType = AnsiString)
@p15=NULL (DbType = Date)
@p16=NULL (DbType = DateTime)
@p17=NULL (DbType = DateTime2)
@p18=NULL (DbType = DateTime)
@p19=NULL (DbType = DateTimeOffset)
@p20=NULL
@p21=NULL
@p22=NULL
@p23=NULL
@p24=NULL
@p25=NULL
@p26=NULL
@p27=NULL (Size = 20)
@p28=NULL (Size = 8000) (DbType = AnsiString)
@p29=NULL
@p30=NULL (DbType = Guid)
@p31=NULL (DbType = Int64)
@p32=NULL (DbType = Int16)
@p33=NULL (DbType = Byte)
@p34=NULL (DbType = Int16)
@p35=NULL
@p36=NULL
@p37=NULL (Size = 8000) (DbType = AnsiString)
@p38=NULL (Size = 8000) (DbType = AnsiString)
@p39=NULL (Size = 4000)
@p40=NULL (Size = 4000)
@p41=NULL (Size = 4000)
@p42=NULL (Size = 4000)
@p43=NULL (Size = 8000) (DbType = AnsiString)
@p44=NULL (Size = 8000) (DbType = AnsiString)
@p45=NULL
@p46=NULL (DbType = Int32)
@p47=NULL (DbType = Int16)
@p48=NULL (DbType = Int64)
@p49=NULL (DbType = Int32)
@p50=NULL (DbType = Int64)
@p51=NULL",
parameters,
ignoreLineEndingDifferences: true);

Expand Down Expand Up @@ -1271,25 +1271,25 @@ public virtual void Can_insert_and_read_back_nulls_for_all_mapped_sized_data_typ
var parameters = DumpParameters();
Assert.Equal(
@"@p0='78'
@p1='' (Size = 3) (DbType = Binary)
@p2='' (Size = 3) (DbType = Binary)
@p3='' (Size = 3) (DbType = Binary)
@p4='' (Size = 3) (DbType = AnsiString)
@p5='' (Size = 3) (DbType = AnsiString)
@p6='' (Size = 3)
@p7='' (Size = 3)
@p8='' (Size = 3)
@p9='' (Size = 3) (DbType = AnsiString)
@p10='' (Size = 3) (DbType = AnsiString)
@p11='' (Size = 3) (DbType = AnsiString)
@p12='' (Size = 3) (DbType = AnsiString)
@p13='' (Size = 3) (DbType = AnsiString)
@p14='' (Size = 3)
@p15='' (Size = 3)
@p16='' (Size = 3)
@p17='' (Size = 3)
@p18='' (Size = 3)
@p19='' (Size = 3) (DbType = AnsiString)",
@p1=NULL (Size = 3) (DbType = Binary)
@p2=NULL (Size = 3) (DbType = Binary)
@p3=NULL (Size = 3) (DbType = Binary)
@p4=NULL (Size = 3) (DbType = AnsiString)
@p5=NULL (Size = 3) (DbType = AnsiString)
@p6=NULL (Size = 3)
@p7=NULL (Size = 3)
@p8=NULL (Size = 3)
@p9=NULL (Size = 3) (DbType = AnsiString)
@p10=NULL (Size = 3) (DbType = AnsiString)
@p11=NULL (Size = 3) (DbType = AnsiString)
@p12=NULL (Size = 3) (DbType = AnsiString)
@p13=NULL (Size = 3) (DbType = AnsiString)
@p14=NULL (Size = 3)
@p15=NULL (Size = 3)
@p16=NULL (Size = 3)
@p17=NULL (Size = 3)
@p18=NULL (Size = 3)
@p19=NULL (Size = 3) (DbType = AnsiString)",
parameters,
ignoreLineEndingDifferences: true);

Expand Down Expand Up @@ -1806,58 +1806,58 @@ public virtual void Can_insert_and_read_back_all_mapped_data_types_set_to_null_w

var parameters = DumpParameters();
Assert.Equal(
@"@p0=''
@p1='' (DbType = Byte)
@p2='' (Size = 8000) (DbType = Binary)
@p3='' (Size = 8000) (DbType = Binary)
@p4='' (Size = 8000) (DbType = Binary)
@p5='' (Size = 1) (DbType = AnsiString)
@p6='' (Size = 1) (DbType = AnsiString)
@p7='' (DbType = Int32)
@p8='' (Size = 1)
@p9='' (Size = 1)
@p10='' (Size = 1)
@p11='' (Size = 1)
@p12='' (Size = 1) (DbType = AnsiString)
@p13='' (Size = 1) (DbType = AnsiString)
@p14='' (DbType = Date)
@p15='' (DbType = DateTime)
@p16='' (DbType = DateTime2)
@p17='' (DbType = DateTime)
@p18='' (DbType = DateTimeOffset)
@p19=''
@p20=''
@p21=''
@p22=''
@p23=''
@p24=''
@p25=''
@p26='' (Size = 20)
@p27='' (Size = 8000) (DbType = AnsiString)
@p28=''
@p29='' (DbType = Guid)
@"@p0=NULL
@p1=NULL (DbType = Byte)
@p2=NULL (Size = 8000) (DbType = Binary)
@p3=NULL (Size = 8000) (DbType = Binary)
@p4=NULL (Size = 8000) (DbType = Binary)
@p5=NULL (Size = 1) (DbType = AnsiString)
@p6=NULL (Size = 1) (DbType = AnsiString)
@p7=NULL (DbType = Int32)
@p8=NULL (Size = 1)
@p9=NULL (Size = 1)
@p10=NULL (Size = 1)
@p11=NULL (Size = 1)
@p12=NULL (Size = 1) (DbType = AnsiString)
@p13=NULL (Size = 1) (DbType = AnsiString)
@p14=NULL (DbType = Date)
@p15=NULL (DbType = DateTime)
@p16=NULL (DbType = DateTime2)
@p17=NULL (DbType = DateTime)
@p18=NULL (DbType = DateTimeOffset)
@p19=NULL
@p20=NULL
@p21=NULL
@p22=NULL
@p23=NULL
@p24=NULL
@p25=NULL
@p26=NULL (Size = 20)
@p27=NULL (Size = 8000) (DbType = AnsiString)
@p28=NULL
@p29=NULL (DbType = Guid)
@p30='78' (Nullable = true)
@p31='' (DbType = Int64)
@p32='' (DbType = Int16)
@p33='' (DbType = Byte)
@p34='' (DbType = Int16)
@p35=''
@p36=''
@p37='' (Size = 8000) (DbType = AnsiString)
@p38='' (Size = 8000) (DbType = AnsiString)
@p39='' (Size = 4000)
@p40='' (Size = 4000)
@p41='' (Size = 4000)
@p42='' (Size = 4000)
@p43='' (Size = 8000) (DbType = AnsiString)
@p44='' (Size = 8000) (DbType = AnsiString)
@p45=''
@p46='' (DbType = Int32)
@p47='' (DbType = Int64)
@p48='' (DbType = Int32)
@p49='' (DbType = Int64)
@p50=''
@p51='' (DbType = Int16)",
@p31=NULL (DbType = Int64)
@p32=NULL (DbType = Int16)
@p33=NULL (DbType = Byte)
@p34=NULL (DbType = Int16)
@p35=NULL
@p36=NULL
@p37=NULL (Size = 8000) (DbType = AnsiString)
@p38=NULL (Size = 8000) (DbType = AnsiString)
@p39=NULL (Size = 4000)
@p40=NULL (Size = 4000)
@p41=NULL (Size = 4000)
@p42=NULL (Size = 4000)
@p43=NULL (Size = 8000) (DbType = AnsiString)
@p44=NULL (Size = 8000) (DbType = AnsiString)
@p45=NULL
@p46=NULL (DbType = Int32)
@p47=NULL (DbType = Int64)
@p48=NULL (DbType = Int32)
@p49=NULL (DbType = Int64)
@p50=NULL
@p51=NULL (DbType = Int16)",
parameters,
ignoreLineEndingDifferences: true);

Expand Down Expand Up @@ -2027,26 +2027,26 @@ public virtual void Can_insert_and_read_back_nulls_for_all_mapped_sized_data_typ

var parameters = DumpParameters();
Assert.Equal(
@"@p0='' (Size = 3) (DbType = Binary)
@p1='' (Size = 3) (DbType = Binary)
@p2='' (Size = 3) (DbType = Binary)
@p3='' (Size = 3) (DbType = AnsiString)
@p4='' (Size = 3) (DbType = AnsiString)
@p5='' (Size = 3)
@p6='' (Size = 3)
@p7='' (Size = 3)
@p8='' (Size = 3) (DbType = AnsiString)
@"@p0=NULL (Size = 3) (DbType = Binary)
@p1=NULL (Size = 3) (DbType = Binary)
@p2=NULL (Size = 3) (DbType = Binary)
@p3=NULL (Size = 3) (DbType = AnsiString)
@p4=NULL (Size = 3) (DbType = AnsiString)
@p5=NULL (Size = 3)
@p6=NULL (Size = 3)
@p7=NULL (Size = 3)
@p8=NULL (Size = 3) (DbType = AnsiString)
@p9='78'
@p10='' (Size = 3) (DbType = AnsiString)
@p11='' (Size = 3) (DbType = AnsiString)
@p12='' (Size = 3) (DbType = AnsiString)
@p13='' (Size = 3) (DbType = AnsiString)
@p14='' (Size = 3)
@p15='' (Size = 3)
@p16='' (Size = 3)
@p17='' (Size = 3)
@p18='' (Size = 3)
@p19='' (Size = 3) (DbType = AnsiString)",
@p10=NULL (Size = 3) (DbType = AnsiString)
@p11=NULL (Size = 3) (DbType = AnsiString)
@p12=NULL (Size = 3) (DbType = AnsiString)
@p13=NULL (Size = 3) (DbType = AnsiString)
@p14=NULL (Size = 3)
@p15=NULL (Size = 3)
@p16=NULL (Size = 3)
@p17=NULL (Size = 3)
@p18=NULL (Size = 3)
@p19=NULL (Size = 3) (DbType = AnsiString)",
parameters,
ignoreLineEndingDifferences: true);

Expand Down
Loading