Merge 5.3.16 into 5.4.x

Author: fredericDelaporte

releasenotes.txt

@@ -209,6 +209,23 @@ Release notes - NHibernate - Version 5.4.0
    * #2242 Test case for NH-3972 - SQL error when selecting a column of a subclass when sibling classes have a column of the same name
 
 
+Build 5.3.16
+=============================
+
+Release notes - NHibernate - Version 5.3.16
+
+3 issues were resolved in this release.
+
+** Bug
+
+   * #3269 "Or" clause in a "where" condition returns a wrong result with not-found-ignore
+   * #3210 Wrong name value for L2 read-only cache warning on mutable
+
+** Task
+
+   * #3276 Release 5.3.16
+
+
 Build 5.3.15
 =============================
 

src/NHibernate.Test/Async/Hql/EntityJoinHqlTest.cs

@@ -358,6 +358,15 @@ from x2 in session.Query<NullableOwner>()
 				//GH-2988
 				var withNullOrValidList = await (session.Query<NullableOwner>().Where(x => x.ManyToOne.Id == validManyToOne.Id || x.ManyToOne == null).ToListAsync());
 				var withNullOrValidList2 = await (session.Query<NullableOwner>().Where(x =>  x.ManyToOne == null || x.ManyToOne.Id == validManyToOne.Id).ToListAsync());
+				//GH-3269
+				var invalidId = Guid.NewGuid();
+				var withInvalidOrValid = await (session.Query<NullableOwner>().Where(x => x.OneToOne.Id == invalidId || x.ManyToOne.Id == validManyToOne.Id).ToListAsync());
+				var withInvalidOrNull = await (session.Query<NullableOwner>().Where(x => x.ManyToOne.Id == invalidId || x.OneToOne == null).ToListAsync());
+				var withInvalidOrNotNull = await (session.Query<NullableOwner>().Where(x => x.ManyToOne.Id == invalidId || x.OneToOne != null).ToListAsync());
+
+				Assert.That(withInvalidOrValid.Count, Is.EqualTo(1));
+				Assert.That(withInvalidOrNull.Count, Is.EqualTo(2));
+				Assert.That(withInvalidOrNotNull.Count, Is.EqualTo(0));
 
 				//GH-3185
 				var mixImplicitAndLeftJoinList = await (session.Query<NullableOwner>().Where(x => x.ManyToOne.Id == validManyToOne.Id && x.OneToOne == null).ToListAsync());

src/NHibernate.Test/Hql/EntityJoinHqlTest.cs

@@ -346,6 +346,15 @@ from x2 in session.Query<NullableOwner>()
 				//GH-2988
 				var withNullOrValidList = session.Query<NullableOwner>().Where(x => x.ManyToOne.Id == validManyToOne.Id || x.ManyToOne == null).ToList();
 				var withNullOrValidList2 = session.Query<NullableOwner>().Where(x =>  x.ManyToOne == null || x.ManyToOne.Id == validManyToOne.Id).ToList();
+				//GH-3269
+				var invalidId = Guid.NewGuid();
+				var withInvalidOrValid = session.Query<NullableOwner>().Where(x => x.OneToOne.Id == invalidId || x.ManyToOne.Id == validManyToOne.Id).ToList();
+				var withInvalidOrNull = session.Query<NullableOwner>().Where(x => x.ManyToOne.Id == invalidId || x.OneToOne == null).ToList();
+				var withInvalidOrNotNull = session.Query<NullableOwner>().Where(x => x.ManyToOne.Id == invalidId || x.OneToOne != null).ToList();
+
+				Assert.That(withInvalidOrValid.Count, Is.EqualTo(1));
+				Assert.That(withInvalidOrNull.Count, Is.EqualTo(2));
+				Assert.That(withInvalidOrNotNull.Count, Is.EqualTo(0));
 
 				//GH-3185
 				var mixImplicitAndLeftJoinList = session.Query<NullableOwner>().Where(x => x.ManyToOne.Id == validManyToOne.Id && x.OneToOne == null).ToList();

