Merge pull request #55 from servicetitan/cleanup-underlying-connection

alex-kulakov · web-flow · commit f779b5084e5e · 2020-09-10T23:08:55.000+05:00
Clean UnderlyingConnection on Dispose
diff --git a/Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/Connection.cs b/Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/Connection.cs
@@ -44,7 +44,9 @@ public override void BeginTransaction()
     /// <inheritdoc/>
     public override void BeginTransaction(IsolationLevel isolationLevel)
     {
-      EnsureTrasactionIsNotActive();
+      EnsureIsNotDisposed();
+      EnsureTransactionIsNotActive();
+
       var transactionOptions = new FbTransactionOptions {WaitTimeout = TimeSpan.FromSeconds(10)};
       switch (SqlHelper.ReduceIsolationLevel(isolationLevel)) {
       case IsolationLevel.ReadCommitted:
@@ -68,6 +70,12 @@ protected override void ClearActiveTransaction()
       activeTransaction = null;
     }
 
+    /// <inheritdoc/>
+    protected override void ClearUnderlyingConnection()
+    {
+      underlyingConnection = null;
+    }
+
     /// <inheritdoc/>
     public override void MakeSavepoint(string name)
     {
diff --git a/Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/Connection.cs b/Orm/Xtensive.Orm.MySql/Sql.Drivers.MySql/Connection.cs
@@ -8,13 +8,12 @@
 using System.Data.Common;
 using System.Security;
 using MySql.Data.MySqlClient;
-using Xtensive.Orm;
 
 namespace Xtensive.Sql.Drivers.MySql
 {
   internal class Connection : SqlConnection
   {
-    private readonly MySqlConnection underlyingConnection;
+    private MySqlConnection underlyingConnection;
     private MySqlTransaction activeTransaction;
 
     /// <inheritdoc/>
@@ -40,22 +39,28 @@ public override DbParameter CreateParameter()
     [SecuritySafeCritical]
     public override void BeginTransaction()
     {
-      EnsureTrasactionIsNotActive();
+      EnsureIsNotDisposed();
+      EnsureTransactionIsNotActive();
+
       activeTransaction = underlyingConnection.BeginTransaction();
     }
 
     /// <inheritdoc/>
     [SecuritySafeCritical]
     public override void BeginTransaction(IsolationLevel isolationLevel)
     {
-      EnsureTrasactionIsNotActive();
+      EnsureIsNotDisposed();
+      EnsureTransactionIsNotActive();
+
       activeTransaction = underlyingConnection.BeginTransaction(SqlHelper.ReduceIsolationLevel(isolationLevel));
     }
 
     /// <inheritdoc/>
     public override void MakeSavepoint(string name)
     {
+      EnsureIsNotDisposed();
       EnsureTransactionIsActive();
+
       string commandText = string.Format("SAVEPOINT {0}", name);
       using (DbCommand command = CreateCommand(commandText))
         command.ExecuteNonQuery();
@@ -64,7 +69,9 @@ public override void MakeSavepoint(string name)
     /// <inheritdoc/>
     public override void RollbackToSavepoint(string name)
     {
+      EnsureIsNotDisposed();
       EnsureTransactionIsActive();
+
       string commandText = string.Format("ROLLBACK TO SAVEPOINT {0}; RELEASE SAVEPOINT {0};", name);
       using (DbCommand command = CreateCommand(commandText))
         command.ExecuteNonQuery();
@@ -73,7 +80,9 @@ public override void RollbackToSavepoint(string name)
     /// <inheritdoc/>
     public override void ReleaseSavepoint(string name)
     {
+      EnsureIsNotDisposed();
       EnsureTransactionIsActive();
+
       string commandText = string.Format("RELEASE SAVEPOINT {0}", name);
       using (DbCommand command = CreateCommand(commandText))
         command.ExecuteNonQuery();
@@ -85,6 +94,12 @@ protected override void ClearActiveTransaction()
       activeTransaction = null;
     }
 
+    /// <inheritdoc/>
+    protected override void ClearUnderlyingConnection()
+    {
+      underlyingConnection = null;
+    }
+
     // Constructors
 
     [SecuritySafeCritical]
diff --git a/Orm/Xtensive.Orm.Oracle/Sql.Drivers.Oracle/Connection.cs b/Orm/Xtensive.Orm.Oracle/Sql.Drivers.Oracle/Connection.cs
@@ -41,46 +41,53 @@ public override DbParameter CreateCursorParameter()
     /// <inheritdoc/>
     public override IBinaryLargeObject CreateBinaryLargeObject()
     {
+      EnsureIsNotDisposed();
       return new BinaryLargeObject(underlyingConnection);
     }
 
     /// <inheritdoc/>
     public override ICharacterLargeObject CreateCharacterLargeObject()
     {
+      EnsureIsNotDisposed();
       return new CharacterLargeObject(underlyingConnection);
     }
 
     /// <inheritdoc/>
     public override void BeginTransaction()
     {
- 	    EnsureTrasactionIsNotActive();
+      EnsureIsNotDisposed();
+      EnsureTransactionIsNotActive();
       activeTransaction = underlyingConnection.BeginTransaction();
     }
 
     /// <inheritdoc/>
     public override void BeginTransaction(IsolationLevel isolationLevel)
     {
-      EnsureTrasactionIsNotActive();
+      EnsureIsNotDisposed();
+      EnsureTransactionIsNotActive();
       activeTransaction = underlyingConnection.BeginTransaction(SqlHelper.ReduceIsolationLevel(isolationLevel));
     }
 
     /// <inheritdoc/>
     public override void MakeSavepoint(string name)
     {
+      EnsureIsNotDisposed();
       EnsureTransactionIsActive();
       activeTransaction.Save(name);
     }
 
     /// <inheritdoc/>
     public override void RollbackToSavepoint(string name)
     {
+      EnsureIsNotDisposed();
       EnsureTransactionIsActive();
- 	    activeTransaction.Rollback(name);
+      activeTransaction.Rollback(name);
     }
 
     /// <inheritdoc/>
     public override void ReleaseSavepoint(string name)
     {
+      EnsureIsNotDisposed();
       EnsureTransactionIsActive();
       // nothing
     }
@@ -91,13 +98,18 @@ protected override void ClearActiveTransaction()
       activeTransaction = null;
     }
 
+    /// <inheritdoc/>
+    protected override void ClearUnderlyingConnection()
+    {
+      underlyingConnection = null;
+    }
+
     /// <inheritdoc/>
     protected override DbCommand CreateNativeCommand()
     {
       return new OracleCommand {Connection = underlyingConnection, BindByName = true};
     }
 
-
     // Constructors
 
     public Connection(SqlDriver driver)
diff --git a/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Connection.cs b/Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/Connection.cs
@@ -34,21 +34,24 @@ public override DbParameter CreateParameter()
     [SecuritySafeCritical]
     public override void BeginTransaction()
     {
-      EnsureTrasactionIsNotActive();
+      EnsureIsNotDisposed();
+      EnsureTransactionIsNotActive();
       activeTransaction = underlyingConnection.BeginTransaction();
     }
 
     /// <inheritdoc/>
     [SecuritySafeCritical]
     public override void BeginTransaction(IsolationLevel isolationLevel)
     {
-      EnsureTrasactionIsNotActive();
+      EnsureIsNotDisposed();
+      EnsureTransactionIsNotActive();
       activeTransaction = underlyingConnection.BeginTransaction(SqlHelper.ReduceIsolationLevel(isolationLevel));
     }
 
     /// <inheritdoc/>
     public override void MakeSavepoint(string name)
     {
+      EnsureIsNotDisposed();
       EnsureTransactionIsActive();
       var commandText = string.Format("SAVEPOINT {0}", name);
       using (var command = CreateCommand(commandText))
@@ -58,6 +61,7 @@ public override void MakeSavepoint(string name)
     /// <inheritdoc/>
     public override void RollbackToSavepoint(string name)
     {
+      EnsureIsNotDisposed();
       EnsureTransactionIsActive();
       var commandText = string.Format("ROLLBACK TO SAVEPOINT {0}; RELEASE SAVEPOINT {0};", name);
       using (var command = CreateCommand(commandText))
@@ -67,6 +71,7 @@ public override void RollbackToSavepoint(string name)
     /// <inheritdoc/>
     public override void ReleaseSavepoint(string name)
     {
+      EnsureIsNotDisposed();
       EnsureTransactionIsActive();
       var commandText = string.Format("RELEASE SAVEPOINT {0}", name);
       using (var command = CreateCommand(commandText))
@@ -79,6 +84,11 @@ protected override void ClearActiveTransaction()
       activeTransaction = null;
     }
 
+    /// <inheritdoc/>
+    protected override void ClearUnderlyingConnection()
+    {
+      underlyingConnection = null;
+    }
 
     // Constructors
 
diff --git a/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/Connection.cs b/Orm/Xtensive.Orm.SqlServer/Sql.Drivers.SqlServer/Connection.cs
@@ -8,10 +8,8 @@
 using System.Data;
 using System.Data.Common;
 using System.Data.SqlClient;
-using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Xtensive.Orm;
 using SqlServerConnection = System.Data.SqlClient.SqlConnection;
 
 namespace Xtensive.Sql.Drivers.SqlServer
@@ -84,38 +82,48 @@ public override Task OpenAndInitializeAsync(string initializationScript, Cancell
     /// <inheritdoc/>
     public override void BeginTransaction()
     {
-      EnsureTrasactionIsNotActive();
+      EnsureIsNotDisposed();
+      EnsureTransactionIsNotActive();
       activeTransaction = underlyingConnection.BeginTransaction();
     }
 
     /// <inheritdoc/>
     public override void BeginTransaction(IsolationLevel isolationLevel)
     {
-      EnsureTrasactionIsNotActive();
+      EnsureIsNotDisposed();
+      EnsureTransactionIsNotActive();
       activeTransaction = underlyingConnection.BeginTransaction(isolationLevel);
     }
-    
+
     /// <inheritdoc/>
     public override void MakeSavepoint(string name)
     {
+      EnsureIsNotDisposed();
       EnsureTransactionIsActive();
       activeTransaction.Save(name);
     }
 
     /// <inheritdoc/>
     public override void RollbackToSavepoint(string name)
     {
+      EnsureIsNotDisposed();
       EnsureTransactionIsActive();
       activeTransaction.Rollback(name);
     }
 
     /// <inheritdoc/>
     public override void ReleaseSavepoint(string name)
     {
+      EnsureIsNotDisposed();
       EnsureTransactionIsActive();
       // nothing
     }
 
+    protected override void ClearUnderlyingConnection()
+    {
+      underlyingConnection = null;
+    }
+
     /// <inheritdoc/>
     protected override void ClearActiveTransaction()
     {
diff --git a/Orm/Xtensive.Orm.Sqlite/Sql.Drivers.Sqlite/Connection.cs b/Orm/Xtensive.Orm.Sqlite/Sql.Drivers.Sqlite/Connection.cs
@@ -4,12 +4,10 @@
 // Created by: Malisa Ncube
 // Created:    2011.04.29
 
-using System;
 using System.Data;
 using System.Data.Common;
 using System.Data.SQLite;
 using System.Security;
-using Xtensive.Orm;
 
 namespace Xtensive.Sql.Drivers.Sqlite
 {
@@ -35,21 +33,24 @@ public override DbParameter CreateParameter()
     [SecuritySafeCritical]
     public override void BeginTransaction()
     {
-      EnsureTrasactionIsNotActive();
+      EnsureIsNotDisposed();
+      EnsureTransactionIsNotActive();
       activeTransaction = underlyingConnection.BeginTransaction();
     }
 
     /// <inheritdoc/>
     [SecuritySafeCritical]
     public override void BeginTransaction(IsolationLevel isolationLevel)
     {
-      EnsureTrasactionIsNotActive();
+      EnsureIsNotDisposed();
+      EnsureTransactionIsNotActive();
       activeTransaction = underlyingConnection.BeginTransaction(SqlHelper.ReduceIsolationLevel(isolationLevel));
     }
 
     /// <inheritdoc/>
     public override void MakeSavepoint(string name)
     {
+      EnsureIsNotDisposed();
       EnsureTransactionIsActive();
       var commandText = string.Format("SAVEPOINT {0}", name);
       using (var command = CreateCommand(commandText))
@@ -59,6 +60,7 @@ public override void MakeSavepoint(string name)
     /// <inheritdoc/>
     public override void RollbackToSavepoint(string name)
     {
+      EnsureIsNotDisposed();
       EnsureTransactionIsActive();
       var commandText = string.Format("ROLLBACK TO SAVEPOINT {0}; RELEASE SAVEPOINT {0};", name);
       using (var command = CreateCommand(commandText))
@@ -68,6 +70,7 @@ public override void RollbackToSavepoint(string name)
     /// <inheritdoc/>
     public override void ReleaseSavepoint(string name)
     {
+      EnsureIsNotDisposed();
       EnsureTransactionIsActive();
       var commandText = string.Format("RELEASE SAVEPOINT {0}", name);
       using (var command = CreateCommand(commandText))
@@ -80,6 +83,11 @@ protected override void ClearActiveTransaction()
       activeTransaction = null;
     }
 
+    /// <inheritdoc/>
+    protected override void ClearUnderlyingConnection()
+    {
+      underlyingConnection = null;
+    }
 
     // Constructors
 
diff --git a/Orm/Xtensive.Orm/Sql/SqlConnection.cs b/Orm/Xtensive.Orm/Sql/SqlConnection.cs

Original file line number	Diff line number	Diff line change
`@@ -41,46 +41,53 @@ public override DbParameter CreateCursorParameter()`
`41`	`41`	`/// <inheritdoc/>`
`42`	`42`	`public override IBinaryLargeObject CreateBinaryLargeObject()`
`43`	`43`	`{`
	`44`	`+ EnsureIsNotDisposed();`
`44`	`45`	`return new BinaryLargeObject(underlyingConnection);`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`/// <inheritdoc/>`
`48`	`49`	`public override ICharacterLargeObject CreateCharacterLargeObject()`
`49`	`50`	`{`
	`51`	`+ EnsureIsNotDisposed();`
`50`	`52`	`return new CharacterLargeObject(underlyingConnection);`
`51`	`53`	`}`
`52`	`54`
`53`	`55`	`/// <inheritdoc/>`
`54`	`56`	`public override void BeginTransaction()`
`55`	`57`	`{`
`56`		`- EnsureTrasactionIsNotActive();`
	`58`	`+ EnsureIsNotDisposed();`
	`59`	`+ EnsureTransactionIsNotActive();`
`57`	`60`	`activeTransaction = underlyingConnection.BeginTransaction();`
`58`	`61`	`}`
`59`	`62`
`60`	`63`	`/// <inheritdoc/>`
`61`	`64`	`public override void BeginTransaction(IsolationLevel isolationLevel)`
`62`	`65`	`{`
`63`		`- EnsureTrasactionIsNotActive();`
	`66`	`+ EnsureIsNotDisposed();`
	`67`	`+ EnsureTransactionIsNotActive();`
`64`	`68`	`activeTransaction = underlyingConnection.BeginTransaction(SqlHelper.ReduceIsolationLevel(isolationLevel));`
`65`	`69`	`}`
`66`	`70`
`67`	`71`	`/// <inheritdoc/>`
`68`	`72`	`public override void MakeSavepoint(string name)`
`69`	`73`	`{`
	`74`	`+ EnsureIsNotDisposed();`
`70`	`75`	`EnsureTransactionIsActive();`
`71`	`76`	`activeTransaction.Save(name);`
`72`	`77`	`}`
`73`	`78`
`74`	`79`	`/// <inheritdoc/>`
`75`	`80`	`public override void RollbackToSavepoint(string name)`
`76`	`81`	`{`
	`82`	`+ EnsureIsNotDisposed();`
`77`	`83`	`EnsureTransactionIsActive();`
`78`		`- activeTransaction.Rollback(name);`
	`84`	`+ activeTransaction.Rollback(name);`
`79`	`85`	`}`
`80`	`86`
`81`	`87`	`/// <inheritdoc/>`
`82`	`88`	`public override void ReleaseSavepoint(string name)`
`83`	`89`	`{`
	`90`	`+ EnsureIsNotDisposed();`
`84`	`91`	`EnsureTransactionIsActive();`
`85`	`92`	`// nothing`
`86`	`93`	`}`
`@@ -91,13 +98,18 @@ protected override void ClearActiveTransaction()`
`91`	`98`	`activeTransaction = null;`
`92`	`99`	`}`
`93`	`100`
	`101`	`+ /// <inheritdoc/>`
	`102`	`+ protected override void ClearUnderlyingConnection()`
	`103`	`+ {`
	`104`	`+ underlyingConnection = null;`
	`105`	`+ }`
	`106`	`+`
`94`	`107`	`/// <inheritdoc/>`
`95`	`108`	`protected override DbCommand CreateNativeCommand()`
`96`	`109`	`{`
`97`	`110`	`return new OracleCommand {Connection = underlyingConnection, BindByName = true};`
`98`	`111`	`}`
`99`	`112`
`100`		`-`
`101`	`113`	`// Constructors`
`102`	`114`
`103`	`115`	`public Connection(SqlDriver driver)`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,8 @@`
`8`	`8`	`using System.Data;`
`9`	`9`	`using System.Data.Common;`
`10`	`10`	`using System.Data.SqlClient;`
`11`		`-using System.Runtime.CompilerServices;`
`12`	`11`	`using System.Threading;`
`13`	`12`	`using System.Threading.Tasks;`
`14`		`-using Xtensive.Orm;`
`15`	`13`	`using SqlServerConnection = System.Data.SqlClient.SqlConnection;`
`16`	`14`
`17`	`15`	`namespace Xtensive.Sql.Drivers.SqlServer`
`@@ -84,38 +82,48 @@ public override Task OpenAndInitializeAsync(string initializationScript, Cancell`
`84`	`82`	`/// <inheritdoc/>`
`85`	`83`	`public override void BeginTransaction()`
`86`	`84`	`{`
`87`		`- EnsureTrasactionIsNotActive();`
	`85`	`+ EnsureIsNotDisposed();`
	`86`	`+ EnsureTransactionIsNotActive();`
`88`	`87`	`activeTransaction = underlyingConnection.BeginTransaction();`
`89`	`88`	`}`
`90`	`89`
`91`	`90`	`/// <inheritdoc/>`
`92`	`91`	`public override void BeginTransaction(IsolationLevel isolationLevel)`
`93`	`92`	`{`
`94`		`- EnsureTrasactionIsNotActive();`
	`93`	`+ EnsureIsNotDisposed();`
	`94`	`+ EnsureTransactionIsNotActive();`
`95`	`95`	`activeTransaction = underlyingConnection.BeginTransaction(isolationLevel);`
`96`	`96`	`}`
`97`		`-`
	`97`	`+`
`98`	`98`	`/// <inheritdoc/>`
`99`	`99`	`public override void MakeSavepoint(string name)`
`100`	`100`	`{`
	`101`	`+ EnsureIsNotDisposed();`
`101`	`102`	`EnsureTransactionIsActive();`
`102`	`103`	`activeTransaction.Save(name);`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`/// <inheritdoc/>`
`106`	`107`	`public override void RollbackToSavepoint(string name)`
`107`	`108`	`{`
	`109`	`+ EnsureIsNotDisposed();`
`108`	`110`	`EnsureTransactionIsActive();`
`109`	`111`	`activeTransaction.Rollback(name);`
`110`	`112`	`}`
`111`	`113`
`112`	`114`	`/// <inheritdoc/>`
`113`	`115`	`public override void ReleaseSavepoint(string name)`
`114`	`116`	`{`
	`117`	`+ EnsureIsNotDisposed();`
`115`	`118`	`EnsureTransactionIsActive();`
`116`	`119`	`// nothing`
`117`	`120`	`}`
`118`	`121`
	`122`	`+ protected override void ClearUnderlyingConnection()`
	`123`	`+ {`
	`124`	`+ underlyingConnection = null;`
	`125`	`+ }`
	`126`	`+`
`119`	`127`	`/// <inheritdoc/>`
`120`	`128`	`protected override void ClearActiveTransaction()`
`121`	`129`	`{`