fix regression/merge

Author: MaceWindu

Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs

@@ -144,10 +144,14 @@ static IEnumerable<InheritanceMappingAttribute> GetMappingAttributesRecursive(IE
 
 			List<InheritanceMappingAttribute> ProcessEntityType(IEntityType et)
 			{
-				mappings.Add(new()
+				if (!et.ClrType.IsAbstract)
 				{
-					Type = et.ClrType, Code = entityType.GetDiscriminatorValue()
-				});
+					mappings.Add(new()
+					{
+						Type = et.ClrType,
+						Code = entityType.GetDiscriminatorValue()
+					});
+				}
 
 				if (et.BaseType == null)
 					return mappings;

Tests/LinqToDB.EntityFrameworkCore.BaseTests/ForMappingTestsBase.cs

@@ -168,13 +168,14 @@ public virtual async Task TestInheritance()
 			using var context = CreateContext();
 			using var connection = context.CreateLinqToDBConnection();
 
+			context.WithInheritance.AddRange(new List<WithInheritanceA>() { new() { } });
 			context.WithInheritance.AddRange(new List<WithInheritanceA1>() { new() { }, new() { } });
 			context.WithInheritance.AddRange(new List<WithInheritanceA2>() { new() { }, new() { } });
 			await context.SaveChangesAsync();
 
 			var result = context.GetTable<WithInheritanceA>().ToList();
 
-			result.OfType<WithInheritance>().Should().HaveCount(4);
+			result.OfType<WithInheritance>().Should().HaveCount(5);
 			result.OfType<WithInheritanceA1>().Should().HaveCount(2);
 			result.OfType<WithInheritanceA2>().Should().HaveCount(2);
 		}

Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/ToolsTests.cs

@@ -882,37 +882,6 @@ public void TestTagWith([Values(true, false)] bool enableFilter)
 			}
 		}
 
-
-		[Test]
-		public void TestTemporalTables([Values(true, false)] bool enableFilter)
-		{
-			using (var ctx = CreateContext(enableFilter))
-			{
-				var query1 = ctx.Products.TemporalAsOf(DateTime.UtcNow);
-				var query2 = ctx.Products.TemporalFromTo(DateTime.UtcNow.AddDays(-1), DateTime.UtcNow);
-				var query3 = ctx.Products.TemporalAll();
-				var query4 = ctx.Products.TemporalBetween(DateTime.UtcNow.AddDays(-1), DateTime.UtcNow);
-				var query5 = ctx.Products.TemporalContainedIn(DateTime.UtcNow.AddDays(-1), DateTime.UtcNow);
-
-				var result1 = query1.ToLinqToDB().ToArray();
-				var result2 = query2.ToLinqToDB().ToArray();
-				var result3 = query3.ToLinqToDB().ToArray();
-				var result4 = query4.ToLinqToDB().ToArray();
-				var result5 = query5.ToLinqToDB().ToArray();
-
-				var allQuery =
-					from p in ctx.Products.ToLinqToDB()
-					from q1 in ctx.Products.TemporalAsOf(DateTime.UtcNow).Where(q => q.ProductId == p.ProductId).DefaultIfEmpty()
-					from q2 in ctx.Products.TemporalFromTo(DateTime.UtcNow.AddDays(-1), DateTime.UtcNow).Where(q => q.ProductId == p.ProductId).DefaultIfEmpty()
-					from q3 in ctx.Products.TemporalAll().Where(q => q.ProductId == p.ProductId).DefaultIfEmpty()	
-					from q4 in ctx.Products.TemporalBetween(DateTime.UtcNow.AddDays(-1), DateTime.UtcNow).Where(q => q.ProductId == p.ProductId).DefaultIfEmpty()
-					from q5 in ctx.Products.TemporalContainedIn(DateTime.UtcNow.AddDays(-1), DateTime.UtcNow).Where(q => q.ProductId == p.ProductId).DefaultIfEmpty()
-					select p;
-
-				var result = allQuery.ToArray();
-			}
-		}
-
 		[Test]
 		public void TestInheritanceBulkCopy([Values] BulkCopyType copyType)
 		{