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

	
        * System/System.Net/Dns.cs : added GetHostEntry() method for 2.0 api conformance
	* System.Data/System.Data.ProviderBase/DbParameterCollectionBase.cs 
		- Marked CheckName method as virtual
	* System.Data/System.Data.ProviderBase/DbParameterBase.cs
		- Marked Offset property and CopyTo method as virtual
	* System.Data/System.Data.Common/DbMetaDataCollectionNames.cs (new file)
		- Added DbMetaDataCollectionNames Enumeration 
	* System.Data/System.Data.dll.sources: 
		- Added System.Data/ConflictOption.cs : Source file for ConflictOption
			enumeration.
	* System.Data/System.Data/ConflictOption.cs (new file)
		- Added ConflictOption Enumeration 
	* System.Data/System.Data/DataTableReader.cs
	* System.Data/System.Data/IDataRecord2.cs 
		- GetProviderSpecificFieldType : Corrected the method name
	* System.Data/System.Data.Common/DbDataAdapter.cs
	* System.Data/System.Data.Common/DbParameter.cs
	* System.Data/System.Data.Common/DbTransaction.cs
	* System.Data/System.Data.Common/DbTable.cs
	* System.Data/System.Data.Common/DbProviderFactories.cs
	* System.Data/System.Data.Common/DbException.cs
	* System.Data/System.Data.Common/DbProviderFactory.cs
	* System.Data/System.Data.Common/DbCommandBuilder.cs
	* System.Data/System.Data.Common/DbDataReader.cs
	* System.Data/System.Data.Common/DbParameterCollection.cs
	* System.Data/System.Data.SqlClient/SqlClientFactory.cs
	* System.Data/System.Data.SqlClient/SqlCommandBuilder.cs
	* System.Data/System.Data.SqlClient/SqlParameterCollection.cs
	* System.Data/System.Data.SqlClient/SqlDataReader.cs
	* System.Data/System.Data.SqlClient/SqlDataAdapter.cs
	* System.Data/System.Data.SqlClient/SqlParameter.cs
	* System.Data/System.Data.SqlClient/SqlTransaction.cs
	* System.Data/System.Data.Odbc/OdbcTransaction.cs
	* System.Data/System.Data.Odbc/OdbcCommandBuilder.cs
	* System.Data/System.Data.Odbc/OdbcParameterCollection.cs
	* System.Data/System.Data.Odbc/OdbcDataReader.cs
	* System.Data/System.Data.Odbc/OdbcFactory.cs
	* System.Data/System.Data.Odbc/OdbcDataAdapter.cs
	* System.Data/System.Data.Odbc/OdbcParameter.cs

	Added stubs and other changes for ADO.NET 2.0 compatibility
	

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

8 files changed, 61 insertions, 20 deletions

diff --git a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
index b7042f015ac..61b4819263f 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
+++ b/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
@@ -1,3 +1,15 @@
+2005-11-21  Senganal T  <tsenganal@novell.com>
+
+	* SqlClientFactory.cs
+	* SqlCommandBuilder.cs
+	* SqlParameterCollection.cs
+	* SqlDataReader.cs
+	* SqlDataAdapter.cs
+	* SqlParameter.cs
+	* SqlTransaction.cs
+
+	Added stubs and other changes for ADO.NET 2.0 compatibility
+	
 2005-11-12 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
 	* SqlConnection.cs: don't throw NotImplementedException when using
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlClientFactory.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlClientFactory.cs
index b3b3dfff83d..c64deb18faf 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlClientFactory.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlClientFactory.cs
@@ -57,7 +57,12 @@ namespace System.Data.SqlClient
                         }
                 }
                 #endregion //Constructors
-                
+
+		[MonoTODO]
+		public override bool CanCreateDataSourceEnumerator {
+			get { throw new NotImplementedException ();}
+		}               
+ 
                 #region public overrides
                 public override DbCommand CreateCommand ()
                 {
@@ -91,7 +96,7 @@ namespace System.Data.SqlClient
                         return (DbParameter) new SqlParameter ();
                 }
                 
