Fix for #143. Changed Identity handling logic.

Author: sdanyliv

Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs

@@ -160,11 +160,6 @@ 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");
 
-						if (!isIdentity && isPrimaryKey)
-						{
-							isIdentity = prop.ValueGenerated == ValueGenerated.OnAdd;
-						}
-
 						var storeObjectId = GetStoreObjectIdentifier(et);
 
 						return new T[]{(T)(Attribute) new ColumnAttribute
@@ -175,6 +170,8 @@ 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,
 						}};
 					}

Tests/LinqToDB.EntityFrameworkCore.BaseTests/LinqToDB.EntityFrameworkCore.BaseTests.csproj

@@ -9,6 +9,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="FluentAssertions" Version="5.10.3" />
 		<PackageReference Include="linq2db.Tools" Version="3.1.6" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />

Tests/LinqToDB.EntityFrameworkCore.SQLite.Tests/LinqToDB.EntityFrameworkCore.SQLite.Tests.csproj

@@ -13,10 +13,6 @@
 		<ProjectReference Include="..\LinqToDB.EntityFrameworkCore.BaseTests\LinqToDB.EntityFrameworkCore.BaseTests.csproj" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Folder Include="Models\" />
-	</ItemGroup>
-
 	<ItemGroup>
 	  <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.3" />
 	</ItemGroup>

Tests/LinqToDB.EntityFrameworkCore.SQLite.Tests/Models/Identity/EfCoreSqliteInMemoryDbFactory.cs

@@ -0,0 +1,124 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+namespace LinqToDB.EntityFrameworkCore.SQLite.Tests.Models.Identity
+{
+    public sealed class EfCoreSqliteInMemoryDbFactory : IDisposable, IAsyncDisposable
+    {
+        private readonly string _connectionString;
+        private SqliteConnection? _connection;
+
+        public EfCoreSqliteInMemoryDbFactory()
+        {
+            _connectionString = "DataSource=:memory:";
+        }
+
+        public EfCoreSqliteInMemoryDbFactory(string connectionString)
+        {
+            _connectionString = connectionString;
+        }
+
+
+        public async ValueTask DisposeAsync()
+        {
+            await Task.Run(Dispose);
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        public T CreateDbContext<T>(bool addVersionGeneratorTrigger = true, Action<string> logger = null)
+            where T : DbContext
+        {
+            _connection = new SqliteConnection(_connectionString);
+            _connection.Open();
+
+            var optionsBuilder = new DbContextOptionsBuilder<DbContext>().UseSqlite(_connection);
+
+            if (logger != null)
+                optionsBuilder.LogTo(logger);
+
+            var context = (T) Activator.CreateInstance(typeof(T), optionsBuilder.Options);
+
+            context?.Database.EnsureCreated();
+
+            if (!addVersionGeneratorTrigger)
+                return context;
+
+            AddVersionTrigger(context);
+
+            return context;
+        }
+
+        private void AddVersionTrigger<T>(T context) where T : DbContext
+        {
+            var tables = context.Model.GetEntityTypes();
+
+            foreach (var table in tables)
+            {
+                var props = table.GetProperties().Where(p =>
+                    p.ClrType == typeof(byte[]) && p.ValueGenerated == ValueGenerated.OnAddOrUpdate &&
+                    p.IsConcurrencyToken);
+
+                var tableName = table.GetTableName();
+
+                foreach (var field in props)
+                {
+                    string[] sqlStrings =
+                    {
+                        $@"CREATE TRIGGER Set{tableName}_{field.Name}OnUpdate
+                AFTER UPDATE ON {tableName}
+                BEGIN
+                    UPDATE {tableName}
+                    SET {field.Name} = randomblob(8)
+                    WHERE rowid = NEW.rowid;
+                END
+                ",
+                        $@"CREATE TRIGGER Set{tableName}_{field.Name}OnInsert
+                AFTER INSERT ON {tableName}
+                BEGIN
+                    UPDATE {tableName}
+                    SET {field.Name} = randomblob(8)
+                    WHERE rowid = NEW.rowid;
+                END
+                "
+                    };
+
+                    foreach (var sql in sqlStrings)
+                    {
+                        using var command = _connection.CreateCommand();
+                        command.CommandText = sql;
+                        command.ExecuteNonQuery();
+                    }
+                }
+            }
+        }
+
+        private void ReleaseUnmanagedResources()
+        {
+            _connection.Dispose();
+        }
+
+        private void Dispose(bool disposing)
+        {
+            ReleaseUnmanagedResources();
+
+            if (disposing)
+            {
+            }
+        }
+
+        ~EfCoreSqliteInMemoryDbFactory()
+        {
+            Dispose(false);
+        }
+    }
+
+}

Tests/LinqToDB.EntityFrameworkCore.SQLite.Tests/Models/Identity/IdentityDbContext.cs

@@ -0,0 +1,13 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace LinqToDB.EntityFrameworkCore.SQLite.Tests.Models.Identity
+{
+	public class IdentityDbContext : DbContext
+	{
+		public IdentityDbContext(DbContextOptions<DbContext> options) : base(options)
+		{
+		}
+
+		public DbSet<Person> People { get; set; } = null!;
+	}
+}

Tests/LinqToDB.EntityFrameworkCore.SQLite.Tests/Models/Identity/Person.cs

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

Tests/LinqToDB.EntityFrameworkCore.SQLite.Tests/SQLiteTests.cs

@@ -1,7 +1,10 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
+using FluentAssertions;
 using LinqToDB.Data;
 using LinqToDB.EntityFrameworkCore.BaseTests;
 using LinqToDB.EntityFrameworkCore.BaseTests.Models.Northwind;
+using LinqToDB.EntityFrameworkCore.SQLite.Tests.Models.Identity;
 using LinqToDB.EntityFrameworkCore.SQLite.Tests.Models.Northwind;
 using Microsoft.EntityFrameworkCore;
 using NUnit.Framework;
@@ -53,5 +56,30 @@ public void TestIdentityMapping()
 		}
 
 
+		[Test]
+		public void TestSqliteDbCreation()
+		{
+			var dbFactory = new EfCoreSqliteInMemoryDbFactory();
+
+			using var context = dbFactory.CreateDbContext<IdentityDbContext>();
+
+			context.AddRange(new List<Person>
+			{
+				new() {Name = "John Doe"},
+				new() {Name = "Jane Doe"}
+			});
+
+			context.SaveChanges();
+
+			var people = context.People.ToList();
+
+			var connection = context.CreateLinqToDbConnection();
+
+			var tempTable = connection.CreateTempTable(people, new BulkCopyOptions {KeepIdentity = true});
+
+			tempTable.ToList().Should().BeEquivalentTo(people);
+		}
+
+	
 	}
 }