diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2004-05-17 19:12:17 +0400 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2004-05-17 19:12:17 +0400 |
| commit | 4e8cebe2fab33217c4c95f13316392c669efefa6 (patch) | |
| tree | b443f5fb4fde41837b85a11a0bc29ea21f258747 /mcs/class/System.Data/System.Data.SqlTypes | |
| parent | aced1da70883434590696dfb87c1c026bf38e7e3 (diff) | |
2004-05-17 Atsushi Enomoto <atsushi@ximian.com>
* SqlBinary.cs,
SqlDateTime.cs,
SqlDouble.cs,
SqlGuid.cs,
SqlMoney.cs,
SqlSingle.cs,
SqlString.cs : If values are null, ToString() should return "Null".
svn path=/trunk/mcs/; revision=27519
Diffstat (limited to 'mcs/class/System.Data/System.Data.SqlTypes')
8 files changed, 23 insertions, 7 deletions
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog b/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog index 797bd653962..5c9d28a436e 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog +++ b/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog @@ -1,3 +1,13 @@ +2004-05-17 Atsushi Enomoto <atsushi@ximian.com> + + * SqlBinary.cs, + SqlDateTime.cs, + SqlDouble.cs, + SqlGuid.cs, + SqlMoney.cs, + SqlSingle.cs, + SqlString.cs : If values are null, ToString() should return "Null". + 2004-05-11 Atsushi Enomoto <atsushi@ximian.com> * SqlMoney.cs : Handle fixed digits correctly. diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlBinary.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlBinary.cs index a8629d4be88..b4633b3b250 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlBinary.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlBinary.cs @@ -162,6 +162,8 @@ namespace System.Data.SqlTypes public override string ToString () { + if (!notNull) + return "Null"; return "SqlBinary(" + value.Length + ")"; } diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlDateTime.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlDateTime.cs index 76b92690a73..5cfcfd70806 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlDateTime.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlDateTime.cs @@ -224,7 +224,7 @@ namespace System.Data.SqlTypes public override string ToString () { if (this.IsNull) - return String.Empty; + return "Null"; else return value.ToString (CultureInfo.InvariantCulture); } diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlDouble.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlDouble.cs index 79b5540c03d..acb7a9b76bb 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlDouble.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlDouble.cs @@ -188,8 +188,8 @@ namespace System.Data.SqlTypes public override string ToString () { - if (this.IsNull) - return String.Empty; + if (!notNull) + return "Null"; else return value.ToString (); } diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlGuid.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlGuid.cs index 93c124c2589..9ffdb62b147 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlGuid.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlGuid.cs @@ -160,8 +160,8 @@ namespace System.Data.SqlTypes public override string ToString () { - if (this.IsNull) - return String.Empty; + if (!notNull) + return "Null"; else return value.ToString (); } diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlMoney.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlMoney.cs index 707b7dbfc3a..5888c6e054a 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlMoney.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlMoney.cs @@ -243,8 +243,8 @@ namespace System.Data.SqlTypes public override string ToString () { - if (this.IsNull) - return String.Empty; + if (!notNull) + return "Null"; else return value.ToString (); } diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlSingle.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlSingle.cs index 94445e8f07c..91ba8477558 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlSingle.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlSingle.cs @@ -196,6 +196,8 @@ namespace System.Data.SqlTypes public override string ToString () { + if (!notNull) + return "Null"; return value.ToString (); } diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlString.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlString.cs index 3b58f149b0e..2dd6fe47b05 100644 --- a/mcs/class/System.Data/System.Data.SqlTypes/SqlString.cs +++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlString.cs @@ -414,6 +414,8 @@ namespace System.Data.SqlTypes public override string ToString() { + if (!notNull) + return "Null"; return ((string)this); } |