[WIP] Try fix ODP.NET DTC issues

src/NHibernate.Test/ConnectionTest/AggressiveReleaseTest.cs

@@ -192,7 +192,7 @@ public void SuppliedConnection()
 			session.Flush();
 
 			Release(session);
-			originalConnection.Close();
+			sessions.ConnectionProvider.CloseConnection(originalConnection);
 			Done();
 		}
 
@@ -245,4 +245,4 @@ public void ConnectionMaintanenceDuringFlush()
 			Done();
 		}
 	}
-}
+}

src/NHibernate.Test/DialectTest/DialectFixture.cs

@@ -159,18 +159,24 @@ public void CurrentTimestampSelection()
 			sessions.ConnectionProvider.Configure(conf.Properties);
 			IDriver driver = sessions.ConnectionProvider.Driver;
 
-			using (IDbConnection connection = sessions.ConnectionProvider.GetConnection())
+			var connection = sessions.ConnectionProvider.GetConnection();
+			try
 			{
-				IDbCommand statement = driver.GenerateCommand(CommandType.Text, new SqlString(dialect.CurrentTimestampSelectString),
-															  new SqlType[0]);
+				IDbCommand statement = driver.GenerateCommand(
+					CommandType.Text,
+					new SqlString(dialect.CurrentTimestampSelectString),
+					new SqlType[0]);
 				statement.Connection = connection;
 				using (IDataReader reader = statement.ExecuteReader())
 				{
 					Assert.That(reader.Read(), "should return one record");
 					Assert.That(reader[0], Is.InstanceOf<DateTime>());
 				}
 			}
+			finally
+			{
+				sessions.ConnectionProvider.CloseConnection(connection);
+			}
 		}
-
 	}
-}
+}

src/NHibernate.Test/DriverTest/FirebirdClientDriverFixture.cs

@@ -16,24 +16,25 @@ public class FirebirdClientDriverFixture
 		public void ConnectionPooling_OpenThenCloseThenOpenAnotherOne_OnlyOneConnectionIsPooled()
 		{
 			MakeDriver();
-			var connection1 = MakeConnection();
-			var connection2 = MakeConnection();
+			using (var connection1 = MakeConnection())
+			using (var connection2 = MakeConnection())
+			{
+				connection1.Open();
+				VerifyCountOfEstablishedConnectionsIs(1);
 
-			//open first connection
-			connection1.Open();
-			VerifyCountOfEstablishedConnectionsIs(1);
+				//return it to the pool
+				connection1.Close();
+				VerifyCountOfEstablishedConnectionsIs(1);
 
-			//return it to the pool
-			connection1.Close();
-			VerifyCountOfEstablishedConnectionsIs(1);
+				//open the second connection
+				connection2.Open();
+				VerifyCountOfEstablishedConnectionsIs(1);
 
-			//open the second connection
-			connection2.Open();
-			VerifyCountOfEstablishedConnectionsIs(1);
+				//return it to the pool
+				connection2.Close();
 
-			//return it to the pool
-			connection2.Close();
-			VerifyCountOfEstablishedConnectionsIs(1);
+				VerifyCountOfEstablishedConnectionsIs(1);
+			}
 		}
 
 		[Test]

src/NHibernate.Test/Legacy/FooBarTest.cs

@@ -4978,20 +4978,27 @@ public void AutoFlushCollections()
 		public void UserProvidedConnection()
 		{
 			IConnectionProvider prov = ConnectionProviderFactory.NewConnectionProvider(cfg.Properties);
-			ISession s = sessions.OpenSession(prov.GetConnection());
-			ITransaction tx = s.BeginTransaction();
-			s.CreateQuery("from foo in class NHibernate.DomainModel.Fo").List();
-			tx.Commit();
+			var conn = prov.GetConnection();
+			try
+			{
+				ISession s = sessions.OpenSession(conn);
+				ITransaction tx = s.BeginTransaction();
+				s.CreateQuery("from foo in class NHibernate.DomainModel.Fo").List();
+				tx.Commit();
 
-			IDbConnection c = s.Disconnect();
-			Assert.IsNotNull(c);
+				IDbConnection c = s.Disconnect();
+				Assert.IsNotNull(c);
 
-			s.Reconnect(c);
-			tx = s.BeginTransaction();
-			s.CreateQuery("from foo in class NHibernate.DomainModel.Fo").List();
-			tx.Commit();
-			Assert.AreSame(c, s.Close());
-			c.Close();
+				s.Reconnect(c);
+				tx = s.BeginTransaction();
+				s.CreateQuery("from foo in class NHibernate.DomainModel.Fo").List();
+				tx.Commit();
+				Assert.AreSame(c, s.Close());
+			}
+			finally
+			{
+				prov.CloseConnection(conn);
+			}
 		}
 
 		[Test]

