Skip to content

Commit 1100217

Browse files
committed
Make MySqlParameter conform to MSDN documentation.
https://docs.microsoft.com/en-us/dotnet/api/system.data.common.dbparameter.parametername: The default is an empty string (""). https://docs.microsoft.com/en-us/dotnet/api/system.data.common.dbparameter.sourcecolumn: The default is an empty string.
1 parent 7b1b4e5 commit 1100217

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

src/MySqlConnector/MySql.Data.MySqlClient/MySqlParameter.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ public sealed class MySqlParameter : DbParameter
1111
{
1212
public MySqlParameter()
1313
{
14+
ParameterName = "";
15+
SourceColumn = "";
1416
#if !NETSTANDARD1_3
1517
SourceVersion = DataRowVersion.Current;
1618
#endif
@@ -30,7 +32,7 @@ public MySqlParameter(string name, MySqlDbType mySqlDbType)
3032
}
3133

3234
public MySqlParameter(string name, MySqlDbType mySqlDbType, int size)
33-
: this(name, mySqlDbType, size, null)
35+
: this(name, mySqlDbType, size, "")
3436
{
3537
}
3638

tests/SideBySide/ParameterTests.cs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,16 @@ public void DbTypesToMySqlDbTypes(DbType[] dbTypes, MySqlDbType[] mySqlDbTypes)
6363
public void ConstructorSimple()
6464
{
6565
var parameter = new MySqlParameter();
66-
Assert.Null(parameter.ParameterName);
6766
#if BASELINE
67+
Assert.Null(parameter.ParameterName);
6868
Assert.Equal(MySqlDbType.Decimal, parameter.MySqlDbType);
6969
Assert.Equal(DbType.AnsiString, parameter.DbType);
70+
Assert.Null(parameter.SourceColumn);
7071
#else
72+
Assert.Equal("", parameter.ParameterName);
7173
Assert.Equal(MySqlDbType.VarChar, parameter.MySqlDbType);
7274
Assert.Equal(DbType.String, parameter.DbType);
75+
Assert.Equal("", parameter.SourceColumn);
7376
#endif
7477
Assert.False(parameter.IsNullable);
7578
Assert.Null(parameter.Value);
@@ -80,7 +83,6 @@ public void ConstructorSimple()
8083
#if !NETCOREAPP1_1_2
8184
Assert.Equal(DataRowVersion.Current, parameter.SourceVersion);
8285
#endif
83-
Assert.Null(parameter.SourceColumn);
8486
}
8587

8688
[Fact]
@@ -99,7 +101,11 @@ public void ConstructorNameValue()
99101
#if !NETCOREAPP1_1_2
100102
Assert.Equal(DataRowVersion.Current, parameter.SourceVersion);
101103
#endif
104+
#if BASELINE
102105
Assert.Null(parameter.SourceColumn);
106+
#else
107+
Assert.Equal("", parameter.SourceColumn);
108+
#endif
103109
}
104110

105111
[Fact]
@@ -118,7 +124,11 @@ public void ConstructorNameType()
118124
#if !NETCOREAPP1_1_2
119125
Assert.Equal(DataRowVersion.Current, parameter.SourceVersion);
120126
#endif
127+
#if BASELINE
121128
Assert.Null(parameter.SourceColumn);
129+
#else
130+
Assert.Equal("", parameter.SourceColumn);
131+
#endif
122132
}
123133

124134
[Fact]
@@ -137,7 +147,11 @@ public void ConstructorNameTypeSize()
137147
#if !NETCOREAPP1_1_2
138148
Assert.Equal(DataRowVersion.Current, parameter.SourceVersion);
139149
#endif
150+
#if BASELINE
140151
Assert.Null(parameter.SourceColumn);
152+
#else
153+
Assert.Equal("", parameter.SourceColumn);
154+
#endif
141155
}
142156

143157
[Fact]

0 commit comments

Comments
 (0)