Unified Mapping tests.

Author: sdanyliv

Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs

@@ -158,7 +158,25 @@ public T[] GetAttributes<T>(Type type, MemberInfo memberInfo, bool inherit = tru
 						}
 
 						var isIdentity = prop.GetAnnotations()
-							.Any(a => a.Name.EndsWith(":ValueGenerationStrategy") && a.Value?.ToString() == "IdentityColumn");
+							.Any(a =>
+							{
+								if (a.Name.EndsWith(":ValueGenerationStrategy"))
+									return a.Value?.ToString().Contains("Identity") == true;
+
+								if (a.Name.EndsWith(":Autoincrement"))
+									return a.Value is bool b && b;
+
+								// for postgres
+								if (a.Name == "Relational:DefaultValueSql")
+								{
+									if (a.Value is string str)
+									{
+										return str.ToLower().Contains("nextval");
+									}
+								}
+
+								return false;
+							});
 
 						var storeObjectId = GetStoreObjectIdentifier(et);
 
@@ -170,8 +188,6 @@ public T[] GetAttributes<T>(Type type, MemberInfo memberInfo, bool inherit = tru
 							DbType          = prop.GetColumnType(),
 							IsPrimaryKey    = isPrimaryKey,
 							PrimaryKeyOrder = primaryKeyOrder,
-							SkipOnInsert    = prop.ValueGenerated == ValueGenerated.OnAdd || prop.ValueGenerated == ValueGenerated.OnAddOrUpdate,
-							SkipOnUpdate    = prop.ValueGenerated == ValueGenerated.OnUpdate || prop.ValueGenerated == ValueGenerated.OnAddOrUpdate,
 							IsIdentity      = isIdentity,
 						}};
 					}

Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFToolsImplDefault.cs

@@ -17,6 +17,7 @@
 
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Diagnostics;
+using Microsoft.Extensions.Caching.Memory;
 
 namespace LinqToDB.EntityFrameworkCore
 {
@@ -84,10 +85,10 @@ public override int GetHashCode()
 			#endregion
 		}
 
-		readonly ConcurrentDictionary<ProviderKey, IDataProvider> _knownProviders = new ConcurrentDictionary<ProviderKey, IDataProvider>();
+		readonly ConcurrentDictionary<ProviderKey, IDataProvider> _knownProviders = new();
 
