2005-11-21 Senganal T <[email protected]>

	
        * 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

mcs/class/System.Data/ChangeLog

@@ -1,3 +1,9 @@
+2005-11-21  Senganal T  <[email protected]>
+
+	* System.Data.dll.sources: 
+		- Added System.Data/ConflictOption.cs : Source file for ConflictOption
+			enumeration.
+
 2005-11-15 Vlad Spivak <[email protected]>
 	* TARGET_JVM related changes
 

mcs/class/System.Data/System.Data.Common/ChangeLog

@@ -1,3 +1,19 @@
+2005-11-21  Senganal T <[email protected]>
+
+	* DbDataAdapter.cs
+	* DbParameter.cs
+	* DbTransaction.cs
+	* DbTable.cs
+	* DbProviderFactories.cs
+	* DbException.cs
+	* DbProviderFactory.cs
+	* DbCommandBuilder.cs
+	* DbDataReader.cs
+	* DbParameterCollection.cs
+		- Added stubs and other changes for ADO.NET 2.0 compatibility.
+	* DbMetaDataCollectionNames.cs (new file)
+		- Added DbMetaDataCollectionNames Enumeration 
+
 2005-10-24  Konstantin Triger <[email protected]>
 
         * DataContainer.cs: removed extra type validation for object container

mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs

@@ -62,7 +62,7 @@ namespace System.Data.Common {
 		}
 
 		[MonoTODO]
