Skip to content

Commit cbd4172

Browse files
committed
Merge pull request #41 from akromm/release-0.8.12-sql-fix
Release 0.8.12 sql fix
2 parents cff8786 + d455de1 commit cbd4172

File tree

2 files changed

+23
-16
lines changed

2 files changed

+23
-16
lines changed

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/TSql/MockSqlCommand.cs

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -467,22 +467,29 @@ private string GetCommandKey()
467467
{
468468
string value;
469469

470-
switch (parameter.DbType)
470+
if (parameter.Value == DBNull.Value)
471471
{
472-
case DbType.AnsiString:
473-
case DbType.AnsiStringFixedLength:
474-
value = (string)parameter.Value;
475-
break;
476-
case DbType.String:
477-
case DbType.StringFixedLength:
478-
value = (string)parameter.Value;
479-
break;
480-
case DbType.Boolean:
481-
value = (bool)parameter.Value ? "1" : "0";
482-
break;
483-
default:
484-
value = parameter.Value.ToString();
485-
break;
472+
value = string.Empty;
473+
}
474+
else
475+
{
476+
switch (parameter.DbType)
477+
{
478+
case DbType.AnsiString:
479+
case DbType.AnsiStringFixedLength:
480+
value = (string)parameter.Value;
481+
break;
482+
case DbType.String:
483+
case DbType.StringFixedLength:
484+
value = (string)parameter.Value;
485+
break;
486+
case DbType.Boolean:
487+
value = (bool)parameter.Value ? "1" : "0";
488+
break;
489+
default:
490+
value = parameter.Value.ToString();
491+
break;
492+
}
486493
}
487494

488495
key = key.Replace(parameter.ParameterName, value);

src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Server/TSqlConnectionContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public Database[] GetDatabases()
210210
command.CommandText = getDatabaseQuery;
211211
DbParameter param = command.CreateParameter();
212212
param.ParameterName = "@name";
213-
param.Value = null;
213+
param.Value = DBNull.Value;
214214

215215
command.Parameters.Add(param);
216216

0 commit comments

Comments
 (0)