2010-03-10 Veerapuram Varadhan <vvaradhan@novell.com>

	** Fixes #564833/580736
	* DbDataAdapter.cs (*Command): Fix for .NET compatibility which
	supports both type of adapters with/without discrete command
	instances.

svn path=/branches/mono-2-6/mcs/; revision=153410

4 files changed, 64 insertions, 37 deletions

diff --git a/mcs/class/System.Data/System.Data.Common/ChangeLog b/mcs/class/System.Data/System.Data.Common/ChangeLog
index 3aa2377d4c8..881a2145636 100644
--- a/mcs/class/System.Data/System.Data.Common/ChangeLog
+++ b/mcs/class/System.Data/System.Data.Common/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-10  Veerapuram Varadhan  <vvaradhan@novell.com>
+
+	** Fixes #564833/580736
+	* DbDataAdapter.cs (*Command): Fix for .NET compatibility which 
+	supports both type of adapters with/without discrete command 
+	instances.
+	
 2009-10-28  Veerapuram Varadhan  <vvaradhan@novell.com>
 
 	** Fixes #385028/#385029
diff --git a/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs b/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs
index f6699ea93b3..3fdc3ca1105 100644
--- a/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs
@@ -85,51 +85,83 @@ namespace System.Data.Common
 		}
 
 		IDbCommand IDbDataAdapter.SelectCommand {
-			get { return _selectCommand; }
-			set { _selectCommand = value; }
+		    get { return ((DbDataAdapter)this).SelectCommand; }
+		    set { ((DbDataAdapter)this).SelectCommand = (DbCommand)value; }
 		}
 
 		IDbCommand IDbDataAdapter.UpdateCommand{
-			get { return _updateCommand; }
-			set { _updateCommand = value; }
+		    get { return ((DbDataAdapter)this).UpdateCommand; }
+		    set { ((DbDataAdapter)this).UpdateCommand = (DbCommand)value; }
 		}
-
+		
 		IDbCommand IDbDataAdapter.DeleteCommand{
-			get { return _deleteCommand; }
-			set { _deleteCommand = value; }
+		    get { return ((DbDataAdapter)this).DeleteCommand; }
+		    set { ((DbDataAdapter)this).DeleteCommand = (DbCommand)value; }
 		}
 
 		IDbCommand IDbDataAdapter.InsertCommand{
-			get { return _insertCommand; }
-			set { _insertCommand = value; }
+		    get { return ((DbDataAdapter)this).InsertCommand; }
+		    set { ((DbDataAdapter)this).InsertCommand = (DbCommand)value; }
 		}
 		
 		[Browsable (false)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public DbCommand SelectCommand {
-			get { return (DbCommand) _selectCommand; }
-			set { _selectCommand = value; }
+		    get {
+					return (DbCommand) _selectCommand;
+					//return (DbCommand) ((IDbDataAdapter)this).SelectCommand; 
+			}
+		    set {
+					if (_selectCommand != value) {
+						_selectCommand = value;
+						((IDbDataAdapter)this).SelectCommand = value; 
+					}
+			}
 		}
 
 		[Browsable (false)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public DbCommand DeleteCommand {
-			get { return (DbCommand) _deleteCommand; }
-			set { _deleteCommand = value; }
+		    get {
+					return (DbCommand) _deleteCommand;
+					//return (DbCommand) ((IDbDataAdapter)this).DeleteCommand; 
+			}
+		    set {
+					if (_deleteCommand != value) {
+						_deleteCommand = value;
+						((IDbDataAdapter)this).DeleteCommand = value; 
+					}
+			}
 		}
 
 		[Browsable (false)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public DbCommand InsertCommand {
-			get { return (DbCommand)_insertCommand; }
-			set { _insertCommand = value; }
+		    get {
+					return (DbCommand) _insertCommand;
+					//return (DbCommand) ((IDbDataAdapter)this).InsertCommand; 
+			}
+		    set {
+					if (_insertCommand != value) {
+						_insertCommand = value;
+						((IDbDataAdapter)this).InsertCommand = value; 
+					}
+			}
 		}
 
 		[Browsable (false)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public DbCommand UpdateCommand {
-			get { return (DbCommand)_updateCommand; }
-			set { _updateCommand = value; }
+		    get {
+					return (DbCommand) _updateCommand;
+					//return (DbCommand) ((IDbDataAdapter)this).DeleteCommand; 
+			}
+		    set {
+					if (_updateCommand != value) {
+						_updateCommand = value;
+						((IDbDataAdapter)this).UpdateCommand = value; 
+					}
+			}
 		}
 
 		[DefaultValue (1)]
diff --git a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
index cb19e23bd43..47705c4348c 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
+++ b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-10  Veerapuram Varadhan  <vvaradhan@novell.com>
+
+	* SqlDataAdapter: 2.0 profile changes. 
+	
 2009-12-03  Jonathan Pobst  <monkey@jpobst.com>
 
 	* SortOrder.cs: Add enum.
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs
index d14df461f0a..a8bc4aef436 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs
@@ -97,11 +97,7 @@ namespace System.Data.SqlClient {
 #endif
 		[DefaultValue (null)]
 		[EditorAttribute ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
-		public
-#if ONLY_1_1
-		new 
-#endif 
-		SqlCommand DeleteCommand {
+		public new SqlCommand DeleteCommand {
 			get { 
 #if NET_2_0
 				return (SqlCommand)base.DeleteCommand; 
@@ -123,11 +119,7 @@ namespace System.Data.SqlClient {
 #endif
 		[DefaultValue (null)]
 		[EditorAttribute ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
-		public
-#if ONLY_1_1
-		new 
-#endif 
-		SqlCommand InsertCommand {
+		public new SqlCommand InsertCommand {
 			get { 
 #if NET_2_0				
 				return (SqlCommand)base.InsertCommand; 
@@ -149,11 +141,7 @@ namespace System.Data.SqlClient {
 #endif
 		[DefaultValue (null)]
 		[EditorAttribute ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
-		public
-#if ONLY_1_1
-		new 
-#endif 
-		SqlCommand SelectCommand {
+		public new SqlCommand SelectCommand {
 			get { 
 #if NET_2_0
 				return (SqlCommand)base.SelectCommand; 
@@ -175,11 +163,7 @@ namespace System.Data.SqlClient {
 #endif
 		[DefaultValue (null)]
 		[EditorAttribute ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
-		public
-#if ONLY_1_1
-		new 
-#endif 
-		SqlCommand UpdateCommand {
+		public new  SqlCommand UpdateCommand {
 			get { 
 #if NET_2_0
 				return (SqlCommand)base.UpdateCommand;