src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs

@@ -43,7 +43,6 @@ public partial class HqlSqlWalker
 		private SelectClause _selectClause;
 		private readonly AliasGenerator _aliasGenerator = new AliasGenerator();
 		private readonly ASTPrinter _printer = new ASTPrinter();
-		private bool _isNullComparison;
 
 		//
 		//Maps each top-level result variable to its SelectExpression;
@@ -1318,8 +1317,6 @@ public IASTFactory ASTFactory
 			}
 		}
 
-		internal bool IsNullComparison => _isNullComparison;
-
 		public void AddQuerySpaces(IEntityPersister persister)
 		{
 			AddPersister(persister);

src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g

@@ -391,7 +391,7 @@ comparisonExpr
 	| ^(NOT_BETWEEN exprOrSubquery exprOrSubquery exprOrSubquery)
 	| ^(IN exprOrSubquery inRhs )
 	| ^(NOT_IN exprOrSubquery inRhs )
-	| ^(IS_NULL { _isNullComparison = true; } exprOrSubquery { _isNullComparison = false; })
+	| ^(IS_NULL exprOrSubquery)
 	| ^(IS_NOT_NULL exprOrSubquery)
 //	| ^(IS_TRUE expr)
 //	| ^(IS_FALSE expr)

src/NHibernate/Hql/Ast/ANTLR/Tree/DotNode.cs

@@ -426,8 +426,7 @@ private void DereferenceEntity(EntityType entityType, bool implicitJoin, string
 
 			if ( joinIsNeeded )
 			{
-				var forceLeftJoin = comparisonWithNullableEntity && Walker.IsNullComparison;
-				DereferenceEntityJoin(classAlias, entityType, implicitJoin, parent, forceLeftJoin);
+				DereferenceEntityJoin(classAlias, entityType, implicitJoin, parent, comparisonWithNullableEntity);
 				if (comparisonWithNullableEntity)
 				{
 					_columns = FromElement.GetIdentityColumns();

src/NHibernate/Impl/SessionFactoryImpl.cs

@@ -277,6 +277,7 @@ public SessionFactoryImpl(Configuration cfg, IMapping mapping, Settings settings
 					model.RootClazz.CacheRegionName,
 					model.CacheConcurrencyStrategy,
 					model.IsMutable,
+					model.EntityName,
 					caches);
 				var cp = PersisterFactory.CreateClassPersister(model, cache, this, mapping);
 				entityPersisters[model.EntityName] = cp;
@@ -302,6 +303,7 @@ public SessionFactoryImpl(Configuration cfg, IMapping mapping, Settings settings
 					model.CacheRegionName,
 					model.CacheConcurrencyStrategy,
 					model.Owner.IsMutable,
+					model.OwnerEntityName,
 					caches);
 				var persister = PersisterFactory.CreateCollectionPersister(model, cache, this);
 				collectionPersisters[model.Role] = persister;
@@ -463,10 +465,10 @@ private IQueryCache BuildQueryCache(string queryCacheName)
 					properties);
 		}
 
-		private ICacheConcurrencyStrategy GetCacheConcurrencyStrategy(
-			string cacheRegion,
+		private ICacheConcurrencyStrategy GetCacheConcurrencyStrategy(string cacheRegion,
 			string strategy,
 			bool isMutable,
+			string entityName,
 			Dictionary<Tuple<string, string>, ICacheConcurrencyStrategy> caches)
 		{
 			if (strategy == null || strategy == CacheFactory.Never || !settings.IsSecondLevelCacheEnabled)
@@ -479,7 +481,7 @@ private ICacheConcurrencyStrategy GetCacheConcurrencyStrategy(
 			cache = CacheFactory.CreateCache(strategy, GetCache(cacheRegion), settings);
 			caches.Add(cacheKey, cache);
 			if (isMutable && strategy == CacheFactory.ReadOnly)
-				log.Warn("read-only cache configured for mutable: {0}", name);
+				log.Warn("read-only cache configured for mutable: {0}", entityName);
 
 			return cache;
 		}