Fix querying cases

Author: fredericDelaporte

src/NHibernate/Async/Impl/StatelessSessionImpl.cs

@@ -95,6 +95,10 @@ public override async Task ListAsync(IQueryExpression queryExpression, QueryPara
 			cancellationToken.ThrowIfCancellationRequested();
 			using (BeginProcess())
 			{
+				// We need to flush the batcher. Otherwise it may have pending operations which will not already have reached the database,
+				// and the query may yield stale data.
+				await (FlushAsync(cancellationToken)).ConfigureAwait(false);
+
 				queryParameters.ValidateParameters();
 				var plan = GetHQLQueryPlan(queryExpression, false);
 
@@ -127,6 +131,10 @@ public override async Task<IList<T>> ListAsync<T>(CriteriaImpl criteria, Cancell
 			cancellationToken.ThrowIfCancellationRequested();
 			using (BeginProcess())
 			{
+				// We need to flush the batcher. Otherwise it may have pending operations which will not already have reached the database,
+				// and the query may yield stale data.
+				await (FlushAsync(cancellationToken)).ConfigureAwait(false);
+
 				string[] implementors = Factory.GetImplementors(criteria.EntityOrClassName);
 				int size = implementors.Length;
 
@@ -252,6 +260,10 @@ public override async Task ListCustomQueryAsync(ICustomQuery customQuery, QueryP
 			cancellationToken.ThrowIfCancellationRequested();
 			using (BeginProcess())
 			{
+				// We need to flush the batcher. Otherwise it may have pending operations which will not already have reached the database,
+				// and the query may yield stale data.
+				await (FlushAsync(cancellationToken)).ConfigureAwait(false);
+
 				var loader = new CustomLoader(customQuery, Factory);
 
 				var success = false;
@@ -488,6 +500,10 @@ public async Task ManagedCloseAsync(CancellationToken cancellationToken)
 			cancellationToken.ThrowIfCancellationRequested();
 			using (BeginProcess())
 			{
+				// We need to flush the batcher. Otherwise it may have pending operations which will not already have reached the database,
+				// and the get may miss an entity which should be there.
+				await (FlushAsync(cancellationToken)).ConfigureAwait(false);
+
 				object result = await (Factory.GetEntityPersister(entityName).LoadAsync(id, null, lockMode ?? LockMode.None, this, cancellationToken)).ConfigureAwait(false);
 				if (temporaryPersistenceContext.IsLoadFinished)
 				{
@@ -563,6 +579,10 @@ public async Task ManagedCloseAsync(CancellationToken cancellationToken)
 			cancellationToken.ThrowIfCancellationRequested();
 			using (BeginProcess())
 			{
+				// We need to flush the batcher. Otherwise it may have pending operations which will not already have reached the database,
+				// and the query may yield stale data.
+				await (FlushAsync(cancellationToken)).ConfigureAwait(false);
+
 				IEntityPersister persister = GetEntityPersister(entityName, entity);
 				object id = persister.GetIdentifier(entity);
 				if (log.IsDebugEnabled())

src/NHibernate/Impl/StatelessSessionImpl.cs

@@ -110,6 +110,10 @@ public override void List(IQueryExpression queryExpression, QueryParameters quer
 		{
 			using (BeginProcess())
 			{
+				// We need to flush the batcher. Otherwise it may have pending operations which will not already have reached the database,
+				// and the query may yield stale data.
+				Flush();
+
 				queryParameters.ValidateParameters();
 				var plan = GetHQLQueryPlan(queryExpression, false);
 
@@ -140,6 +144,10 @@ public override IList<T> List<T>(CriteriaImpl criteria)
 		{
 			using (BeginProcess())
 			{
+				// We need to flush the batcher. Otherwise it may have pending operations which will not already have reached the database,
+				// and the query may yield stale data.
+				Flush();
+
 				string[] implementors = Factory.GetImplementors(criteria.EntityOrClassName);
 				int size = implementors.Length;
 
@@ -267,6 +275,10 @@ public override void ListCustomQuery(ICustomQuery customQuery, QueryParameters q
 		{
 			using (BeginProcess())
 			{
+				// We need to flush the batcher. Otherwise it may have pending operations which will not already have reached the database,
+				// and the query may yield stale data.
+				Flush();
+
 				var loader = new CustomLoader(customQuery, Factory);
 
 				var success = false;
@@ -351,7 +363,7 @@ public override bool IsOpen
 
 		public override FlushMode FlushMode
 		{
-			get { return FlushMode.Commit; }
+			get { return FlushMode.Always; }
 			set { throw new NotSupportedException(); }
 		}
 
@@ -568,6 +580,10 @@ public object Get(string entityName, object id, LockMode lockMode)
 		{
 			using (BeginProcess())
 			{
+				// We need to flush the batcher. Otherwise it may have pending operations which will not already have reached the database,
+				// and the get may miss an entity which should be there.
+				Flush();
+
 				object result = Factory.GetEntityPersister(entityName).Load(id, null, lockMode ?? LockMode.None, this);
 				if (temporaryPersistenceContext.IsLoadFinished)
 				{
@@ -631,6 +647,10 @@ public void Refresh(string entityName, object entity, LockMode lockMode)
 		{
 			using (BeginProcess())
 			{
+				// We need to flush the batcher. Otherwise it may have pending operations which will not already have reached the database,
+				// and the query may yield stale data.
+				Flush();
+
 				IEntityPersister persister = GetEntityPersister(entityName, entity);
 				object id = persister.GetIdentifier(entity);
 				if (log.IsDebugEnabled())