fix regression/merge

(cherry picked from commit 806d6bf)

# Conflicts:
#	Tests/LinqToDB.EntityFrameworkCore.SqlServer.Tests/ToolsTests.cs
(cherry picked from commit ecd77bf)
(cherry picked from commit f0e1520)

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/Settings.cs

@@ -7,5 +7,6 @@ public static class Settings
 		public static readonly string JsonConvertConnectionString = "Server=.;Database=JsonConvertContext;Integrated Security=SSPI;Encrypt=true;TrustServerCertificate=true";
 		public static readonly string NorthwindConnectionString   = "Server=.;Database=NorthwindEFCore;Integrated Security=SSPI;Encrypt=true;TrustServerCertificate=true";
 		public static readonly string ConverterConnectionString   = "Server=.;Database=ConverterTests;Integrated Security=SSPI;Encrypt=true;TrustServerCertificate=true";
+		public static readonly string InheritanceConnectionString = "Server=.;Database=InheritanceEFCore;Integrated Security=SSPI;Encrypt=true;TrustServerCertificate=true";
 	}
 }

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

@@ -5,6 +5,7 @@
 using LinqToDB.Data;
 using LinqToDB.EntityFrameworkCore.BaseTests;
 using LinqToDB.EntityFrameworkCore.BaseTests.Models.Northwind;
+using LinqToDB.EntityFrameworkCore.SqlServer.Tests.Models.Inheritance;
 using LinqToDB.EntityFrameworkCore.SqlServer.Tests.Models.Northwind;
 using LinqToDB.Expressions;
 using LinqToDB.Mapping;
@@ -72,7 +73,7 @@ private NorthwindContext CreateContext(bool enableFilter)
 			if (ctx.Database.EnsureCreated())
 			{
 				NorthwindData.Seed(ctx);
-			}
+			}			
 			return ctx;
 		}
 
@@ -866,5 +867,73 @@ from q5 in ctx.Products.TemporalContainedIn(DateTime.UtcNow.AddDays(-1), DateTim
 			}
 		}
 
+		static DbContextOptions CreateInheritanceOptions()
+		{
+			var optionsBuilder = new DbContextOptionsBuilder<InheritanceContext>();
+
+			optionsBuilder.UseSqlServer(Settings.InheritanceConnectionString);
+			optionsBuilder.UseLoggerFactory(TestUtils.LoggerFactory);
+			optionsBuilder.EnableSensitiveDataLogging();
+
+			return optionsBuilder.Options;
+		}
+
+		private DbContextOptions? _inheritanceOptions;
+
+		private InheritanceContext CreateInheritanceContext()
+		{
+			var recreate = _inheritanceOptions == null;
+
+			_inheritanceOptions ??= CreateInheritanceOptions();
+
+			var ctx = new InheritanceContext(_inheritanceOptions);
+			if (recreate)
+			{
+				ctx.Database.EnsureDeleted();
+				ctx.Database.EnsureCreated();
+			}
+
+			return ctx;
+		}
+
+		[Test]
+		public void TestInheritanceBulkCopy([Values] BulkCopyType copyType)
+		{
+			using (var ctx = CreateInheritanceContext())
+			{
+				var data = new BlogBase[] { new Blog() { Url = "BlogUrl" }, new RssBlog() { Url = "RssUrl" } };
+
+				ctx.BulkCopy(new BulkCopyOptions(){ BulkCopyType = BulkCopyType.RowByRow }, data);
+
+				var items = ctx.Blogs.ToArray();
+
+				items[0].Should().BeOfType<Blog>();
+				((Blog)items[0]).Url.Should().Be("BlogUrl");
+
+				items[1].Should().BeOfType<RssBlog>();
+				((RssBlog)items[1]).Url.Should().Be("RssUrl");
+			}
+		}
+
+		/*
+		[Test]
+		public void TestInheritanceShadowBulkCopy([Values] BulkCopyType copyType)
+		{
+			using (var ctx = CreateInheritanceContext())
+			{
+				var data = new ShadowBlogBase[] { new ShadowBlog() { Url = "BlogUrl" }, new ShadowRssBlog() { Url = "RssUrl" } };
+
+				ctx.BulkCopy(new BulkCopyOptions(){ BulkCopyType = BulkCopyType.RowByRow }, data);
+
+				var items = ctx.ShadowBlogs.ToArray();
+
+				items[0].Should().BeOfType<ShadowBlog>();
+				((ShadowBlog)items[0]).Url.Should().Be("BlogUrl");
+
+				items[1].Should().BeOfType<ShadowRssBlog>();
+				((ShadowRssBlog)items[1]).Url.Should().Be("RssUrl");
+			}
+		}
+		*/
 	}
 }