- Minors: preparing for Transaction and AdoNet context.

- Minors in tests.

SVN: trunk@3462

Author: darioquintana

src/NHibernate.Test/NHSpecificTest/NH1054/DummyTransactionFactory.cs

@@ -1,6 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
+using NHibernate.AdoNet;
+using NHibernate.Transaction;
 
 namespace NHibernate.Test.NHSpecificTest.NH1054
 {
@@ -15,5 +15,16 @@ ITransaction NHibernate.Transaction.ITransactionFactory.CreateTransaction(NHiber
 		{
 			return null;
 		}
+
+		public ConnectionReleaseMode DefaultReleaseMode
+		{
+			get { throw new NotImplementedException(); }
+		}
+
+		public bool IsTransactionInProgress(AdoNetContext adoNetContext, ITransactionContext transactionContext,
+		                                    ITransaction transaction)
+		{
+			throw new NotImplementedException();
+		}
 	}
 }

src/NHibernate/ConnectionReleaseMode.cs

@@ -1,9 +1,8 @@
-using System;
-
 namespace NHibernate
 {
 	public enum ConnectionReleaseMode
 	{
+		AfterStatement,
 		AfterTransaction,
 		OnClose
 

src/NHibernate/Transaction/AdoNetTransactionFactory.cs

@@ -1,4 +1,5 @@
 using System.Collections;
+using NHibernate.AdoNet;
 using NHibernate.Engine;
 
 namespace NHibernate.Transaction
@@ -13,5 +14,16 @@ public ITransaction CreateTransaction(ISessionImplementor session)
 		public void Configure(IDictionary props)
 		{
 		}
+
+		public ConnectionReleaseMode DefaultReleaseMode
+		{
+			get { throw new System.NotImplementedException(); }
+		}
+
+		public bool IsTransactionInProgress(AdoNetContext adoNetContext, ITransactionContext transactionContext,
+		                                    ITransaction transaction)
+		{
+			throw new System.NotImplementedException();
+		}
 	}
 }

src/NHibernate/Transaction/ITransactionFactory.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using NHibernate;
+using NHibernate.AdoNet;
 using NHibernate.Engine;
 
 namespace NHibernate.Transaction
@@ -24,5 +25,26 @@ public interface ITransactionFactory
 		/// Create a new transaction and return it without starting it.
 		/// </summary>
 		ITransaction CreateTransaction(ISessionImplementor session);
+
+		/// <summary>
+		/// Get the default connection release mode
+		/// </summary>
+		ConnectionReleaseMode DefaultReleaseMode { get; }
+
+		//TODO: do we need this?
+		//bool IsTransactionManagerRequired { get; }
+
+		//TODO: do we need this?
+		//bool AreCallbacksLocalToHibernateTransactions { get; }
+
+		/// <summary>
+		/// Determine whether an underlying transaction is in progress.
+		///
+		/// Mainly this is used in determining whether to register a
+		/// synchronization as well as whether or not to circumvent
+		/// auto flushing outside transactions. 
+		/// </summary>
+		/// <returns>true if an underlying transaction is know to be in effect.</returns>
+		bool IsTransactionInProgress(AdoNetContext adoNetContext, ITransactionContext transactionContext, ITransaction transaction);
 	}
 }