In Test/System.Data.SqlClient:

2008-04-19  Robert Jordan  <robertj@gmx.net>

	* SqlCommandTest.cs: Add test case for bug #381100.

In System.Data.SqlClient:
2008-04-19  Robert Jordan  <robertj@gmx.net>

	* SqlParameterCollection.cs (AddRange(SqlParameter[])):
	Fix endless recursion.

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

diff --git a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
index f81788bc0b3741293b50d07c3a3f80db522c3cf2..c8ae8ad1cbd9428db547f2900276bf042b880690 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
+++ b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-19  Robert Jordan  <robertj@gmx.net>
+
+       * SqlParameterCollection.cs (AddRange(SqlParameter[])):
+       Fix endless recursion.
+
 2008-04-08  Marek Habersack  <mhabersack@novell.com>
 
        * SqlConnection.cs: TCP port discovery via UDP port 1434 should

diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlParameterCollection.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlParameterCollection.cs
index 38e215b93be0a8c4dbd0a5205bda158045ea6189..50b3ce4f395ad2361b48f68f3d1533e3061c15a2 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlParameterCollection.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlParameterCollection.cs
@@ -442,7 +442,7 @@ namespace System.Data.SqlClient {
 
                public void AddRange (SqlParameter[] values) {
                
-                       this.AddRange(values);  
+                       this.AddRange((Array) values);  
                }
                
                public void CopyTo (SqlParameter[] array, int index)

diff --git a/mcs/class/System.Data/Test/System.Data.SqlClient/ChangeLog b/mcs/class/System.Data/Test/System.Data.SqlClient/ChangeLog
index 67522b6507e9591a4277783fb90cd9ac37f02c50..28abff22b3e665f78e1a44a53e00c8b54e4e24cd 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data.SqlClient/ChangeLog
+++ b/mcs/class/System.Data/Test/System.Data.SqlClient/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-19  Robert Jordan  <robertj@gmx.net>
+
+       * SqlCommandTest.cs: Add test case for bug #381100.
+
 2008-03-03  Ankit Jain  <jankit@novell.com>
 
        * SqlClientMetaDataCollectionNamesTest.cs: New.

diff --git a/mcs/class/System.Data/Test/System.Data.SqlClient/SqlCommandTest.cs b/mcs/class/System.Data/Test/System.Data.SqlClient/SqlCommandTest.cs
index 08d0037a23e1b33e822bad8f2edab3bacd3cde00..5f00788c5f8c8b56424f66bfe09532f1e6866c06 100644 (file)
--- a/mcs/class/System.Data/Test/System.Data.SqlClient/SqlCommandTest.cs
+++ b/mcs/class/System.Data/Test/System.Data.SqlClient/SqlCommandTest.cs
@@ -238,5 +238,14 @@ namespace MonoTests.System.Data.SqlClient
                        cmd.CommandText = string.Empty;
                        Assert.AreEqual (string.Empty, cmd.CommandText, "#4");
                }
+
+#if NET_2_0            
+               [Test] // bug #381100
+               public void ParameterCollectionTest ()
+               {
+                       SqlCommand cmd = new SqlCommand();
+                       cmd.Parameters.AddRange(new SqlParameter[] { });
+               }
+#endif         
        }
 }