Merge branch 'NH-3588'

Author: oskarb

src/NHibernate/Dialect/FirebirdDialect.cs

@@ -128,6 +128,30 @@ public override SqlString GetLimitString(SqlString queryString, SqlString offset
 			return queryString.Insert(insertIndex, limitFragment.ToSqlString());
 		}
 
+		#region Temporaray Table Support
+
+		public override bool SupportsTemporaryTables
+		{
+			get { return true; }
+		}
+
+		public override string CreateTemporaryTableString
+		{
+			get { return "create global temporary table"; }
+		}
+
+		public override bool? PerformTemporaryTableDDLInIsolation()
+		{
+			return true;
+		}
+
+		public override bool DropTemporaryTableAfterUse()
+		{
+			return true;
+		}
+
+		#endregion
+
 		private static int GetAfterSelectInsertPoint(SqlString text)
 		{
 			if (text.StartsWithCaseInsensitive("select"))

src/NHibernate/Hql/Ast/ANTLR/Exec/AbstractStatementExecutor.cs

@@ -1,18 +1,18 @@
 using System;
 using System.Data;
+using Antlr.Runtime;
 using Antlr.Runtime.Tree;
 using NHibernate.Action;
+using NHibernate.AdoNet.Util;
 using NHibernate.Engine;
 using NHibernate.Engine.Transaction;
 using NHibernate.Event;
 using NHibernate.Hql.Ast.ANTLR.Tree;
 using NHibernate.Persister.Entity;
 using NHibernate.SqlCommand;
-
-using Antlr.Runtime;
 using NHibernate.SqlTypes;
+using NHibernate.Transaction;
 using NHibernate.Util;
-using NHibernate.AdoNet.Util;
 
 namespace NHibernate.Hql.Ast.ANTLR.Exec
 {
@@ -142,8 +142,11 @@ protected virtual void CreateTemporaryTableIfNecessary(IQueryable persister, ISe
 			}
 			else
 			{
-				work.DoWork(session.ConnectionManager.GetConnection(), null);
-				session.ConnectionManager.AfterStatement();
+				using (var dummyCommand = session.ConnectionManager.CreateCommand())
+				{
+					work.DoWork(dummyCommand.Connection, dummyCommand.Transaction);
+					session.ConnectionManager.AfterStatement();
+				}
 			}
 		}
 
@@ -165,19 +168,25 @@ protected virtual void DropTemporaryTableIfNecessary(IQueryable persister, ISess
 
 				if (ShouldIsolateTemporaryTableDDL())
 				{
-					if (Factory.Settings.IsDataDefinitionInTransactionSupported)
-					{
-						Isolater.DoIsolatedWork(work, session);
-					}
-					else
+					session.ConnectionManager.Transaction.RegisterSynchronization(new AfterTransactionCompletes((success) =>
 					{
-						Isolater.DoNonTransactedWork(work, session);
-					}
+						if (Factory.Settings.IsDataDefinitionInTransactionSupported)
+						{
+							Isolater.DoIsolatedWork(work, session);
+						}
+						else
+						{
+							Isolater.DoNonTransactedWork(work, session);
+						}
+					}));
 				}
 				else
 				{
-					work.DoWork(session.ConnectionManager.GetConnection(), null);
-					session.ConnectionManager.AfterStatement();
+					using (var dummyCommand = session.ConnectionManager.CreateCommand())
+					{
+						work.DoWork(dummyCommand.Connection, dummyCommand.Transaction);
+						session.ConnectionManager.AfterStatement();
+					}
 				}
 			}
 			else
@@ -229,7 +238,8 @@ public void DoWork(IDbConnection connection, IDbTransaction transaction)
 				IDbCommand stmnt = null;
 				try
 				{
-					stmnt = session.ConnectionManager.CreateCommand();
+					stmnt = connection.CreateCommand();
+					stmnt.Transaction = transaction;
 					stmnt.CommandText = persister.TemporaryIdTableDDL;
 					stmnt.ExecuteNonQuery();
 					session.Factory.Settings.SqlStatementLogger.LogCommand(stmnt, FormatStyle.Ddl);
@@ -273,7 +283,8 @@ public void DoWork(IDbConnection connection, IDbTransaction transaction)
 				IDbCommand stmnt = null;
 				try
 				{
-					stmnt = session.ConnectionManager.CreateCommand();
+					stmnt = connection.CreateCommand();
+					stmnt.Transaction = transaction;
 					stmnt.CommandText = "drop table " + persister.TemporaryIdTableName;
 					stmnt.ExecuteNonQuery();
 					session.Factory.Settings.SqlStatementLogger.LogCommand(stmnt, FormatStyle.Ddl);

src/NHibernate/NHibernate.csproj

@@ -643,6 +643,7 @@
     <Compile Include="TransactionException.cs" />
     <Compile Include="Transaction\AdoNetWithDistributedTransactionFactory.cs" />
     <Compile Include="Transaction\AdoTransaction.cs" />
+    <Compile Include="Transaction\AfterTransactionCompletes.cs" />
     <Compile Include="Transaction\ITransactionFactory.cs" />
     <Compile Include="Transform\AliasToEntityMapResultTransformer.cs" />
     <Compile Include="Transform\DistinctRootEntityResultTransformer.cs" />

src/NHibernate/Transaction/AfterTransactionCompletes.cs

@@ -0,0 +1,41 @@
+using System;
+
+namespace NHibernate.Transaction
+{
+	public class AfterTransactionCompletes : ISynchronization
+	{
+		#region Fields
+
+		private readonly Action<bool> _whenCompleted;
+
+		#endregion
+
+		#region Constructors/Destructors
+
+		/// <summary>
+		/// Create an AfterTransactionCompletes that will execute the given delegate
+		/// when the transaction is completed. The action delegate will receive
+		/// the value 'true' if the transaction was completed successfully.
+		/// </summary>
+		/// <param name="whenCompleted"></param>
+		public AfterTransactionCompletes(Action<bool> whenCompleted)
+		{
+			_whenCompleted = whenCompleted;
+		}
+
+		#endregion
+
+		#region ISynchronization Members
+
+		public void BeforeCompletion()
+		{
+		}
+
+		public void AfterCompletion(bool success)
+		{
+			_whenCompleted(success);
+		}
+
+		#endregion
+	}
+}