Proper entity name retrieval

Author: bahusoid

src/NHibernate.Test/Async/Linq/LinqQuerySamples.cs

@@ -40,16 +40,25 @@ public void ShouldThrowForQueryOnNotMappedEntityAsync()
 		[Test]
 		public void ShouldThrowForQueryOnNotMappedEntityNameAsync()
 		{
-			var entityName = "NotMappedEntityName";
+			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()
 		{
-			var querySyntaxException = Assert.ThrowsAsync<QuerySyntaxException>(() => session.Query<NotMappedEntity>().DeleteAsync());
-			Assert.That(querySyntaxException.Message, Does.Contain(nameof(NotMappedEntity)));
+			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]

src/NHibernate.Test/Linq/LinqQuerySamples.cs

@@ -29,16 +29,24 @@ public void ShouldThrowForQueryOnNotMappedEntity()
 		[Test]
 		public void ShouldThrowForQueryOnNotMappedEntityName()
 		{
-			var entityName = "NotMappedEntityName";
+			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()
 		{
-			var querySyntaxException = Assert.Throws<QuerySyntaxException>(() => session.Query<NotMappedEntity>().Delete());
-			Assert.That(querySyntaxException.Message, Does.Contain(nameof(NotMappedEntity)));
+			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]

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

@@ -35,13 +35,16 @@ private IASTNode[] Process()
 
             var parsers = DuplicateTree();
 
-            if (parsers.Length == 0)
-                throw new QuerySyntaxException(
-                    _nodeMapping.Keys.Count == 1
-                        ? _nodeMapping.First().Key + " is not mapped"
-                        : string.Join(", ", _nodeMapping.Keys) + " are not mapped");
+			if (parsers.Length == 0)
+			{
+				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;
+			return parsers;
         }
 
         private IASTNode[] DuplicateTree()

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)
 			{