Skip to content

Commit cb457e2

Browse files
NH-3431 - Remove IDbDataParameter too.
1 parent ce26f71 commit cb457e2

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

src/NHibernate/AdoNet/Util/SqlStatementLogger.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,7 @@ public string GetCommandLineWithParameters(DbCommand command)
104104

105105
private static string GetParameterLoggableType(DbParameter dataParameter)
106106
{
107-
//TODO: Fix me after 4.6.2 update. Size and Precision has been added to DbParameter
108-
var p = dataParameter as IDbDataParameter;
109-
if (p != null)
110-
return p.DbType + " (" + p.Size + ":" + p.Scale + ":" + p.Precision + ")";
111-
return dataParameter.DbType.ToString();
107+
return dataParameter.DbType + " (" + dataParameter.Size + ":" + dataParameter.Scale + ":" + dataParameter.Precision + ")";
112108
}
113109

114110
public string GetParameterLoggableValue(DbParameter parameter)

src/NHibernate/Driver/OdbcDriver.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Data;
43
using System.Data.Common;
54
using System.Data.Odbc;
65
using NHibernate.SqlTypes;
@@ -62,7 +61,7 @@ public override string NamedPrefix
6261
private void SetVariableLengthParameterSize(DbParameter dbParam, SqlType sqlType)
6362
{
6463
if (Equals(sqlType, SqlTypeFactory.DateTime) && _dbDateTimeScale != null)
65-
((IDbDataParameter)dbParam).Scale = _dbDateTimeScale.Value;
64+
dbParam.Scale = _dbDateTimeScale.Value;
6665

6766
// Override the defaults using data from SqlType.
6867
if (sqlType.LengthDefined)
@@ -72,8 +71,8 @@ private void SetVariableLengthParameterSize(DbParameter dbParam, SqlType sqlType
7271

7372
if (sqlType.PrecisionDefined)
7473
{
75-
((IDbDataParameter)dbParam).Precision = sqlType.Precision;
76-
((IDbDataParameter)dbParam).Scale = sqlType.Scale;
74+
dbParam.Precision = sqlType.Precision;
75+
dbParam.Scale = sqlType.Scale;
7776
}
7877
}
7978

src/NHibernate/Driver/SqlClientDriver.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ public static void SetVariableLengthParameterSize(DbParameter dbParam, SqlType s
114114

115115
if (sqlType.PrecisionDefined)
116116
{
117-
((IDbDataParameter) dbParam).Precision = sqlType.Precision;
118-
((IDbDataParameter) dbParam).Scale = sqlType.Scale;
117+
dbParam.Precision = sqlType.Precision;
118+
dbParam.Scale = sqlType.Scale;
119119
}
120120
}
121121

@@ -131,8 +131,8 @@ protected static void SetDefaultParameterSize(DbParameter dbParam, SqlType sqlTy
131131
dbParam.Size = IsBlob(dbParam, sqlType) ? MaxSizeForBlob : MaxSizeForLengthLimitedBinary;
132132
break;
133133
case DbType.Decimal:
134-
((IDbDataParameter) dbParam).Precision = MaxPrecision;
135-
((IDbDataParameter) dbParam).Scale = MaxScale;
134+
dbParam.Precision = MaxPrecision;
135+
dbParam.Scale = MaxScale;
136136
break;
137137
case DbType.String:
138138
case DbType.StringFixedLength:

0 commit comments

Comments
 (0)