1 files changed, 5 insertions, 18 deletions

diff --git a/mcs/class/System.Data/System.Data.Common/DbDataReader.cs b/mcs/class/System.Data/System.Data.Common/DbDataReader.cs
index 342950e3d5a..03a35de427c 100644
--- a/mcs/class/System.Data/System.Data.Common/DbDataReader.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbDataReader.cs
@@ -33,11 +33,10 @@
 #if NET_2_0 || TARGET_JVM
 
 using System.Collections;
-using System.ComponentModel;
 using System.Data;
 
 namespace System.Data.Common {
-	public abstract class DbDataReader : MarshalByRefObject, IDataReader, IDataRecord, IDisposable, IEnumerable
+	public abstract class DbDataReader : MarshalByRefObject, IDataReader, IDataReader2, IDataRecord, IDataRecord2, IDisposable, IEnumerable
 	{
 		#region Constructors
 
@@ -56,13 +55,10 @@ namespace System.Data.Common {
 		public abstract object this [int index] { get; }
 		public abstract object this [string name] { get; }
 		public abstract int RecordsAffected { get; }
-
 #if NET_2_0
-		[MonoTODO]
-		public virtual int VisibleFieldCount {
-			get { throw new NotImplementedException ();}
-		}
+		public abstract int VisibleFieldCount { get; }
 #endif
+
 		#endregion // Properties
 
 		#region Methods
@@ -73,9 +69,7 @@ namespace System.Data.Common {
 		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);
-
-		[EditorBrowsable (EditorBrowsableState.Never)]
-		public void Dispose ()
+		public virtual void Dispose ()
 		{
 			Dispose (true);	
 		}
@@ -87,7 +81,6 @@ namespace System.Data.Common {
 		}
 #if NET_2_0
 		[MonoTODO]
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public DbDataReader GetData (int i)
 		{
 			throw new NotImplementedException ();
@@ -98,10 +91,7 @@ namespace System.Data.Common {
 		public abstract DateTime GetDateTime (int i);
 		public abstract decimal GetDecimal (int i);
 		public abstract double GetDouble (int i);
-
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public abstract IEnumerator GetEnumerator ();
-
 		public abstract Type GetFieldType (int i);
 		public abstract float GetFloat (int i);
 		public abstract Guid GetGuid (int i);
@@ -113,28 +103,25 @@ namespace System.Data.Common {
 
 #if NET_2_0
 		[MonoTODO]
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public virtual Type GetProviderSpecificFieldType (int i)
 		{
 			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public virtual object GetProviderSpecificValue (int i)
 		{
 			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
-		[EditorBrowsable (EditorBrowsableState.Never)]
 		public virtual int GetProviderSpecificValues (object[] values)
 		{
 			throw new NotImplementedException ();
 		}
 	
 		[MonoTODO]
-		protected virtual DbDataReader GetDbDataReader (int ordinal)
+		public virtual int GetDbDataReader (int ordinal)
 		{
 			throw new NotImplementedException ();
 		}