Author: anagappan
Date: 2007-07-22 02:42:40 -0400 (Sun, 22 Jul 2007)
New Revision: 82422

Modified:
   trunk/mcs/class/System.Data/System.Data.Common/ChangeLog
   trunk/mcs/class/System.Data/System.Data.Common/DbConnection.cs
   trunk/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs
Log:
2007-07-22  Nagappan A  <[EMAIL PROTECTED]>

        * DbConnection.cs: 2.0 missing features.

        * DbDataAdapter.cs: 2.0 missing features.



Modified: trunk/mcs/class/System.Data/System.Data.Common/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data/System.Data.Common/ChangeLog    2007-07-22 
06:32:19 UTC (rev 82421)
+++ trunk/mcs/class/System.Data/System.Data.Common/ChangeLog    2007-07-22 
06:42:40 UTC (rev 82422)
@@ -1,3 +1,9 @@
+2007-07-22  Nagappan A  <[EMAIL PROTECTED]>
+
+       * DbConnection.cs: 2.0 missing features.
+
+       * DbDataAdapter.cs: 2.0 missing features.
+
 2007-06-30  Gert Driesen  <[EMAIL PROTECTED]>
 
        * DbDataAdapter.cs: Marked ICloneable.Clone obsolete to match MS.

Modified: trunk/mcs/class/System.Data/System.Data.Common/DbConnection.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.Common/DbConnection.cs      
2007-07-22 06:32:19 UTC (rev 82421)
+++ trunk/mcs/class/System.Data/System.Data.Common/DbConnection.cs      
2007-07-22 06:42:40 UTC (rev 82422)
@@ -50,8 +50,11 @@
                #endregion // Constructors
 
                #region Properties
-
+#if NET_2_0
+               [SettingsBindableAttribute (true)]
+#else
                [RecommendedAsConfigurable (true)]
+#endif
                [RefreshProperties (RefreshProperties.All)]
                [DefaultValue ("")]
                public abstract string ConnectionString { get; set; }

Modified: trunk/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs     
2007-07-22 06:32:19 UTC (rev 82421)
+++ trunk/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs     
2007-07-22 06:42:40 UTC (rev 82422)
@@ -259,12 +259,15 @@
                        return Fill (dataSet, 0, 0, srcTable, ((IDbDataAdapter) 
this).SelectCommand, _behavior);
                }
 
-#if !NET_2_0
-               protected virtual int Fill (DataTable dataTable, IDataReader 
dataReader) 
+#if NET_1_0
+               protected
+#else
+               internal
+#endif
+               virtual new int Fill (DataTable dataTable, IDataReader 
dataReader) 
                {
                        return base.FillInternal (dataTable, dataReader);
                }
-#endif
 
                protected virtual int Fill (DataTable dataTable, IDbCommand 
command, CommandBehavior behavior) 
                {

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to