- 修复 Firebird Inserted/Deleted 与 Repository 级联冲突 bug；#2023

FreeSql-DbContext.sln

@@ -15,9 +15,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Tests.DbContext2",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Extensions.AggregateRoot", "Extensions\FreeSql.Extensions.AggregateRoot\FreeSql.Extensions.AggregateRoot.csproj", "{B8F84E4F-46F2-4048-B79B-49F0B8A95335}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSql.Extensions.ZeroEntity", "Extensions\FreeSql.Extensions.ZeroEntity\FreeSql.Extensions.ZeroEntity.csproj", "{9F309623-51D0-9A59-9FA9-0AE166E30B0C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Extensions.ZeroEntity", "Extensions\FreeSql.Extensions.ZeroEntity\FreeSql.Extensions.ZeroEntity.csproj", "{9F309623-51D0-9A59-9FA9-0AE166E30B0C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeSql.Extensions.EFModel", "Extensions\FreeSql.Extensions.EFModel\FreeSql.Extensions.EFModel.csproj", "{A05882CE-3E20-40C0-AE2E-9736848198BE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Extensions.EFModel", "Extensions\FreeSql.Extensions.EFModel\FreeSql.Extensions.EFModel.csproj", "{A05882CE-3E20-40C0-AE2E-9736848198BE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeSql.Provider.Firebird", "Providers\FreeSql.Provider.Firebird\FreeSql.Provider.Firebird.csproj", "{5CD37013-EDE0-4901-9169-859A48F25BCE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -57,6 +59,10 @@ Global
 		{A05882CE-3E20-40C0-AE2E-9736848198BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A05882CE-3E20-40C0-AE2E-9736848198BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A05882CE-3E20-40C0-AE2E-9736848198BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5CD37013-EDE0-4901-9169-859A48F25BCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5CD37013-EDE0-4901-9169-859A48F25BCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5CD37013-EDE0-4901-9169-859A48F25BCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5CD37013-EDE0-4901-9169-859A48F25BCE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

FreeSql.DbContext/FreeSql.DbContext.xml

@@ -764,13 +764,5 @@
             <param name="that"></param>
             <returns></returns>
         </member>
-        <member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Reflection.Assembly[])">
-            <summary>
-            批量注入 Repository，可以参考代码自行调整
-            </summary>
-            <param name="services"></param>
-            <param name="assemblies"></param>
-            <returns></returns>
-        </member>
     </members>
 </doc>

FreeSql.Tests/FreeSql.Tests.DbContext2/FreeSql.Tests.DbContext2.csproj

@@ -27,6 +27,7 @@
 		<ProjectReference Include="..\..\FreeSql.DbContext\FreeSql.DbContext.csproj" />
 		<ProjectReference Include="..\..\FreeSql.Repository\FreeSql.Repository.csproj" />
 		<ProjectReference Include="..\..\Providers\FreeSql.Provider.Sqlite\FreeSql.Provider.Sqlite.csproj" />
+		<ProjectReference Include="..\..\Providers\FreeSql.Provider.Firebird\FreeSql.Provider.Firebird.csproj" />
 	</ItemGroup>
 
 </Project>

FreeSql.Tests/FreeSql.Tests.DbContext2/Issues2023Test.cs

@@ -0,0 +1,90 @@
+using FreeSql.DataAnnotations;
+using FreeSql.Internal;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace FreeSql.Tests.DbContext2
+{
+    public class Issues2023Test
+    {
+
+        [Fact]
+        public void Test2023()
+        {
+            var fsql = g.firebird;
+            var list = new List<TestCategory>
+                {
+                    new TestCategory
+                    {
+                        Name = "c1",
+                        Articles = new List<TestArticle>
+                        {
+                            new TestArticle
+                            {
+                                Title = "t1a",
+                            },
+                            new TestArticle
+                            {
+                                Title = "t1b",
+                            }
+                        }
+                    },
+                    new TestCategory
+                    {
+                        Name = "c2",
+                        Articles = new List<TestArticle>
+                        {
+                            new TestArticle
+                            {
+                                Title = "t2a",
+                            },
+                            new TestArticle
+                            {
+                                Title = "t2b",
+                            }
+                        }
+                    }
+                };
+
+            var repo = fsql.GetRepository<TestCategory>();
+            repo.DbContextOptions.EnableCascadeSave = true;
+            repo.Insert(list); // 这里报 System.NullReferenceException
+        }
+
+        [Table(Name = "test_category")]
+        public class TestCategory
+        {
+            [Column(IsPrimary = true, IsIdentity = true)]
+            public long Id { get; set; }
+
+            [Required]
+            public string Name { get; set; }
+
+            [Navigate(nameof(TestArticle.CategoryId))]
+            public List<TestArticle> Articles { get; set; } = new List<TestArticle>();
+        }
+
+        [Table(Name = "test_article")]
+        public class TestArticle
+        {
+            [Column(IsPrimary = true, IsIdentity = true)]
+            public long Id { get; set; }
+
+            [Required]
+            public string Title { get; set; }
+
+            public long CategoryId { get; set; }
+
+            [Navigate(nameof(CategoryId))]
+            public TestCategory Category { get; set; }
+
+            [Column(ServerTime = DateTimeKind.Local)] // 移除此特性就可以成功插入！
+            public DateTime CreatedTime { get; set; }
+        }
+    }
+}

