Throw for LINQ queries on unmapped entities (#2504)

bahusoid · web-flow · commit 73d98541a092 · 2020-09-08T09:11:17.000Z
Fixes #1106
diff --git a/src/NHibernate.Test/Async/Linq/FunctionTests.cs b/src/NHibernate.Test/Async/Linq/FunctionTests.cs
@@ -367,16 +367,6 @@ where item.Id.Equals(-1)
 			await (ObjectDumper.WriteAsync(query));
 		}
 
-		[Test]
-		public async Task WhereShortEqualAsync()
-		{
-			var query = from item in session.Query<Foo>()
-						where item.Short.Equals(-1)
-						select item;
-
-			await (ObjectDumper.WriteAsync(query));
-		}
-
 		[Test]
 		public async Task WhereBoolConstantEqualAsync()
 		{
@@ -458,36 +448,6 @@ where item.BodyWeight.Equals(-1)
 
 			await (ObjectDumper.WriteAsync(query));
 		}	
-	
-		[Test]
-		public async Task WhereFloatEqualAsync()
-		{
-			var query = from item in session.Query<Foo>()
-						where item.Float.Equals(-1)
-						select item;
-
-			await (ObjectDumper.WriteAsync(query));
-		}	
-
-		[Test]
-		public async Task WhereCharEqualAsync()
-		{
-			var query = from item in session.Query<Foo>()
-						where item.Char.Equals('A')
-						select item;
-
-			await (ObjectDumper.WriteAsync(query));
-		}
-
-		[Test]
-		public async Task WhereByteEqualAsync()
-		{
-			var query = from item in session.Query<Foo>()
-						where item.Byte.Equals(1)
-						select item;
-
-			await (ObjectDumper.WriteAsync(query));
-		}
 
 		[Test]
 		public async Task WhereDecimalEqualAsync()
diff --git a/src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs b/src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs
@@ -13,16 +13,54 @@
 using System.Collections.Generic;
 using System.Linq;
 using NHibernate.DomainModel.Northwind.Entities;
+using NHibernate.Hql.Ast.ANTLR;
+using NHibernate.Linq;
 using NSubstitute;
 using NUnit.Framework;