src/NHibernate.Test/Linq/LinqReadonlyTestsContext.cs

@@ -71,7 +71,8 @@ private void ExecuteScriptFile(Configuration configuration, string scripFileName
 			var file = new FileInfo(scripFileName);
 			string script = file.OpenText().ReadToEnd().Replace("GO", "");
 			var connectionProvider = ConnectionProviderFactory.NewConnectionProvider(configuration.GetDerivedProperties());
-			using (var conn = connectionProvider.GetConnection())
+			var conn = connectionProvider.GetConnection();
+			try
 			{
 				if (conn.State == ConnectionState.Closed)
 				{
@@ -83,6 +84,10 @@ private void ExecuteScriptFile(Configuration configuration, string scripFileName
 					command.ExecuteNonQuery();
 				}
 			}
+			finally
+			{
+				connectionProvider.CloseConnection(conn);
+			}
 		}
 
 		[TearDown]
@@ -143,4 +148,4 @@ private void CreateTestData(ISessionFactory sessionFactory)
 			}
 		}
 	}
-}
+}

src/NHibernate.Test/NHSpecificTest/NH2420/Fixture.cs

@@ -90,7 +90,7 @@ public void ShouldBeAbleToReleaseSuppliedConnectionAfterDistributedTransaction()
 			// fires *after* the transaction is committed and so it doesn't affect the success
 			// of the transaction.
 
-			Assert.That(s.IsConnected, Is.False);
+			Assert.That(() => s.IsConnected, Is.False.After(500, 100));
 			Assert.That(((ISessionImplementor)s).ConnectionManager.IsConnected, Is.False);
 			Assert.That(((ISessionImplementor)s).IsClosed, Is.True);
 		}

src/NHibernate.Test/NHSpecificTest/UserTypeFixture.cs

@@ -39,27 +39,32 @@ public void InsertNull()
 			// manually read from the db
 			IConnectionProvider provider = ConnectionProviderFactory.NewConnectionProvider(cfg.Properties);
 			IDbConnection conn = provider.GetConnection();
-			IDbCommand cmd = conn.CreateCommand();
-			cmd.Connection = conn;
-			cmd.CommandText = "select * from usertype";
+			try
+			{
+				IDbCommand cmd = conn.CreateCommand();
+				cmd.Connection = conn;
+				cmd.CommandText = "select * from usertype";
 
-			IDataReader reader = cmd.ExecuteReader();
+				IDataReader reader = cmd.ExecuteReader();
 
-			while (reader.Read())
+				while (reader.Read())
+				{
+					Assert.AreEqual(5, reader[0]);
+					Assert.AreEqual(4, reader[1]);
+					Assert.AreEqual(DBNull.Value, reader[2]);
+					break;
+				}
+			}
+			finally
 			{
-				Assert.AreEqual(5, reader[0]);
-				Assert.AreEqual(4, reader[1]);
-				Assert.AreEqual(DBNull.Value, reader[2]);
-				break;
+				provider.CloseConnection(conn);
 			}
 
-			conn.Close();
-
 			using (ISession s = OpenSession())
 			{
 				s.Delete("from ClassWithNullColumns");
 				s.Flush();
 			}
 		}
 	}
-}
+}

src/NHibernate.Test/SystemTransactions/TransactionNotificationFixture.cs

@@ -161,13 +161,12 @@ public void ShouldNotifyAfterDistributedTransactionWithOwnConnection(bool doComm
 
 			using (var tx = new TransactionScope())
 			{
-				IDbConnection ownConnection1 = sessions.ConnectionProvider.GetConnection();
-
+				var ownConnection = sessions.ConnectionProvider.GetConnection();
 				try
 				{
 					try
 					{
-						s1 = sessions.OpenSession(ownConnection1, interceptor);
+						s1 = sessions.OpenSession(ownConnection, interceptor);
 
 						s1.CreateCriteria<object>().List();
 					}
@@ -182,7 +181,7 @@ public void ShouldNotifyAfterDistributedTransactionWithOwnConnection(bool doComm
 				}
 				finally
 				{
-					sessions.ConnectionProvider.CloseConnection(ownConnection1);
+					sessions.ConnectionProvider.CloseConnection(ownConnection);
 				}
 			}
 
@@ -191,6 +190,5 @@ public void ShouldNotifyAfterDistributedTransactionWithOwnConnection(bool doComm
 
 			Assert.That(interceptor.afterTransactionCompletionCalled, Is.EqualTo(1));
 		}
-
 	}
-}
+}

