Handle properly create/drop in regards to IDisposable.

Author: cincuranet

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsDatabase.cs

@@ -154,7 +154,7 @@ public void Dispose()
 				_eventManager = null;
 				_serverVersion = null;
 				_dialect = 0;
-				_handle = 0;
+				_handle = -1;
 				_packetSize = 0;
 				_warningMessage = null;
 				_transactionCount = 0;
@@ -225,21 +225,26 @@ public virtual void Detach()
 			{
 				CloseEventManager();
 
-				if (_handle != 0)
+				var detach = _handle != -1;
+				if (detach)
 				{
 					XdrStream.Write(IscCodes.op_detach);
 					XdrStream.Write(_handle);
 				}
 				XdrStream.Write(IscCodes.op_disconnect);
 				XdrStream.Flush();
+				if (detach)
+				{
+					ReadResponse();
+				}
 
 				CloseConnection();
 
 #warning Here
 				_xdrStream?.Dispose();
 
 				_transactionCount = 0;
-				_handle = 0;
+				_handle = -1;
 				_dialect = 0;
 				_packetSize = 0;
 				_xdrStream = null;
@@ -281,23 +286,7 @@ public virtual void CreateDatabase(DatabaseParameterBuffer dpb, string dataSourc
 			{
 				SendCreateToBuffer(dpb, database);
 				XdrStream.Flush();
-
-				try
-				{
-					ProcessCreateResponse(ReadGenericResponse());
-
-					Detach();
-				}
-				catch (IscException)
-				{
-					try
-					{
-						CloseConnection();
-					}
-					catch
-					{ }
-					throw;
-				}
+				ProcessCreateResponse(ReadGenericResponse());
 			}
 			catch (IOException ex)
 			{
@@ -332,21 +321,12 @@ public virtual void DropDatabase()
 
 				ReadResponse();
 
-				_handle = 0;
+				_handle = -1;
 			}
 			catch (IOException ex)
 			{
 				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
 			}
-			finally
-			{
-				try
-				{
-					CloseConnection();
-				}
-				catch
-				{ }
-			}
 		}
 
 		#endregion
@@ -587,12 +567,7 @@ public virtual Task<int> NextOperationAsync()
 		public virtual IResponse ReadResponse()
 		{
 			var response = ReadSingleResponse();
-
-			if (response is GenericResponse)
-			{
-				ProcessResponse(response);
-			}
-
+			ProcessResponse(response);
 			return response;
 		}
 
@@ -632,11 +607,8 @@ public virtual void ReleaseObject(int op, int id)
 		protected virtual IResponse ReadSingleResponse()
 		{
 			var operation = ReadOperation();
-
 			var response = GdsConnection.ProcessOperation(operation, XdrStream);
-
 			ProcessResponseWarnings(response);
-
 			return response;
 		}
 

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version13/GdsDatabase.cs

@@ -76,25 +76,9 @@ public override void CreateDatabase(DatabaseParameterBuffer dpb, string dataSour
 			{
 				SendCreateToBuffer(dpb, database);
 				XdrStream.Flush();
-
-				try
-				{
-					var response = ReadResponse();
-					response = ProcessCryptCallbackResponseIfNeeded(response, cryptKey);
-					ProcessCreateResponse(response as GenericResponse);
-
-					Detach();
-				}
-				catch (IscException)
-				{
-					try
-					{
-						CloseConnection();
-					}
-					catch
-					{ }
-					throw;
-				}
+				var response = ReadResponse();
+				response = ProcessCryptCallbackResponseIfNeeded(response, cryptKey);
+				ProcessCreateResponse(response as GenericResponse);
 			}
 			catch (IOException ex)
 			{

Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesDatabase.cs

@@ -167,8 +167,6 @@ public void CreateDatabase(DatabaseParameterBuffer dpb, string dataSource, int p
 				0);
 
 			ProcessStatusVector(_statusVector);
-
-			Detach();
 		}
 
 		public void DropDatabase()
@@ -177,9 +175,9 @@ public void DropDatabase()
 
 			_fbClient.isc_drop_database(_statusVector, ref _handle);
 
-			_handle.Dispose();
-
 			ProcessStatusVector(_statusVector);
+
+			_handle.Dispose();
 		}
 
 		#endregion
@@ -238,11 +236,16 @@ public void Detach()
 				throw IscException.ForErrorCodeIntParam(IscCodes.isc_open_trans, TransactionCount);
 			}
 
-			ClearStatusVector();
+			if (!_handle.IsClosed)
+			{
+				ClearStatusVector();
 
-			_fbClient.isc_detach_database(_statusVector, ref _handle);
+				_fbClient.isc_detach_database(_statusVector, ref _handle);
 
-			ProcessStatusVector(_statusVector);
+				ProcessStatusVector(_statusVector);
+
+				_handle.Dispose();
+			}
 		}
 
 		#endregion

Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnectionInternal.cs

@@ -120,15 +120,19 @@ public void Dispose()
 
 		public void CreateDatabase(DatabaseParameterBuffer dpb)
 		{
-			var db = ClientFactory.CreateDatabase(_options);
-			db.CreateDatabase(dpb, _options.DataSource, _options.Port, _options.Database, _options.CryptKey);
+			using (var db = ClientFactory.CreateDatabase(_options))
+			{
+				db.CreateDatabase(dpb, _options.DataSource, _options.Port, _options.Database, _options.CryptKey);
+			}
 		}
 
 		public void DropDatabase()
 		{
-			var db = ClientFactory.CreateDatabase(_options);
-			db.Attach(BuildDpb(db, _options), _options.DataSource, _options.Port, _options.Database, _options.CryptKey);
-			db.DropDatabase();
+			using (var db = ClientFactory.CreateDatabase(_options))
+			{
+				db.Attach(BuildDpb(db, _options), _options.DataSource, _options.Port, _options.Database, _options.CryptKey);
+				db.DropDatabase();
+			}
 		}
 
 		#endregion