Never cached entities/collections cannot be used in a cacheable query default true it could be disabled via query.throw_never_cached option

Author: [email protected]

src/NHibernate/Cfg/Environment.cs

@@ -175,6 +175,8 @@ public static string Version
 		/// <summary> Should named queries be checked during startup (the default is enabled). </summary>
 		/// <remarks>Mainly intended for test environments.</remarks>
 		public const string QueryStartupChecking = "query.startup_check";
+		/// <summary> Should never cached entity/collecion query cache throws exception(the default is enabled). /// </summary>
+		public const string QueryThrowNeverCached = "query.throw_never_cached";
 
 		/// <summary> Enable statistics collection</summary>
 		public const string GenerateStatistics = "generate_statistics";

src/NHibernate/Cfg/Settings.cs

@@ -139,6 +139,8 @@ public Settings()
 		/// </summary>
 		public bool ThrowOnSchemaUpdate { get; internal set; }
 
+		public bool QueryThrowNeverCached { get; internal set; }
+
 		#region NH specific
 
 		public IsolationLevel IsolationLevel { get; internal set; }

src/NHibernate/Cfg/SettingsFactory.cs

@@ -292,7 +292,11 @@ public Settings BuildSettings(IDictionary<string, string> properties)
 			bool namedQueryChecking = PropertiesHelper.GetBoolean(Environment.QueryStartupChecking, properties, true);
 			log.Info("Named query checking : {0}", EnabledDisabled(namedQueryChecking));
 			settings.IsNamedQueryStartupCheckingEnabled = namedQueryChecking;
-			
+
+			bool queryThrowNeverCached = PropertiesHelper.GetBoolean(Environment.QueryThrowNeverCached, properties, true);
+			log.Info("Never cached entities/collections query cache throws exception : {0}", EnabledDisabled(queryThrowNeverCached));
+			settings.QueryThrowNeverCached = queryThrowNeverCached;
+
 			// Not ported - settings.StatementFetchSize = statementFetchSize;
 			// Not ported - ScrollableResultSetsEnabled
 			// Not ported - GetGeneratedKeysEnabled

src/NHibernate/Loader/Loader.cs

@@ -1838,12 +1838,19 @@ internal bool IsCacheable(QueryParameters queryParameters, bool supportsQueryCac
 			bool isCacheable = Factory.Settings.IsQueryCacheEnabled && queryParameters.Cacheable;
 			if (isCacheable && !supportsQueryCache)
 			{
-				throw new QueryException(
-					$"Never cached entities/collections: {string.Join(", ", persisters.Where(o => !o.SupportsQueryCache).Select(o => o.Name))} " +
-					$"cannot be used in a cacheable query.");
+				if (Factory.Settings.QueryThrowNeverCached)
+				{
+					throw new QueryException(
+						$"Never cached entities/collections: {string.Join(", ", persisters.Where(o => !o.SupportsQueryCache).Select(o => o.Name))} " +
+						$"cannot be used in a cacheable query.");
+				}
+				else if (Log.IsWarnEnabled())
+				{
+					Log.Warn("Never cached entities/collections: {0} cannot be used in a cacheable query.", string.Join(", ", persisters.Where(o => !o.SupportsQueryCache).Select(o => o.Name)));
+				}
 			}
 
-			return isCacheable;
+			return isCacheable && supportsQueryCache;
 		}
 
 		private IList ListIgnoreQueryCache(ISessionImplementor session, QueryParameters queryParameters)