Merge pull request #409 from Alkarex/patch-1

[mono.git] / mcs / class / System.Data / System.Data.Common / DbConnection.cs

diff --git a/mcs/class/System.Data/System.Data.Common/DbConnection.cs b/mcs/class/System.Data/System.Data.Common/DbConnection.cs
index ca186c336a4d8e51e335f8606ee5d0a972ba0fa5..5d04c218d033330ea588a63751fb4c2b95eb8b35 100644 (file)
--- a/mcs/class/System.Data/System.Data.Common/DbConnection.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbConnection.cs
@@ -30,14 +30,17 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0 || TARGET_JVM
-
 using System.ComponentModel;
 using System.Data;
 #if NET_2_0 && !TARGET_JVM
 using System.Transactions;
 #endif
 
+#if NET_4_5
+using System.Threading;
+using System.Threading.Tasks;
+#endif
+
 namespace System.Data.Common {
        public abstract class DbConnection : Component, IDbConnection, IDisposable
        {
@@ -50,9 +53,7 @@ namespace System.Data.Common {
                #endregion // Constructors
 
                #region Properties
-#pragma warning disable 618            
                [RecommendedAsConfigurable (true)]
-#pragma warning restore 618            
                [RefreshProperties (RefreshProperties.All)]
                [DefaultValue ("")]
                public abstract string ConnectionString { get; set; }
@@ -717,12 +718,10 @@ namespace System.Data.Common {
                        return dataTable;
                }
 
-               protected virtual DbProviderFactory DbProviderFactory {
-#if MONOTOUCH
-                       get {throw new NotImplementedException();}
-#else   // MONOTOUCH
-                       get { return DbProviderFactories.GetFactory (this.GetType (). ToString ()); }
-#endif  // MONOTOUCH
+               protected internal virtual DbProviderFactory DbProviderFactory {
+                       get {
+                               return null;
+                       }
                }
 #endif
 
@@ -743,11 +742,24 @@ namespace System.Data.Common {
                
                public abstract void Open ();
 
-               protected virtual void OnStateChange (StateChangeEventArgs stateChanged)
+               protected virtual void OnStateChange (StateChangeEventArgs stateChange)
                {
                        if (StateChange != null)
-                               StateChange (this, stateChanged);
+                               StateChange (this, stateChange);
+               }
+               
+#if NET_4_5
+               public Task OpenAsync ()
+               {
+                       return OpenAsync (CancellationToken.None);
                }
+               
+               [MonoTODO]
+               public virtual Task OpenAsync (CancellationToken cancellationToken)
+               {
+                       throw new NotImplementedException ();
+               }
+#endif
 
                #endregion // Methods
 
@@ -755,5 +767,3 @@ namespace System.Data.Common {
 
        }
 }
-
-#endif