2006-07-13 Senganal T <tsenganal@novell.com>

	* Test/System.Data.Common/DBDataPermissionTest.cs : Removed invalid tests

	* System.Data.Common/SchemaInfo.cs DbDataAdapter.cs DbConnectionOptions.cs DbParameter.cs 
	DbMetaDataColumnNames.cs DbTransaction.cs DataTableMapping.cs DataAdapter.cs 
	FieldNameLookup.cs DbDataRecord.cs DataColumnMappingCollection.cs DbCommand.cs 
	DbDataPermission.cs DbProviderFactory.cs DbCommandBuilder.cs DbConnectionString.cs 
	RowUpdatedEventArgs.cs DbDataReader.cs DbConnectionStringBuilder.cs DbConnection.cs 
	DataTableMappingCollection.cs :
		2.0 Api fixes

	* System.Data.SqlClient/SqlClientFactory.cs SqlCommand.cs SqlConnectionFactory.cs 
	SqlClientPermission.cs SqlParameterCollection.cs SqlDataReader.cs 
	SqlConnection.cs SqlParameter.cs SqlTransaction.cs :
		2.0 Api fixes

	* System.Data.Odbc/OdbcTransaction.cs OdbcCommand.cs OdbcConnectionFactory.cs 
	OdbcPermission.cs OdbcDataReader.cs OdbcParameterCollection.cs 
	OdbcConnection.cs OdbcFactory.cs OdbcParameter.cs :
		2.0 Api fixes

	* System.Data.OleDb/OleDbCommand : 2.0 Api fixes

	* System.Data.dll.sources: 
		- Added to build :
			System.Data.Common/DbMetaDataColumnNames.cs
		- Removed from build :
			System.Data.Common/DbCommandOptionalFeatures.cs
			System.Data.Common/DbCommandSet.cs
			System.Data.Common/DbProviderSupportedClasses.cs
			System.Data.Common/SchemaLocation.cs
			System.Data.Odbc/OdbcConnectionFactory.cs
			System.Data.SqlClient/SqlConnectionFactory.cs
			System.Data.ProviderBase/DbCommandBase.cs
			System.Data.ProviderBase/DbConnectionBase.cs
			System.Data.ProviderBase/DbConnectionFactory.cs
			System.Data.ProviderBase/DbConnectionInternal.cs
			System.Data.ProviderBase/DbConnectionPoolCounters.cs
			System.Data.ProviderBase/DbConnectionPoolOptions.cs
			System.Data.ProviderBase/DbDataReaderBase.cs
			System.Data.ProviderBase/DbMetaDataFactory.cs
			System.Data.ProviderBase/DbParameterBase.cs
			System.Data.ProviderBase/DbParameterCollectionBase.cs
			System.Data.ProviderBase/DbReferenceCollection.cs

	* Makefile : Add System.Transactions library reference to net_2_0 PROFILE


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

1 files changed, 10 insertions, 22 deletions

diff --git a/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs b/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
index 1c94774cd32..9af856df19d 100644
--- a/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
+++ b/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
@@ -37,15 +37,12 @@ using System.Collections;
 using System.ComponentModel;
 using System.Data;
 using System.Data.Common;
-#if NET_2_0
-using System.Data.ProviderBase;
-#endif // NET_2_0
 using System.Text;
 
 namespace System.Data.Odbc
 {
 #if NET_2_0
-        public sealed class OdbcDataReader : DbDataReaderBase
+        public sealed class OdbcDataReader : DbDataReader
 #else
 	public sealed class OdbcDataReader : MarshalByRefObject, IDataReader, IDisposable, IDataRecord, IEnumerable
 #endif
@@ -60,23 +57,16 @@ namespace System.Data.Odbc
 		private int _recordsAffected = -1;
 		bool disposed = false;
 		private DataTable _dataTableSchema;
-#if ONLY_1_1
 		private CommandBehavior behavior;
-#endif // ONLY_1_1
 
 		#endregion
 
 		#region Constructors
 
 		internal OdbcDataReader (OdbcCommand command, CommandBehavior behavior)
-#if NET_2_0
-                        : base (behavior)
-#endif // NET_2_0
 		{
 			this.command = command;
-#if ONLY_1_1
 			this.CommandBehavior=behavior;
-#endif // ONLY_1_1
 			open = true;
 			currentRow = -1;
 			hstmt=command.hStmt;
@@ -98,22 +88,12 @@ namespace System.Data.Odbc
 
 		#region Properties
 
-#if ONLY_1_1
                 private CommandBehavior CommandBehavior 
                 {
                         get { return behavior; }
                         set { value = behavior; }
                 }
-#endif // ONLY_1_1
                 
-#if NET_2_0
-                [MonoTODO]
-                protected override bool IsValidRow 
-                {
-                        get { throw new NotImplementedException (); }
-                }
-#endif // NET_2_0
-
 		public
 #if NET_2_0
                 override
@@ -839,12 +819,20 @@ namespace System.Data.Odbc
 			GC.SuppressFinalize (this);
 		}
 
-                IEnumerator IEnumerable.GetEnumerator ()
+		IEnumerator IEnumerable.GetEnumerator ()
 		{
 			return new DbEnumerator (this);
 		}
 #endif // ONLY_1_1
 
+		
+#if NET_2_0
+                public override IEnumerator GetEnumerator ()
+		{
+			return new DbEnumerator (this);
+		}
+#endif
+
 #if NET_2_0
 		protected override
 #endif