-using NHibernate.Linq;
 
 namespace NHibernate.Test.Linq
 {
 	using System.Threading.Tasks;
 	[TestFixture]
 	public class LinqQuerySamplesAsync : LinqTestCase
 	{
+		class NotMappedEntity
+		{
+			public virtual int Id { get; set; }
+			public virtual string Name { get; set; }
+		}
+
+		[Test]
+		public void ShouldThrowForQueryOnNotMappedEntityAsync()
+		{
+			var querySyntaxException = Assert.ThrowsAsync<QuerySyntaxException>(() => session.Query<NotMappedEntity>().Select(x => x.Id).ToListAsync());
+			Assert.That(querySyntaxException.Message, Does.Contain(nameof(NotMappedEntity)));
+		}
+
+		[Test]
+		public void ShouldThrowForQueryOnNotMappedEntityNameAsync()
+		{
+			var entityName = "SomeNamespace.NotMappedEntityName";
+			var querySyntaxException = Assert.ThrowsAsync<QuerySyntaxException>(() => session.Query<NotMappedEntity>(entityName).ToListAsync());
+			Assert.That(querySyntaxException.Message, Does.Contain(entityName));
+		}
+
+		[Test]
+		public void ShouldThrowForDmlQueryOnNotMappedEntityAsync()
+		{
+			Assert.Multiple(
+				() =>
+				{
+					var querySyntaxException = Assert.ThrowsAsync<QuerySyntaxException>(() => session.Query<NotMappedEntity>().DeleteAsync());
+					Assert.That(querySyntaxException.Message, Does.Contain(nameof(NotMappedEntity)));
+
+					var entityName = "SomeNamespace.NotMappedEntityName";
+					querySyntaxException = Assert.ThrowsAsync<QuerySyntaxException>(() => session.DeleteAsync($"from {entityName}"));
+					Assert.That(querySyntaxException.Message, Does.Contain(entityName));
+					return Task.CompletedTask;
+				});
+		}
+
 		[Test]
 		public async Task GroupTwoQueriesAndSumAsync()
 		{
diff --git a/src/NHibernate.Test/Linq/FunctionTests.cs b/src/NHibernate.Test/Linq/FunctionTests.cs
@@ -356,6 +356,7 @@ where item.Id.Equals(-1)
 		}
 
 		[Test]
+		[Ignore("Not mapped entity")]
 		public void WhereShortEqual()
 		{
 			var query = from item in session.Query<Foo>()
@@ -448,6 +449,7 @@ where item.BodyWeight.Equals(-1)
 		}	
 	
 		[Test]
+		[Ignore("Not mapped entity")]
 		public void WhereFloatEqual()
 		{
 			var query = from item in session.Query<Foo>()
@@ -458,6 +460,7 @@ where item.Float.Equals(-1)
 		}	
 
 		[Test]
+		[Ignore("Not mapped entity")]
 		public void WhereCharEqual()
 		{
 			var query = from item in session.Query<Foo>()
@@ -468,6 +471,7 @@ where item.Char.Equals('A')
 		}
 
 		[Test]
+		[Ignore("Not mapped entity")]
 		public void WhereByteEqual()
 		{
 			var query = from item in session.Query<Foo>()
diff --git a/src/NHibernate.Test/Linq/LinqQuerySamples.cs b/src/NHibernate.Test/Linq/LinqQuerySamples.cs
@@ -3,6 +3,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using NHibernate.DomainModel.Northwind.Entities;
+using NHibernate.Hql.Ast.ANTLR;
+using NHibernate.Linq;
 using NSubstitute;
 using NUnit.Framework;
 
@@ -11,6 +13,42 @@ namespace NHibernate.Test.Linq
 	[TestFixture]
 	public class LinqQuerySamples : LinqTestCase
 	{
+		class NotMappedEntity
+		{
+			public virtual int Id { get; set; }
+			public virtual string Name { get; set; }
+		}
+
+		[Test]
+		public void ShouldThrowForQueryOnNotMappedEntity()
+		{
+			var querySyntaxException = Assert.Throws<QuerySyntaxException>(() => session.Query<NotMappedEntity>().Select(x => x.Id).ToList());
+			Assert.That(querySyntaxException.Message, Does.Contain(nameof(NotMappedEntity)));
+		}
+
+		[Test]
+		public void ShouldThrowForQueryOnNotMappedEntityName()
+		{
+			var entityName = "SomeNamespace.NotMappedEntityName";
+			var querySyntaxException = Assert.Throws<QuerySyntaxException>(() => session.Query<NotMappedEntity>(entityName).ToList());
+			Assert.That(querySyntaxException.Message, Does.Contain(entityName));
+		}
+
+		[Test]
+		public void ShouldThrowForDmlQueryOnNotMappedEntity()
+		{
+			Assert.Multiple(
+				() =>
+				{
+					var querySyntaxException = Assert.Throws<QuerySyntaxException>(() => session.Query<NotMappedEntity>().Delete());
+					Assert.That(querySyntaxException.Message, Does.Contain(nameof(NotMappedEntity)));
+
+					var entityName = "SomeNamespace.NotMappedEntityName";
+					querySyntaxException = Assert.Throws<QuerySyntaxException>(() => session.Delete($"from {entityName}"));
+					Assert.That(querySyntaxException.Message, Does.Contain(entityName));
+				});
+		}
+
 		[Test]
 		public void GroupTwoQueriesAndSum()
 		{
diff --git a/src/NHibernate.Test/TestCase.cs b/src/NHibernate.Test/TestCase.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+using System.Linq;
 using System.Reflection;
 using log4net;
 using NHibernate.Cfg;
@@ -230,13 +231,20 @@ private string GetCombinedFailureMessage(TestContext.ResultAdapter result, strin
 
 		protected virtual bool CheckDatabaseWasCleaned()
 		{
-			if (Sfi.GetAllClassMetadata().Count == 0)
+			var allClassMetadata = Sfi.GetAllClassMetadata();
+			if (allClassMetadata.Count == 0)
 			{
 				// Return early in the case of no mappings, also avoiding
 				// a warning when executing the HQL below.
 				return true;
 			}
 
+			var explicitPolymorphismEntities = allClassMetadata.Values.Where(x => x is NHibernate.Persister.Entity.IQueryable queryable && queryable.IsExplicitPolymorphism).ToArray();
+
+			//TODO: Maybe add explicit load query checks 
+			if (explicitPolymorphismEntities.Length == allClassMetadata.Count)
+				return true;
+
 			bool empty;
 			using (ISession s = OpenSession())
 			{
diff --git a/src/NHibernate/Hql/Ast/ANTLR/AstPolymorphicProcessor.cs b/src/NHibernate/Hql/Ast/ANTLR/AstPolymorphicProcessor.cs
@@ -1,15 +1,15 @@
 ﻿using System.Collections.Generic;
-using System.Linq;
 using NHibernate.Engine;
 using NHibernate.Hql.Ast.ANTLR.Tree;
+using NHibernate.Util;
 
 namespace NHibernate.Hql.Ast.ANTLR
 {
     public class AstPolymorphicProcessor
     {
         private readonly IASTNode _ast;
         private readonly ISessionFactoryImplementor _factory;
-        private IEnumerable<KeyValuePair<IASTNode, IASTNode[]>> _nodeMapping;
+        private Dictionary<IASTNode, IASTNode[]> _nodeMapping;
 
         private AstPolymorphicProcessor(IASTNode ast, ISessionFactoryImplementor factory)
         {
@@ -29,28 +29,27 @@ private IASTNode[] Process()
             // Find all the polymorphic query sources
             _nodeMapping = new PolymorphicQuerySourceDetector(_factory).Process(_ast);
 
-            if (_nodeMapping.Count() > 0)
-            {
-                return DuplicateTree().ToArray();
-            }
-            else
+            if (_nodeMapping.Count == 0)
+                return new[] {_ast};
+
+            var parsers = DuplicateTree();
+
+            if (parsers.Length == 0)
             {
-                return new[] { _ast };
+                var entityNames = _nodeMapping.Keys.ToArray(x => PolymorphicQuerySourceDetector.GetClassName(x));
+                throw new QuerySyntaxException(
+                    entityNames.Length == 1
+                        ? entityNames[0] + " is not mapped"
+                        : string.Join(", ", entityNames) + " are not mapped");
             }
+
+            return parsers;
         }
 
-        private IEnumerable<IASTNode> DuplicateTree()
+        private IASTNode[] DuplicateTree()
         {
             var replacements = CrossJoinDictionaryArrays.PerformCrossJoin(_nodeMapping);
-
-            var dups = new IASTNode[replacements.Count()];
-
-            for (var i = 0; i < replacements.Count(); i++)
-            {
-                dups[i] = DuplicateTree(_ast, replacements[i]);
-            }
-
-            return dups;
+            return replacements.ToArray(x => DuplicateTree(_ast, x));
         }
 
         private static IASTNode DuplicateTree(IASTNode ast, IDictionary<IASTNode, IASTNode> nodeMapping)
@@ -72,4 +71,4 @@ private static IASTNode DuplicateTree(IASTNode ast, IDictionary<IASTNode, IASTNo
             return dup;
         }
     }
-}
+}
diff --git a/src/NHibernate/Hql/Ast/ANTLR/PolymorphicQuerySourceDetector.cs b/src/NHibernate/Hql/Ast/ANTLR/PolymorphicQuerySourceDetector.cs
@@ -45,7 +45,7 @@ private void AddImplementorsToMap(IASTNode querySource, string className, string
 					implementors.ToArray(implementor => MakeIdent(querySource, implementor)));
 		}
 
-		private static string GetClassName(IASTNode querySource)
+		internal static string GetClassName(IASTNode querySource)
 		{
 			switch (querySource.Type)
 			{

Original file line number	Diff line number	Diff line change
`@@ -356,6 +356,7 @@ where item.Id.Equals(-1)`
`356`	`356`	`}`
`357`	`357`
`358`	`358`	`[Test]`
	`359`	`+ [Ignore("Not mapped entity")]`
`359`	`360`	`public void WhereShortEqual()`
`360`	`361`	`{`
`361`	`362`	`var query = from item in session.Query<Foo>()`
`@@ -448,6 +449,7 @@ where item.BodyWeight.Equals(-1)`
`448`	`449`	`}`
`449`	`450`
`450`	`451`	`[Test]`
	`452`	`+ [Ignore("Not mapped entity")]`
`451`	`453`	`public void WhereFloatEqual()`
`452`	`454`	`{`
`453`	`455`	`var query = from item in session.Query<Foo>()`
`@@ -458,6 +460,7 @@ where item.Float.Equals(-1)`
`458`	`460`	`}`
`459`	`461`
`460`	`462`	`[Test]`
	`463`	`+ [Ignore("Not mapped entity")]`
`461`	`464`	`public void WhereCharEqual()`
`462`	`465`	`{`
`463`	`466`	`var query = from item in session.Query<Foo>()`
`@@ -468,6 +471,7 @@ where item.Char.Equals('A')`
`468`	`471`	`}`
`469`	`472`
`470`	`473`	`[Test]`
	`474`	`+ [Ignore("Not mapped entity")]`
`471`	`475`	`public void WhereByteEqual()`
`472`	`476`	`{`
`473`	`477`	`var query = from item in session.Query<Foo>()`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ private void AddImplementorsToMap(IASTNode querySource, string className, string`
`45`	`45`	`implementors.ToArray(implementor => MakeIdent(querySource, implementor)));`
`46`	`46`	`}`
`47`	`47`
`48`		`- private static string GetClassName(IASTNode querySource)`
	`48`	`+ internal static string GetClassName(IASTNode querySource)`
`49`	`49`	`{`
`50`	`50`	`switch (querySource.Type)`
`51`	`51`	`{`