-		private readonly MemoryCache _schemaCache = new MemoryCache(
-			new MemoryCacheOptions
+		private readonly MemoryCache _schemaCache = new(
+			new Microsoft.Extensions.Caching.Memory.MemoryCacheOptions()
 			{
 				ExpirationScanFrequency = TimeSpan.FromHours(1.0)
 			});
@@ -455,6 +456,10 @@ public virtual void DefineConvertors(
 				if (modelType.IsEnum)
 					continue;
 
+				// skipping arrays
+				if (modelType.IsArray)
+					continue;
+
 				MapEFCoreType(modelType);
 				if (modelType.IsValueType && !typeof(Nullable<>).IsSameOrParentOf(modelType))
 					MapEFCoreType(typeof(Nullable<>).MakeGenericType(modelType));

Source/LinqToDB.EntityFrameworkCore/linq2db.EntityFrameworkCore.csproj

@@ -17,7 +17,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="linq2db" Version="3.3.0" />
+		<PackageReference Include="linq2db" Version="3.3.1-rc.6076" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.2" />
 	</ItemGroup>
 

Tests/LinqToDB.EntityFrameworkCore.BaseTests/ForMappingTestsBase.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using FluentAssertions;
+using LinqToDB.Data;
+using LinqToDB.EntityFrameworkCore.BaseTests.Models.ForMapping;
+using NUnit.Framework;
+
+namespace LinqToDB.EntityFrameworkCore.BaseTests
+{
+	public abstract class ForMappingTestsBase : TestsBase
+	{
+		public abstract ForMappingContextBase CreateContext();
+
+		[Test]
+		public virtual void TestIdentityMapping()
+		{
+			using var context = CreateContext();
+			using var connection = context.CreateLinqToDbConnection();
+
+			var ed = connection.MappingSchema.GetEntityDescriptor(typeof(WithIdentity));
+			var pk = ed.Columns.Where(c => c.IsPrimaryKey).Single();
+
+			pk.IsIdentity.Should().BeTrue();
+		}
+
+		[Test]
+		public virtual void TestNoIdentityMapping()
+		{
+			using var context = CreateContext();
+			using var connection = context.CreateLinqToDbConnection();
+
+			var ed = connection.MappingSchema.GetEntityDescriptor(typeof(NoIdentity));
+			var pk = ed.Columns.Where(c => c.IsPrimaryKey).Single();
+
+			pk.IsIdentity.Should().BeFalse();
+		}
+
+		[Test]
+		public virtual void TestTableCreation()
+		{
+			using var context = CreateContext();
+			using var connection = context.CreateLinqToDbConnection();
+
+			using var t1 = connection.CreateTempTable<WithIdentity>();
+			using var t2 = connection.CreateTempTable<NoIdentity>();
+		}
+
+
+		[Test]
+		public virtual void TestBulkCopyNoIdentity()
+		{
+			using var context = CreateContext();
+			using var connection = context.CreateLinqToDbConnection();
+
+			using var t = connection.CreateTempTable<NoIdentity>();
+
+			var items = new List<NoIdentity>()
+			{
+				new() {Id = Guid.NewGuid(), Name = "John Doe"},
+				new() {Id = Guid.NewGuid(), Name = "Jane Doe"}
+			};
+
+			t.BulkCopy(items);
+
+
+			items.Should().BeEquivalentTo(t);
+		}
+
+		[Test]
+		public virtual void TestBulkCopyWithIdentity()
+		{
+			using var context = CreateContext();
+			using var connection = context.CreateLinqToDbConnection();
+
+			using var t = connection.CreateTempTable<WithIdentity>();
+
+			var items = new List<WithIdentity>()
+			{
+				new() {Id = 1, Name = "John Doe"},
+				new() {Id = 2, Name = "Jane Doe"}
+			};
+
+			t.BulkCopy(items);
+
+
+			t.Should().HaveCount(items.Count);
+		}
+
+	}
+}

Tests/LinqToDB.EntityFrameworkCore.BaseTests/Logging/TestLogger.cs

@@ -13,7 +13,9 @@ internal class TestLogger : ILogger
 		private static readonly string _newLineWithMessagePadding;
 
 		// ConsoleColor does not have a value to specify the 'Default' color
+#pragma warning disable 649
 		private readonly ConsoleColor? DefaultConsoleColor;
+#pragma warning restore 649
 
 		private readonly string _name;
 

Tests/LinqToDB.EntityFrameworkCore.BaseTests/Models/ForMapping/ForMappingContextBase.cs

@@ -0,0 +1,15 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace LinqToDB.EntityFrameworkCore.BaseTests.Models.ForMapping
+{
+	public abstract class ForMappingContextBase : DbContext
+	{
+		protected ForMappingContextBase(DbContextOptions options) : base(options)
+		{
+		}
+
+		public DbSet<WithIdentity> WithIdentity { get; set; } = null!;
+		public DbSet<NoIdentity> NoIdentity { get; set; } = null!;
+
+	}
+}

Tests/LinqToDB.EntityFrameworkCore.SQLite.Tests/Models/Identity/Person.cs renamed to Tests/LinqToDB.EntityFrameworkCore.BaseTests/Models/ForMapping/NoIdentity.cs

@@ -1,8 +1,8 @@
 using System;
 
-namespace LinqToDB.EntityFrameworkCore.SQLite.Tests.Models.Identity
+namespace LinqToDB.EntityFrameworkCore.BaseTests.Models.ForMapping
 {
-	public class Person
+	public class NoIdentity
 	{
 		public Guid Id { get; set; }
 		public string Name { get; set; } = null!;

Tests/LinqToDB.EntityFrameworkCore.BaseTests/Models/ForMapping/WithIdentity.cs

@@ -0,0 +1,8 @@
+namespace LinqToDB.EntityFrameworkCore.BaseTests.Models.ForMapping
+{
+	public class WithIdentity
+	{
+		public int Id { get; set; }
+		public string Name { get; set; } = null!;
+	}
+}

Tests/LinqToDB.EntityFrameworkCore.BaseTests/TestUtils.cs

@@ -15,7 +15,9 @@ public class TestUtils
 
 					.AddTestLogger(o =>
 					{
+#pragma warning disable 618
 						o.IncludeScopes = true;
+#pragma warning restore 618
 						o.FormatterName = ConsoleFormatterNames.Simple;
 					});
 			});		

Tests/LinqToDB.EntityFrameworkCore.PomeloMySql.Tests/ForMappingTests.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using FluentAssertions;
+using LinqToDB.Data;
+using LinqToDB.EntityFrameworkCore.BaseTests;
+using LinqToDB.EntityFrameworkCore.BaseTests.Models.ForMapping;
+using LinqToDB.EntityFrameworkCore.PomeloMySql.Tests.Models.ForMapping;
+using Microsoft.EntityFrameworkCore;
+
+namespace LinqToDB.EntityFrameworkCore.PomeloMySql.Tests
+{
+	public class ForMappingTests : ForMappingTestsBase
+	{
+		public override ForMappingContextBase CreateContext()
+		{
+			var optionsBuilder = new DbContextOptionsBuilder<ForMappingContext>();
+			optionsBuilder.UseMySql("Server=DBHost;Port=3306;Database=TestData;Uid=TestUser;Pwd=TestPassword;charset=utf8;");
+			optionsBuilder.UseLoggerFactory(TestUtils.LoggerFactory);
+
+			var options = optionsBuilder.Options;
+			var ctx = new ForMappingContext(options);
+
+			//ctx.Database.EnsureDeleted();
+			ctx.Database.EnsureCreated();
+
+			return ctx;
+		}
+
+	}
+}