New test.

[mono.git] / mcs / class / Mono.Data.SybaseClient / Mono.Data.SybaseClient / SybaseTransaction.cs

diff --git a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseTransaction.cs b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseTransaction.cs
index 9d7bcbde90f422d10e84b726002b5804f8d6e42c..db7064db13e1fde62a54cd1e6804f571c97a0a22 100644 (file)
--- a/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseTransaction.cs
+++ b/mcs/class/Mono.Data.SybaseClient/Mono.Data.SybaseClient/SybaseTransaction.cs
@@ -7,7 +7,27 @@
 // Copyright (C) Tim Coleman, 2002
 //
 
-using Mono.Data.TdsClient;
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
 using System.Data;
 using System.Data.Common;
@@ -17,6 +37,8 @@ namespace Mono.Data.SybaseClient {
        {
                #region Fields
 
+               bool disposed = false;
+
                SybaseConnection connection;
                IsolationLevel isolationLevel;
                bool isOpen;
@@ -27,7 +49,6 @@ namespace Mono.Data.SybaseClient {
 
                internal SybaseTransaction (SybaseConnection connection, IsolationLevel isolevel)
                {
-                       SetIsolationLevel (connection, isolevel);
                        this.connection = connection;
                        this.isolationLevel = isolevel;
                        isOpen = true;
@@ -57,59 +78,40 @@ namespace Mono.Data.SybaseClient {
                
                #region Methods
 
-               static void SetIsolationLevel (SybaseConnection connection, IsolationLevel isolevel)
-               {
-                       string commandText = "SET TRANSACTION ISOLATION LEVEL ";
-
-                       switch (isolevel) {
-                       case IsolationLevel.Chaos :
-                               commandText += "CHAOS";
-                               break;
-                       case IsolationLevel.ReadCommitted :
-                               commandText += "READ COMMITTED";
-                               break;
-                       case IsolationLevel.ReadUncommitted :
-                               commandText += "READ UNCOMMITTED";
-                               break;
-                       case IsolationLevel.RepeatableRead :
-                               commandText += "REPEATABLE READ";
-                               break;
-                       case IsolationLevel.Serializable :
-                               commandText += "SERIALIZABLE";
-                               break;
-                       default :
-                               return;
-                       }
-                       connection.Tds.ExecuteNonQuery (commandText);
-               }
-
                public void Commit ()
                {
                        if (!isOpen)
                                throw new InvalidOperationException ("The Transaction was not open.");
-                       connection.Tds.ExecuteNonQuery ("IF @@TRANCOUNT>0 COMMIT TRAN");
+                       connection.Tds.Execute ("COMMIT TRANSACTION");
+                       connection.Transaction = null;
                        isOpen = false;
                }               
 
-               [MonoTODO]
+               private void Dispose (bool disposing)
+               {
+                       if (!disposed) {
+                               if (disposing)
+                                       Rollback ();
+                               disposed = true;
+                       }
+               }
+
                public void Dispose ()
                {
-                       throw new NotImplementedException ();
+                       Dispose (true);
+                       GC.SuppressFinalize (this);
                }
 
                public void Rollback ()
                {
-                       if (!isOpen)
-                               throw new InvalidOperationException ("The Transaction was not open.");
-                       connection.Tds.ExecuteNonQuery ("IF @@TRANCOUNT>0 ROLLBACK TRAN");
-                       isOpen = false;
+                       Rollback (String.Empty);
                }
 
                public void Rollback (string transactionName)
                {
                        if (!isOpen)
                                throw new InvalidOperationException ("The Transaction was not open.");
-                       connection.Tds.ExecuteNonQuery (String.Format ("IF @@TRANCOUNT > 0 ROLLBACK TRAN {0}", transactionName));
+                       connection.Tds.Execute (String.Format ("ROLLBACK TRANSACTION {0}", transactionName));
                        isOpen = false;
                }
 
@@ -117,7 +119,7 @@ namespace Mono.Data.SybaseClient {
                {
                        if (!isOpen)
                                throw new InvalidOperationException ("The Transaction was not open.");
-                       connection.Tds.ExecuteNonQuery (String.Format ("SAVE TRAN {0}", savePointName));
+                       connection.Tds.Execute (String.Format ("SAVE TRANSACTION {0}", savePointName));
                }
 
                #endregion // Methods