* OdbcParameterTest.cs: Fixed compilation on 1.0 profile.

[mono.git] / mcs / class / System.Data / System.Data.ProviderBase / DbConnectionBase.cs

diff --git a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionBase.cs b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionBase.cs
index 62b413bd99b1a026b87bbd934919c065c48f792a..d4788f1ac950cfb99b5155b635bbc40f3e92c22f 100644 (file)
--- a/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionBase.cs
+++ b/mcs/class/System.Data/System.Data.ProviderBase/DbConnectionBase.cs
@@ -31,7 +31,7 @@
 //
 
 #if NET_2_0
-
+using System.Transactions;
 using System.Data.Common;
 using System.EnterpriseServices;
 
@@ -43,6 +43,7 @@ namespace System.Data.ProviderBase {
                DbConnectionFactory connectionFactory;
                DbConnectionString connectionOptions;
                string connectionString;
+                bool disposed = false;
                
                #endregion // Fields
 
@@ -80,11 +81,10 @@ namespace System.Data.ProviderBase {
                        get { return connectionOptions; }
                }
 
-               [MonoTODO]
                public override string ConnectionString {
                        get { return connectionString; }
                        set { 
-                               connectionOptions = ConnectionFactory.CreateConnectionOptionsInternal (value);
+                               //connectionOptions = ConnectionFactory.CreateConnectionOptionsInternal (value);
                                connectionString = value;
                        }
                }
@@ -154,23 +154,33 @@ namespace System.Data.ProviderBase {
 
                protected override DbCommand CreateDbCommand ()
                {
-                       return (DbCommand) ConnectionFactory.ProviderFactory.CreateCommand ();
+                       DbCommand cmd = (DbCommand) ConnectionFactory.ProviderFactory.CreateCommand ();
+                        cmd.Connection = this;
+                        return cmd;
                }
 
-               [MonoTODO]
                protected override void Dispose (bool disposing)
                {
-                       throw new NotImplementedException ();
+                        if (!disposed) { 
+                                try {
+                                        if (disposing) {
+                                                // do necessary clean up
+                                        }
+                                        disposed = true;
+                                } finally {
+                                        base.Dispose (disposing);
+                                }
+                       }
                }
 
                [MonoTODO]
-               public override void EnlistDistributedTransaction (ITransaction transaction)
+               public void EnlistDistributedTransaction (EnterpriseServices.ITransaction transaction)
                {
                        throw new NotImplementedException ();
                }
 
                 [MonoTODO]
-                public override void EnlistTransaction (ITransaction transaction)
+                public void EnlistTransaction (Transaction transaction)
                 {
                        throw new NotImplementedException ();                        
                 }
@@ -181,10 +191,10 @@ namespace System.Data.ProviderBase {
                        throw new NotImplementedException ();
                }
 
-               [MonoTODO]
                protected void OnStateChange (ConnectionState originalState, ConnectionState currentState)
                {
-                       throw new NotImplementedException ();
+                        if (StateChange != null)
+                                StateChange (this, new StateChangeEventArgs (originalState, currentState));
                }
 
                [MonoTODO]