Merge pull request ThatRendle#90 from ChrisMH/issue_89_transaction

ThatRendle · ThatRendle · commit daebaa5ddbaf · 2011-10-21T03:33:51.000-07:00
Connection not closed when transaction is disposed.
diff --git a/Simple.Data.Ado/AdoAdapterTransaction.cs b/Simple.Data.Ado/AdoAdapterTransaction.cs
@@ -11,6 +11,7 @@ class AdoAdapterTransaction : IAdapterTransaction
     {
         private readonly string _name;
         private readonly IDbTransaction _dbTransaction;
+        private readonly IDbConnection _dbConnection;
 
         public AdoAdapterTransaction(IDbTransaction dbTransaction) : this(dbTransaction, null)
         {
@@ -20,6 +21,7 @@ public AdoAdapterTransaction(IDbTransaction dbTransaction, string name)
         {
             _name = name;
             _dbTransaction = dbTransaction;
+            _dbConnection = _dbTransaction.Connection;
         }
 
         internal IDbTransaction Transaction
@@ -30,6 +32,7 @@ internal IDbTransaction Transaction
         public void Dispose()
         {
             _dbTransaction.Dispose();
+            _dbConnection.Dispose();
         }
 
         public void Commit()

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ class AdoAdapterTransaction : IAdapterTransaction`
`11`	`11`	`{`
`12`	`12`	`private readonly string _name;`
`13`	`13`	`private readonly IDbTransaction _dbTransaction;`
	`14`	`+ private readonly IDbConnection _dbConnection;`
`14`	`15`
`15`	`16`	`public AdoAdapterTransaction(IDbTransaction dbTransaction) : this(dbTransaction, null)`
`16`	`17`	`{`
`@@ -20,6 +21,7 @@ public AdoAdapterTransaction(IDbTransaction dbTransaction, string name)`
`20`	`21`	`{`
`21`	`22`	`_name = name;`
`22`	`23`	`_dbTransaction = dbTransaction;`
	`24`	`+ _dbConnection = _dbTransaction.Connection;`
`23`	`25`	`}`
`24`	`26`
`25`	`27`	`internal IDbTransaction Transaction`
`@@ -30,6 +32,7 @@ internal IDbTransaction Transaction`
`30`	`32`	`public void Dispose()`
`31`	`33`	`{`
`32`	`34`	`_dbTransaction.Dispose();`
	`35`	`+ _dbConnection.Dispose();`
`33`	`36`	`}`
`34`	`37`
`35`	`38`	`public void Commit()`