conflict fix between trunk and local tree

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

diff --git a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
index a220d2ff070ff22ee26d3658b53d3b1926db69a5..2e6d91395ac3efb8d59d5d1571b9ecb02e9a95c1 100644 (file)
--- a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
+++ b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
@@ -1,8 +1,28 @@
+2009-07-29  Veerapuram Varadhan  <vvaradhan@novell.com>
+
+       * SqlDataAdapter.cs (IDbDataAdapter.*Command): Revert some of my earlier
+       changes.  Validate the incoming value as we use bases' implementation now.
+       Fixes failing tests.
+
+       * SqlParameter.cs (GetSqlValue): Simplify handling of SqlValue and SqlTypes.
+       (SqlTypeToFramworkType): Added support for SqlChars and SqlBytes types.
+
 2009-07-28  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * SqlCommand.cs: Ensure connection is closed if CloseConnection
        behavior is set, and reader could not be created.
 
+2009-07-28  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * More clean up of fix for #522624/#507663
+       * SqlCommandBuilder.cs: Appropriately handle rowUpdatingHandler and
+       more cleanup for 2.0 profile.
+
+2009-07-26  Veerapuram Varadhan  <vvaradhan@novell.com>
+    
+       * SqlParameter.cs (get/set_SqlValue, GetSqlValue): Return the appropriately
+       SQL-typed param value.  Fixes failing provider tests.
+       
 2009-07-26  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * SqlParameter.cs: Improved support for SqlValue and SqlTypes.

diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog
index e1150421ae2dadb98a18ad80566bc898120a5248..f4b3b9aadce0226986758c1a0afa396ddbdd400b 100644 (file)
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog
@@ -1,8 +1,15 @@
+<<<<<<< HEAD:class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog
 2009-07-28  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * SqlCommandTest.cs: Improved test for invalid statement to cover
        CloseConnection behavior.
 
+=======
+2009-07-25  Veerapuram Varadhan  <vvaradhan@novell.com>
+
+       * SqlDataAdapterTest.cs: Test fix. 
+       
+>>>>>>> Test fix.:class/System.Data/Test/ProviderTests/System.Data.SqlClient/ChangeLog
 2009-05-16  Veerapuram Varadhan  <vvaradhan@novell.com>
 
        * SqlParameterTest.cs: Added test for bug #382589.

diff --git a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataAdapterTest.cs b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataAdapterTest.cs
index 4b06e4be8094f489911b82aaa46a128fb03989dc..511839e03514f1dc89b28c9e4cd72951510de639 100644 (file)
--- a/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataAdapterTest.cs
+++ b/mcs/class/System.Data/Test/ProviderTests/System.Data.SqlClient/SqlDataAdapterTest.cs
@@ -922,7 +922,7 @@ namespace MonoTests.System.Data.SqlClient
                                command.Connection = conn;
                                SelectCommand = command;
                                Fill (dt, command.ExecuteReader ());
-                               Assert.AreEqual (6, dt.Rows.Count, "#1");
+                               Assert.AreEqual (4, dt.Rows.Count, "#1");
                                Assert.AreEqual (6, dt.Columns.Count, "#1");
                        } finally {
                                DBHelper.ExecuteSimpleSP (conn, "sp_clean_employee_table");

diff --git a/mcs/class/System.Data/Test/System.Data.SqlClient/ChangeLog b/mcs/class/System.Data/Test/System.Data.SqlClient/ChangeLog
index e11d770860d81069fffbc40cbf5907a35efbb468..f8d0b541980fa64b8a8c6b066ad22295c7107937 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,9 @@
+2009-07-29  Veerapuram Varadhan  <vvaradhan@novell.com>
+
+       * SqlParameterTest.cs: Marked SqlChars/SqlBytes tests for SqlValue
+       as NotWorking as these types are considered as SqlString/SqlBinary
+       respectively.
+       
 2009-07-26  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * SqlParameterTest.cs: Added/improved tests for SqlValue, and