-		public virtual ConflictOptions ConflictDetection {
+		public virtual ConflictOption ConflictOption {
 			get { throw new NotImplementedException (); }
 			set { throw new NotImplementedException (); }
 		}
@@ -73,8 +73,6 @@ namespace System.Data.Common {
 			set { throw new NotImplementedException (); }
 		}
 
-		protected abstract DbProviderFactory ProviderFactory { get; }
-
 		[MonoTODO]
 		public virtual string QuotePrefix {
 			get { throw new NotImplementedException (); }
@@ -98,12 +96,15 @@ namespace System.Data.Common {
 			get { throw new NotImplementedException (); }
 			set { throw new NotImplementedException (); }
 		}
-
+		
 		#endregion // Properties
 
 		#region Methods
 
-		protected abstract void ApplyParameterInfo (IDbDataParameter p, DataRow row);
+		protected abstract void ApplyParameterInfo (DbParameter parameter, 
+							    DataRow row, 
+							    StatementType statementType, 
+							    bool whereClause);
 
 		[MonoTODO]
 		protected virtual void BuildCache (bool closeConnection, DataRow dataRow)
@@ -135,6 +136,12 @@ namespace System.Data.Common {
 			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
+		public DbCommand GetDeleteCommand (bool option)
+		{
+			throw new NotImplementedException ();
+		}
+
 		[MonoTODO]
 		public DbCommand GetDeleteCommand (DataRow dataRow)
 		{
@@ -147,6 +154,12 @@ namespace System.Data.Common {
 			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
+		public DbCommand GetInsertCommand (bool option)
+		{
+			throw new NotImplementedException ();
+		}
+
 		[MonoTODO]
 		public DbCommand GetInsertCommand (DataRow dataRow)
 		{
@@ -154,6 +167,7 @@ namespace System.Data.Common {
 		}
 
 		protected abstract string GetParameterName (int parameterOrdinal);
+		protected abstract string GetParameterName (String parameterName);
 		protected abstract string GetParameterPlaceholder (int parameterOrdinal);
 
 		[MonoTODO]
@@ -168,6 +182,12 @@ namespace System.Data.Common {
 			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
+		public DbCommand GetUpdateCommand (bool option)
+		{
+			throw new NotImplementedException ();
+		}
+
 		[MonoTODO]
 		public DbCommand GetUpdateCommand (DataRow dataRow)
 		{
@@ -204,6 +224,12 @@ namespace System.Data.Common {
 			throw new NotImplementedException ();
 		}
 
+		[MonoTODO]
+		protected void RowUpdatingHandler (RowUpdatingEventArgs rowUpdatingEvent)
+		{
+			throw new NotImplementedException ();
+		}
+
 		[MonoTODO]
 		protected void RowUpdatingHandler (object sender, RowUpdatingEventArgs rowUpdatingEvent)
 		{

mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs

@@ -40,7 +40,11 @@ using System.Data;
 using System.Runtime.InteropServices;
 
 namespace System.Data.Common {
+#if NET_2_0
+	public abstract class DbDataAdapter : DataAdapter, IDbDataAdapter, IDataAdapter, ICloneable
+#else
 	public abstract class DbDataAdapter : DataAdapter, ICloneable
+#endif
 	{
 		#region Fields
 
@@ -77,9 +81,6 @@ namespace System.Data.Common {
 		}
 #endif
 
-		IDbCommand DeleteCommand {
-			get { return ((IDbDataAdapter) this).DeleteCommand; }
-		}
 
 #if NET_2_0
 		protected internal CommandBehavior FillCommandBehavior {
@@ -88,9 +89,6 @@ namespace System.Data.Common {
 		}
 #endif
 
-		IDbCommand InsertCommand {
-			get { return ((IDbDataAdapter) this).InsertCommand; }
-		}
 
 #if NET_2_0
 		[MonoTODO]
@@ -99,16 +97,59 @@ namespace System.Data.Common {
 			set { throw new NotImplementedException (); }
 		}
 
+		[MonoTODO]
 		protected virtual DbProviderFactory ProviderFactory {
 			get { throw new NotImplementedException (); }
 		}
-#endif
 
-		IDbCommand SelectCommand {
-			get { return ((IDbDataAdapter) this).SelectCommand; }
+		[MonoTODO]
+		IDbCommand IDbDataAdapter.SelectCommand {
+			get { throw new NotImplementedException(); }
+			set { throw new NotImplementedException(); }
+		}
+
+		[MonoTODO]
+		IDbCommand IDbDataAdapter.UpdateCommand{
+			get { throw new NotImplementedException(); }
+			set { throw new NotImplementedException(); }
+		}
+
+		[MonoTODO]
+		IDbCommand IDbDataAdapter.DeleteCommand{
+			get { throw new NotImplementedException(); }
+			set { throw new NotImplementedException(); }
+		}
+
+		[MonoTODO]
+		IDbCommand IDbDataAdapter.InsertCommand{
+			get { throw new NotImplementedException(); }
+			set { throw new NotImplementedException(); }
+		}
+		
+		[MonoTODO]
+		public DbCommand SelectCommand {
+			get { throw new NotImplementedException(); }
+			set { throw new NotImplementedException(); }
+		}
+
+		[MonoTODO]
+		public DbCommand DeleteCommand {
+			get { throw new NotImplementedException(); }
+			set { throw new NotImplementedException(); }
+		}
+
+		[MonoTODO]
+		public DbCommand InsertCommand {
+			get { throw new NotImplementedException(); }
+			set { throw new NotImplementedException(); }
+		}
+
+		[MonoTODO]
+		public DbCommand UpdateCommand {
+			get { throw new NotImplementedException(); }
+			set { throw new NotImplementedException(); }
 		}
 
-#if NET_2_0
 		[MonoTODO]
 		public IDbTransaction Transaction {
 			get { throw new NotImplementedException (); }
@@ -120,12 +161,24 @@ namespace System.Data.Common {
 			get { throw new NotImplementedException (); }
 			set { throw new NotImplementedException (); }
 		}
-#endif
+#else
+		IDbCommand SelectCommand {
+			get { return ((IDbDataAdapter) this).SelectCommand; }
+		}
 
 		IDbCommand UpdateCommand {
 			get { return ((IDbDataAdapter) this).UpdateCommand; }
 		}
 
+		IDbCommand DeleteCommand {
+			get { return ((IDbDataAdapter) this).DeleteCommand; }
+		}
+
+		IDbCommand InsertCommand {
+			get { return ((IDbDataAdapter) this).InsertCommand; }
+		} 
+#endif
+
 		#endregion // Properties
 		
 		#region Events

mcs/class/System.Data/System.Data.Common/DbDataReader.cs

@@ -64,13 +64,21 @@ namespace System.Data.Common {
 		#region Methods
 
 		public abstract void Close ();
-		public abstract void Dispose ();
 		public abstract bool GetBoolean (int i);
 		public abstract byte GetByte (int i);
 		public abstract long GetBytes (int i, long fieldOffset, byte[] buffer, int bufferOffset, int length);
 		public abstract char GetChar (int i);
 		public abstract long GetChars (int i, long dataIndex, char[] buffer, int bufferIndex, int length);
-
+		public virtual void Dispose ()
+		{
+			Dispose (true);	
+		}
+		
+		[MonoTODO]
+		protected virtual void Dispose (bool disposing)
+		{
+			throw new NotImplementedException ();
+		}
 #if NET_2_0
 		[MonoTODO]
 		public DbDataReader GetData (int i)
@@ -84,9 +92,6 @@ namespace System.Data.Common {
 		public abstract decimal GetDecimal (int i);
 		public abstract double GetDouble (int i);
 		public abstract IEnumerator GetEnumerator ();
-#if NET_2_0
-		public abstract Type GetFieldProviderSpecificType (int i);
-#endif
 		public abstract Type GetFieldType (int i);
 		public abstract float GetFloat (int i);
 		public abstract Guid GetGuid (int i);
@@ -97,9 +102,30 @@ namespace System.Data.Common {
 		public abstract int GetOrdinal (string name);
 
 #if NET_2_0
-		public abstract object GetProviderSpecificValue (int i);
-		public abstract int GetProviderSpecificValues (object[] values);
-#endif
+		[MonoTODO]
+		public virtual Type GetProviderSpecificFieldType (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual object GetProviderSpecificValue (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual int GetProviderSpecificValues (object[] values)
+		{
+			throw new NotImplementedException ();
+		}
+	
+		[MonoTODO]
+		public virtual int GetDbDataReader (int ordinal)
+		{
+			throw new NotImplementedException ();
+		}
+#endif 
 
 		public abstract DataTable GetSchemaTable ();
 		public abstract string GetString (int i);

mcs/class/System.Data/System.Data.Common/DbException.cs

@@ -33,7 +33,7 @@ using System.Globalization;
 using System.Runtime.Serialization;
 using System.Runtime.InteropServices;
 
-namespace System.Data {
+namespace System.Data.Common {
 	[Serializable]
 	public abstract class DbException : ExternalException
 	{

mcs/class/System.Data/System.Data.Common/DbMetaDataCollectionNames.cs

@@ -0,0 +1,40 @@
+// System.Data.Common.DbMetaDataCollectionNames
+//
+// Author: Senganal T	([email protected])
+//
+// (C)  Senganal T 2005
+
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+namespace System.Data.Common {
+	[MonoTODO]
+	public static class DbMetaDataCollectionNames {
+
+		public static readonly string DataSourceInformation = "DataSourceInformation";
+		public static readonly string DataTypes = "DataTypes" ;
+		public static readonly string MetaDataCollections = "MetaDataCollections";
+		public static readonly string ReservedWords = "ReservedWords";
+		public static readonly string Restrictions = "Restrictions";
+	}
+}
+#endif

mcs/class/System.Data/System.Data.Common/DbParameter.cs

@@ -54,7 +54,6 @@ namespace System.Data.Common {
 		public abstract int Size { get; set; }
 		public abstract object Value { get; set; }
 		public abstract bool IsNullable { get; set; }
-		public abstract int Offset { get; set; }
 		public abstract string SourceColumn { get; set; }
 		public abstract DataRowVersion SourceVersion { get; set; }
 
@@ -62,12 +61,10 @@ namespace System.Data.Common {
 
 		#region Methods
 
-		public abstract void CopyTo (DbParameter destination);
-
 #if NET_2_0
+		public abstract bool SourceColumnNullMapping { get; set; }
 		public abstract void ResetDbType ();
 #endif
-
 		#endregion // Methods
 	}
 }

mcs/class/System.Data/System.Data.Common/DbParameterCollection.cs

@@ -91,7 +91,9 @@ namespace System.Data.Common {
 
 #if NET_2_0
 		public abstract void AddRange (Array values);
-		protected abstract int CheckName (string parameterName);
+		protected abstract DbParameter GetParameter (String parameterName);
+		protected abstract void SetParameter (String parameterName, 
+						      DbParameter value);
 #endif
 
 		public abstract void Clear ();

mcs/class/System.Data/System.Data.Common/DbProviderFactories.cs

@@ -39,19 +39,13 @@ using System.Collections;
 using System.Configuration;
 
 namespace System.Data.Common {
-	public sealed class DbProviderFactories
+	public static class DbProviderFactories
 	{
 		private static object configEntries = null; // DataSet
 
                 private const string CONFIG_SECTION_NAME        = "system.data";
                 private const string CONFIG_SEC_TABLE_NAME      = "DbProviderFactories";
                 
-		#region Constructors
-		private DbProviderFactories ()
-		{
-		}
-		#endregion Constructors
-
 		#region Methods
 
 		public static DbProviderFactory GetFactory (DataRow providerRow)

mcs/class/System.Data/System.Data.Common/DbProviderFactory.cs

@@ -54,7 +54,10 @@ namespace System.Data.Common {
 
 		#region Properties
 
-		public abstract DbProviderSupportedClasses SupportedClasses { get; }
+		[MonoTODO]
+		public virtual bool CanCreateDataSourceEnumerator { 
+			get {throw new NotImplementedException ();}
+		}
 		#endregion // Properties
 
 		#region Methods
@@ -113,7 +116,12 @@ namespace System.Data.Common {
 			throw new NotImplementedException ();
 		}
 
-
+		[MonoTODO]
+		public virtual DbConnectionStringBuilder CreateConnectionStringBuilder ()
+		{
+			throw new NotImplementedException ();
+		}
+		
 		#endregion // Methods
 	}
 }

mcs/class/System.Data/System.Data.Common/DbTable.cs

@@ -49,7 +49,7 @@ namespace System.Data.Common {
 		#region Properties
 
 		[MonoTODO]	
-		public ConflictOptions ConflictDetection {
+		public ConflictOption ConflictOption {
 			get { throw new NotImplementedException (); }
 			set { throw new NotImplementedException (); }
 		}

mcs/class/System.Data/System.Data.Common/DbTransaction.cs

@@ -1,4 +1,4 @@
-//
+
 // System.Data.Common.DbTransaction.cs
 //
 // Author:
@@ -63,9 +63,18 @@ namespace System.Data.Common {
 		#region Methods
 
 		public abstract void Commit ();
-		public abstract void Dispose ();
 		public abstract void Rollback ();
 
+		public virtual void Dispose ()
+		{
+			Dispose (true);
+		}
+
+		protected virtual void Dispose (bool disposing)
+		{
+			throw new NotImplementedException ();
+		}
+
 		#endregion // Methods
 	}
 }

mcs/class/System.Data/System.Data.Odbc/ChangeLog

@@ -1,3 +1,15 @@
+2005-11-21  Senganal T <[email protected]>
+
+	* OdbcTransaction.cs
+	* OdbcCommandBuilder.cs
+	* OdbcParameterCollection.cs
+	* OdbcDataReader.cs
+	* OdbcFactory.cs
+	* OdbcDataAdapter.cs
+	* OdbcParameter.cs
+	
+	Added stubs and other changes for ADO.NET 2.0 compatibility
+
 2005-10-14  Senganal T <[email protected]>
 
 	* OdbcColumn.cs : Changed the mapping of OdbcType.Char to string

mcs/class/System.Data/System.Data.Odbc/OdbcCommandBuilder.cs

@@ -445,7 +445,10 @@ namespace System.Data.Odbc
                 
 #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 ();
                 }
@@ -455,20 +458,19 @@ namespace System.Data.Odbc
                 {
                         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 ();                        
                 }
-
+                
                 [MonoTODO]
                 protected override void SetRowUpdatingHandler (DbDataAdapter adapter)
                 {

mcs/class/System.Data/System.Data.Odbc/OdbcDataAdapter.cs

@@ -87,7 +87,7 @@ namespace System.Data.Odbc {
 		[OdbcDescription ("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 OdbcCommand DeleteCommand {
+		public new OdbcCommand DeleteCommand {
 			get { return deleteCommand; }
 			set { deleteCommand = value; }
 		}
@@ -96,7 +96,7 @@ namespace System.Data.Odbc {
 		[OdbcDescription ("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 OdbcCommand InsertCommand {
+		public new OdbcCommand InsertCommand {
 			get { return insertCommand; }
 			set { insertCommand = value; }
 		}
@@ -105,7 +105,7 @@ namespace System.Data.Odbc {
 		[OdbcDescription ("Used during Fill/FillSchema.")]
 		[DefaultValue (null)]
 		[EditorAttribute ("Microsoft.VSDesigner.Data.Design.DBCommandEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
-		public OdbcCommand SelectCommand {
+		public new OdbcCommand SelectCommand {
 			get { return selectCommand; }
 			set { selectCommand = value; }
 		}
@@ -114,7 +114,7 @@ namespace System.Data.Odbc {
 		[OdbcDescription ("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 OdbcCommand UpdateCommand {
+		public new OdbcCommand UpdateCommand {
 			get { return updateCommand; }
 			set { updateCommand = value; }
 		}

mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs

@@ -806,26 +806,22 @@ namespace System.Data.Odbc
 			throw new NotImplementedException ();
 		}
 
-#if ONLY_1_1
 		void IDisposable.Dispose ()
 		{
 			Dispose (true);
 			GC.SuppressFinalize (this);
 		}
-#else
-		public override void Dispose ()
-		{
-			Dispose (true);
-			GC.SuppressFinalize (this);
-		}
-#endif
+
                 IEnumerator IEnumerable.GetEnumerator ()
 		{
 			return new DbEnumerator (this);
 		}
 #endif // ONLY_1_1
 
-		private void Dispose (bool disposing)
+#if NET_2_0
+		protected override
+#endif
+		void Dispose (bool disposing)
 		{
 			if (disposed)
 				return;
@@ -1079,7 +1075,7 @@ namespace System.Data.Odbc
                 }
 
                 [MonoTODO]
-		public override Type GetFieldProviderSpecificType (int i)
+		public override Type GetProviderSpecificFieldType (int i)
                 {
 			throw new NotImplementedException ();
                 }

mcs/class/System.Data/System.Data.Odbc/OdbcFactory.cs

@@ -73,7 +73,7 @@ namespace System.Data.Odbc
                 #endregion //Constructors
 
                 #region Properties
-                public override DbProviderSupportedClasses SupportedClasses { 
+                public DbProviderSupportedClasses SupportedClasses { 
                         get {                                
                                 return (DbProviderSupportedClasses) (
                                                                      DbProviderSupportedClasses.DbConnection | 
@@ -87,7 +87,12 @@ namespace System.Data.Odbc
                                                                      );
                         }
                 }
-                
+
+		[MonoTODO]
+		public override bool CanCreateDataSourceEnumerator {
+			get { throw new NotImplementedException ();}
+		}               
+ 
                 #endregion //Properties
 
                 #region Methods
@@ -122,7 +127,7 @@ namespace System.Data.Odbc
                 {
                         return new OdbcParameter () as DbParameter;
                 }
-                
+
 //                 public override CodeAccessPermission CreatePermission(PermissionState state)
 //                 {
 //                         throw new NotImplementedException ();

mcs/class/System.Data/System.Data.Odbc/OdbcParameter.cs

@@ -478,6 +478,12 @@ namespace System.Data.Odbc
 		}
 
 #if NET_2_0
+		[MonoTODO]
+		public override bool SourceColumnNullMapping {
+			get {return false;}
+			set {}
+		}
+
                 [MonoTODO]
                 public override void PropertyChanging () 
                 {

mcs/class/System.Data/System.Data.Odbc/OdbcParameterCollection.cs

@@ -444,7 +444,18 @@ namespace System.Data.Odbc
                 }
 
 
-
+#if NET_2_0
+		[MonoTODO]
+		protected override DbParameter GetParameter (string name)
+		{
+			throw new NotImplementedException ();
+		}
+		[MonoTODO]
+		protected override void SetParameter (string name, DbParameter value)
+		{
+			throw new NotImplementedException ();
+		}
+#endif
 		#endregion // Methods
 
 	}

mcs/class/System.Data/System.Data.Odbc/OdbcTransaction.cs

@@ -87,7 +87,10 @@ namespace System.Data.Odbc
 
 		#region Implementation of IDisposable
 
-		private void Dispose(bool disposing) {
+#if NET_2_0
+		protected override
+#endif
+		void Dispose(bool disposing) {
 			if (!disposed) {
 				if (disposing) {
 					Rollback();

mcs/class/System.Data/System.Data.ProviderBase/ChangeLog

@@ -1,3 +1,10 @@
+2005-11-21 Senganal T <[email protected]>
+	
+	* DbParameterCollectionBase.cs 
+		- Marked CheckName method as virtual
+	* DbParameterBase.cs
+		- Marked Offset property and CopyTo method as virtual
+
 2005-05-29 Boris Kirzner <[email protected]>
 	* DbCommandBase.cs 
 		- Private members names changed.

mcs/class/System.Data/System.Data.ProviderBase/DbParameterBase.cs

@@ -109,7 +109,7 @@ namespace System.Data.ProviderBase {
 		}
 
 		
-		public override int Offset {
+		public virtual int Offset {
 			get { return _offset; }
 			set { _offset = value; }			
 		}
@@ -193,7 +193,7 @@ namespace System.Data.ProviderBase {
 		#region Methods
 
 		[MonoTODO]
-		public override void CopyTo (DbParameter destination)
+		public virtual void CopyTo (DbParameter destination)
 		{
 			if (destination == null)
 				throw ExceptionHelper.ArgumentNull ("destination");

mcs/class/System.Data/System.Data.ProviderBase/DbParameterCollectionBase.cs

@@ -105,7 +105,7 @@ namespace System.Data.ProviderBase {
 		}
 
 		[MonoTODO]
-		protected override int CheckName (string parameterName)
+		protected virtual int CheckName (string parameterName)
 		{
 			throw new NotImplementedException ();
 		}

mcs/class/System.Data/System.Data.SqlClient/ChangeLog

@@ -1,3 +1,15 @@
+2005-11-21  Senganal T  <[email protected]>
+
+	* 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 <[email protected]>
 
 	* SqlConnection.cs: don't throw NotImplementedException when using

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
                         {

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
 

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; }
 		}

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 ();
                 }

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
 

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();

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) {

mcs/class/System.Data/System.Data.dll.sources

@@ -8,6 +8,7 @@ System.Data/CommandBehavior.cs
 System.Data/CommandType.cs
 System.Data/ConnectionState.cs
 System.Data/ConflictOptions.cs
+System.Data/ConflictOption.cs
 System.Data/Constraint.cs
 System.Data/ConstraintCollection.cs
 System.Data/ConstraintConverter.cs
@@ -163,6 +164,7 @@ System.Data.Common/DbDataSourceEnumerator.cs
 System.Data.Common/DbDataUpdatableRecord.cs
 System.Data.Common/DbEnumerator.cs
 System.Data.Common/DbException.cs
+System.Data.Common/DbMetaDataCollectionNames.cs
 System.Data.Common/DbParameterCollection.cs
 System.Data.Common/DbParameter.cs
 System.Data.Common/DbProviderConfigurationHandler.cs

mcs/class/System.Data/System.Data/ChangeLog

@@ -1,3 +1,11 @@
+2005-11-11  Senganal T <[email protected]>
+	
+	* ConflictOption.cs (new file)
+		- Added ConflictOption Enumeration 
+	* DataTableReader.cs
+	* IDataRecord2.cs 
+		- GetProviderSpecificFieldType : Corrected the method name
+
 2005-11-11  Senganal T <[email protected]>
 
 	* DataSet.cs : Added the SchemaSerializationMode Property for NET_2_0

mcs/class/System.Data/System.Data/ConflictOption.cs

@@ -0,0 +1,41 @@
+//
+// System.Data.ConflictOption.cs
+//
+// Author:
+//   Senganal T
+//
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if NET_2_0
+
+namespace System.Data {
+	public enum ConflictOption
+	{
+		CompareAllSearchableValues,
+		CompareRowVersion,
+		OverwriteChanges
+	}
+}
+
+#endif // NET_2_0

mcs/class/System.Data/System.Data/DataTableReader.cs

@@ -229,7 +229,7 @@ namespace System.Data {
                 }
 
                 [MonoTODO]
-                public override Type GetFieldProviderSpecificType (int i)
+                public override Type GetProviderSpecificFieldType (int i)
                 {
                         throw new NotImplementedException ();
                 }

mcs/class/System.Data/System.Data/IDataRecord2.cs

@@ -44,7 +44,7 @@ namespace System.Data {
 
 		#region Methods
 #if NET_2_0
-		Type GetFieldProviderSpecificType (int i);
+		Type GetProviderSpecificFieldType (int i);
 		object GetProviderSpecificValue (int i);
 		int GetProviderSpecificValues (object[] values);
 #endif

mcs/class/System/System.Net/ChangeLog

@@ -1,3 +1,7 @@
+2005-11-21 Senganal T   <[email protected]>
+
+        * Dns.cs : added GetHostEntry() method for 2.0 api conformance
+
 2005-11-18 Gonzalo Paniagua Javier <[email protected]>
 
 	* HttpRequestHeader.cs: add missing values.

mcs/class/System/System.Net/Dns.cs

@@ -160,6 +160,16 @@ namespace System.Net {
 			return (hostent_to_IPHostEntry (h_name, h_aliases, h_addrlist));
 		}
 
+#if NET_2_0
+		[MonoTODO]
+		public static IPHostEntry GetHostEntry (string hostNameOrAddress)
+		{
+			if (address == null)
+				throw new ArgumentNullException ("hostNameOrAddress");
+
+			return Resolve (hostNameOrAddress);
+		}
+#endif
 		public static IPHostEntry GetHostByName(string hostName) 
 		{
 			if (hostName == null)