src/NHibernate.Test/TestCase.cs

@@ -207,14 +207,15 @@ protected virtual bool CheckDatabaseWasCleaned()
 
 		private bool CheckConnectionsWereClosed()
 		{
-			if (connectionProvider == null || !connectionProvider.HasOpenConnections)
-			{
+			if (connectionProvider == null)
 				return true;
-			}
 
-			log.Error("Test case didn't close all open connections, closing");
+			var hasOpenConnections = connectionProvider.HasOpenConnections;
+			if (hasOpenConnections)
+				log.Error("Test case didn't close all open connections, closing");
+
 			connectionProvider.CloseAllConnections();
-			return false;
+			return !hasOpenConnections;
 		}
 
 		private void Configure()
@@ -275,7 +276,7 @@ public int ExecuteStatement(string sql)
 
 			using (IConnectionProvider prov = ConnectionProviderFactory.NewConnectionProvider(cfg.Properties))
 			{
-				IDbConnection conn = prov.GetConnection();
+				var conn = prov.GetConnection();
 
 				try
 				{

src/NHibernate.Test/TransactionTest/TransactionNotificationFixture.cs

@@ -96,7 +96,8 @@ public void ShouldNotifyAfterTransactionWithOwnConnection(bool usePrematureClose
 			var interceptor = new RecordingInterceptor();
 			ISession s;
 
-			using (IDbConnection ownConnection = sessions.ConnectionProvider.GetConnection())
+			var ownConnection = sessions.ConnectionProvider.GetConnection();
+			try
 			{
 				using (s = sessions.OpenSession(ownConnection, interceptor))
 				using (s.BeginTransaction())
@@ -108,9 +109,13 @@ public void ShouldNotifyAfterTransactionWithOwnConnection(bool usePrematureClose
 						s.Close();
 				}
 			}
+			finally
+			{
+				sessions.ConnectionProvider.CloseConnection(ownConnection);
+			}
 
 			Assert.That(s.IsOpen, Is.False);
 			Assert.That(interceptor.afterTransactionCompletionCalled, Is.EqualTo(1));
 		}
 	}
-}
+}

src/NHibernate/AdoNet/AbstractBatcher.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Data.Common;
 using System.Diagnostics;
 using System.Threading;
 
@@ -358,8 +359,11 @@ public void CloseReader(IDataReader reader)
 			var actualReader = rsw == null ? reader : rsw.Target;
 			_readersToClose.Remove(actualReader);
 
+			var duration = GetReaderStopwatch(actualReader);
+
 			try
 			{
+                //TODO: Shouldn't we close reader instead?
 				reader.Dispose();
 			}
 			catch (Exception e)
@@ -369,17 +373,24 @@ public void CloseReader(IDataReader reader)
 			}
 
 			LogCloseReader();
+			LogDuration(duration);
+		}
 
-			if (!Log.IsDebugEnabled)
-				return;
-
-			var nhReader = actualReader as NHybridDataReader;
-			actualReader = nhReader == null ? actualReader : nhReader.Target;
+		private Stopwatch GetReaderStopwatch(IDataReader reader)
+		{
+			var nhReader = reader as NHybridDataReader;
+			var actualReader = nhReader == null ? reader : nhReader.Target;
 
 			Stopwatch duration;
-			if (_readersDuration.TryGetValue(actualReader, out duration) == false)
-				return;
-			_readersDuration.Remove(actualReader);
+			if (_readersDuration.TryGetValue(actualReader, out duration))
+				_readersDuration.Remove(actualReader);
+			return duration;
+		}
+
+		private static void LogDuration(Stopwatch duration)
+		{
+			if (!Log.IsDebugEnabled || duration == null) return;
+
 			Log.DebugFormat("DataReader was closed after {0} ms", duration.ElapsedMilliseconds);
 		}
 

src/NHibernate/Dialect/Dialect.cs

@@ -2238,7 +2238,7 @@ public virtual bool IsKnownToken(string currentToken, string nextToken)
 
 		protected void RegisterKeyword(string word)
 		{
-			Keywords.Add(word);
+			_sqlKeywords.Add(word);
 		}
 
 		protected void RegisterFunction(string name, ISQLFunction function)