FreeSql.Tests/FreeSql.Tests.DbContext2/g.cs

@@ -32,4 +32,17 @@ public class g
             .Build();
     }
 
+    static Lazy<IFreeSql> firebirdLazy = new Lazy<IFreeSql>(() => new FreeSql.FreeSqlBuilder()
+        .UseConnectionString(FreeSql.DataType.Firebird, @"database=localhost:D:\fbdata\EXAMPLES.fdb;user=sysdba;password=123456;max pool size=5")
+        //.UseConnectionFactory(FreeSql.DataType.Firebird, () => new FirebirdSql.Data.FirebirdClient.FbConnection(@"database=localhost:D:\fbdata\EXAMPLES.fdb;user=sysdba;password=123456;max pool size=5"))
+        .UseAutoSyncStructure(true)
+        .UseLazyLoading(true)
+        .UseNameConvert(FreeSql.Internal.NameConvertType.ToUpper)
+        //.UseNoneCommandParameter(true)
+
+        .UseMonitorCommand(
+            cmd => Trace.WriteLine(cmd.CommandText), //监听SQL命令对象，在执行前
+            (cmd, traceLog) => Console.WriteLine(traceLog))
+        .Build());
+    public static IFreeSql firebird => firebirdLazy.Value;
 }

FreeSql/FreeSql.xml

@@ -1563,7 +1563,7 @@
             <param name="slaveConnectionString">从数据库连接串</param>
             <returns></returns>
         </member>
-        <member name="M:FreeSql.FreeSqlBuilder.UseConnectionFactory(FreeSql.DataType,System.Func{System.Data.Common.DbConnection},System.Type)">
+        <member name="M:FreeSql.FreeSqlBuilder.UseConnectionFactory(FreeSql.DataType,System.Func{System.String,System.Data.Common.DbConnection},System.Type)">
             <summary>
             使用自定义数据库连接对象（放弃内置对象连接池技术）
             </summary>

Providers/FreeSql.Provider.Firebird/Curd/FirebirdDelete.cs

@@ -39,13 +39,13 @@ namespace FreeSql.Firebird.Curd
                     }
                 }
                 var sql = sb.Append(sbret).ToString();
-                var before = new Aop.CurdBeforeEventArgs(_table.TypeLazy ?? _table.Type, _table, Aop.CurdType.Delete, sql, dbParms);
+                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, sql, dbParms);
                 _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
 
                 Exception exception = null;
                 try
                 {
-                    ret.AddRange(_orm.Ado.Query<T1>(_connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms));
+                    ret.AddRange(_orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms));
                 }
                 catch (Exception ex)
                 {
@@ -90,13 +90,13 @@ namespace FreeSql.Firebird.Curd
                     }
                 }
                 var sql = sb.Append(sbret).ToString();
-                var before = new Aop.CurdBeforeEventArgs(_table.TypeLazy ?? _table.Type, _table, Aop.CurdType.Delete, sql, dbParms);
+                var before = new Aop.CurdBeforeEventArgs(_table.Type, _table, Aop.CurdType.Delete, sql, dbParms);
                 _orm.Aop.CurdBeforeHandler?.Invoke(this, before);
 
                 Exception exception = null;
                 try
                 {
-                    ret.AddRange(await _orm.Ado.QueryAsync<T1>(_connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken));
+                    ret.AddRange(await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, dbParms, cancellationToken));
                 }
                 catch (Exception ex)
                 {

Providers/FreeSql.Provider.Firebird/Curd/FirebirdInsert.cs

@@ -107,7 +107,7 @@ namespace FreeSql.Firebird.Curd
             Exception exception = null;
             try
             {
-                ret = _orm.Ado.Query<T1>(_connection, _transaction, CommandType.Text, sql, _commandTimeout, _params);
+                ret = _orm.Ado.Query<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, _params);
             }
             catch (Exception ex)
             {
@@ -207,7 +207,7 @@ namespace FreeSql.Firebird.Curd
             Exception exception = null;
             try
             {
-                ret = await _orm.Ado.QueryAsync<T1>(_connection, _transaction, CommandType.Text, sql, _commandTimeout, _params, cancellationToken);
+                ret = await _orm.Ado.QueryAsync<T1>(_table.TypeLazy ?? _table.Type, _connection, _transaction, CommandType.Text, sql, _commandTimeout, _params, cancellationToken);
             }
             catch (Exception ex)
             {