-                public  new DbProviderSupportedClasses SupportedClasses
+                public new DbProviderSupportedClasses SupportedClasses
                 {
                         get
                         {
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlCommandBuilder.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlCommandBuilder.cs
index 000f1238b03..847e49da860 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlCommandBuilder.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlCommandBuilder.cs
@@ -528,7 +528,10 @@ namespace System.Data.SqlClient {
 
 #if NET_2_0
                 [MonoTODO]
-                protected override void ApplyParameterInfo (IDbDataParameter dbParameter, DataRow row)
+                protected override void ApplyParameterInfo (DbParameter dbParameter,
+							    DataRow row,
+							    StatementType statementType,
+							    bool whereClause)
                 {
                         throw new NotImplementedException ();
                 }
@@ -538,19 +541,20 @@ namespace System.Data.SqlClient {
                 {
                         throw new NotImplementedException ();                        
                 }
-                
 
                 [MonoTODO]
-                protected override string GetParameterPlaceholder (int position)
+                protected override string GetParameterName (string parameterName)
                 {
                         throw new NotImplementedException ();                        
                 }
                 
+
                 [MonoTODO]
-                protected override DbProviderFactory ProviderFactory
+                protected override string GetParameterPlaceholder (int position)
                 {
-                        get {throw new NotImplementedException ();}
+                        throw new NotImplementedException ();                        
                 }
+                
 #endif // NET_2_0
 		#endregion // Methods
 
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs
index b6e9d33dbc1..c524f70db32 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs
@@ -87,7 +87,7 @@ namespace System.Data.SqlClient {
 		[DataSysDescription ("Used during Update for deleted rows in DataSet.")]
 		[DefaultValue (null)]
 		[EditorAttribute ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
-		public SqlCommand DeleteCommand {
+		public new SqlCommand DeleteCommand {
 			get { return deleteCommand; }
 			set { deleteCommand = value; }
 		}
@@ -96,7 +96,7 @@ namespace System.Data.SqlClient {
 		[DataSysDescription ("Used during Update for new rows in DataSet.")]
 		[DefaultValue (null)]
 		[EditorAttribute ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
-		public SqlCommand InsertCommand {
+		public new SqlCommand InsertCommand {
 			get { return insertCommand; }
 			set { insertCommand = value; }
 		}
@@ -105,7 +105,7 @@ namespace System.Data.SqlClient {
 		[DataSysDescription ("Used during Fill/FillSchema.")]
 		[DefaultValue (null)]
 		[EditorAttribute ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
-		public SqlCommand SelectCommand {
+		public new SqlCommand SelectCommand {
 			get { return selectCommand; }
 			set { selectCommand = value; }
 		}
@@ -114,7 +114,7 @@ namespace System.Data.SqlClient {
 		[DataSysDescription ("Used during Update for modified rows in DataSet.")]
 		[DefaultValue (null)]
 		[EditorAttribute ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
-		public SqlCommand UpdateCommand {
+		public new SqlCommand UpdateCommand {
 			get { return updateCommand; }
 			set { updateCommand = value; }
 		}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs
index 6630e38b289..5ddb4019fb2 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs
@@ -211,8 +211,10 @@ namespace System.Data.SqlClient {
 
 			return schemaTable;
 		}
-
-		private void Dispose (bool disposing) 
+#if NET_2_0
+		protected override
+#endif
+		void Dispose (bool disposing) 
 		{
 			if (!disposed) {
 				if (disposing) {
@@ -1026,7 +1028,7 @@ namespace System.Data.SqlClient {
                 }
 
                 [MonoTODO]
-                public override Type GetFieldProviderSpecificType (int position)
+                public override Type GetProviderSpecificFieldType (int position)
                 {
                         throw new NotImplementedException ();
                 }
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlParameter.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlParameter.cs
index 370b64df739..4985d365f0d 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlParameter.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlParameter.cs
@@ -253,8 +253,8 @@ namespace System.Data.SqlClient {
 		public 
 #if NET_2_0
 		override
-#endif // NET_2_0
-	 int Offset {
+#endif
+	 	int Offset {
 			get { return offset; }
 			set { offset = value; }
 		}
@@ -393,6 +393,12 @@ namespace System.Data.SqlClient {
 //		public SqlCompareOptions CompareInfo{
 
 //#endif
+#if NET_2_0
+		public override bool SourceColumnNullMapping {
+			get { return false ; }
+			set { }
+		}
+#endif
 
 		#endregion // Properties
 
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlParameterCollection.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlParameterCollection.cs
index f34ccc3b0ee..819b5509c90 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlParameterCollection.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlParameterCollection.cs
@@ -159,15 +159,25 @@ namespace System.Data.SqlClient {
 		}
 
 #if NET_2_0
-		protected  DbParameter GetParameter (int index)
+		protected  override DbParameter GetParameter (int index)
 		{
 			throw new NotImplementedException();
 		}
 
-		 protected  void SetParameter (int index, DbParameter value)
+		protected override DbParameter GetParameter (string parameterName)
+		{
+			throw new NotImplementedException ();
+		}
+	
+		protected  override void SetParameter (int index, DbParameter value)
 		{
                         throw new NotImplementedException();
                 }
+		protected override void SetParameter (string parameterName, DbParameter value)
+		{
+                        throw new NotImplementedException();
+                }
+		/*public IEnumerator GetEnumerator ()
 		/*public IEnumerator GetEnumerator ()
 			 {
                         throw new NotImplementedException();
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlTransaction.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlTransaction.cs
index b5c06e46db2..0ada773f681 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlTransaction.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlTransaction.cs
@@ -105,8 +105,10 @@ namespace System.Data.SqlClient {
 			connection.Transaction = null;
 			isOpen = false;
 		}		
-
-		private void Dispose (bool disposing)
+#if NET_2_0
+		protected override
+#endif
+		void Dispose (bool disposing)
 		{
 			if (!disposed)  {
 				if (disposing) {