2005-10-21 Senganal T <tsenganal@novell.com>

	* Test/System.Data/DataTableTest2.cs : addded test for #76213

	* Mono.Data.SqlExpressions/Numeric.cs :
		- Modified the Max and Min functions to convert strings(numeric) to
		double. Fixes bug #76213. 


svn path=/trunk/mcs/; revision=52023

2 files changed, 15 insertions, 1 deletions

diff --git a/mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog b/mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog
index a8833ac4d50..4d1a295ebe4 100644
--- a/mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog
+++ b/mcs/class/System.Data/Mono.Data.SqlExpressions/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-21 Senganal T <tsenganal@novell.com>
+
+	* Numeric.cs :
+		- Modified the Max and Min functions to convert strings(numeric) to
+		double. Fixes bug #76213. 
+ 	
 2005-09-19 Boris Kirzner <borisk@mainsoft.com>
 	* ColumnReference.cs, Expressions.cs, Like.cs, Aggregation.cs, Literal.cs,
 	StringFunctions.cs, In.cs, Functions.cs : implemented Equals() 
diff --git a/mcs/class/System.Data/Mono.Data.SqlExpressions/Numeric.cs b/mcs/class/System.Data/Mono.Data.SqlExpressions/Numeric.cs
index b0b0808002d..15b056b3839 100644
--- a/mcs/class/System.Data/Mono.Data.SqlExpressions/Numeric.cs
+++ b/mcs/class/System.Data/Mono.Data.SqlExpressions/Numeric.cs
@@ -193,6 +193,10 @@ namespace Mono.Data.SqlExpressions {
 				return System.Math.Min ((double)o1, (double)o2);
 			case TypeCode.Decimal:
 				return System.Math.Min ((decimal)o1, (decimal)o2);
+			case TypeCode.String:
+				double val1 = Convert.ToDouble (o1);
+				double val2 = Convert.ToDouble (o2);
+				return (System.Math.Min(val1, val2)).ToString();
 			default:
 				return DBNull.Value;
 			}
@@ -209,9 +213,13 @@ namespace Mono.Data.SqlExpressions {
 				return System.Math.Max ((double)o1, (double)o2);
 			case TypeCode.Decimal:
 				return System.Math.Max ((decimal)o1, (decimal)o2);
+			case TypeCode.String:
+				double val1 = Convert.ToDouble (o1);
+				double val2 = Convert.ToDouble (o2);
+				return (System.Math.Max(val1, val2)).ToString();
 			default:
 				return DBNull.Value;
 			}
 		}
 	}
-}
\ No newline at end of file
+}