From 3919180b0bb2edb9dae515c5d9a8beb9bef366f9 Mon Sep 17 00:00:00 2001
From: 2881099 <2881099@qq.com>
Date: Fri, 24 Mar 2023 15:10:48 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=20UpdateJoin=20null=20?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Examples/base_entity/Program.cs                | 18 +++++++++---------
 FreeSql.DbContext/FreeSql.DbContext.xml        | 18 ------------------
 .../CommonProvider/UpdateJoinProvider.cs       |  2 +-
 3 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/Examples/base_entity/Program.cs b/Examples/base_entity/Program.cs
index a033adbb..7f5bb550 100644
--- a/Examples/base_entity/Program.cs
+++ b/Examples/base_entity/Program.cs
@@ -578,6 +578,15 @@ namespace base_entity
             BaseEntity.Initialization(fsql, () => _asyncUow.Value);
             #endregion
 
+            var updatejoin01 = fsql.Update<User1>()
+                .Join(fsql.Select<UserGroup>(), (a, b) => a.GroupId == b.Id)
+                .Set((a, b) => a.Nickname == b.GroupName)
+                .ExecuteAffrows();
+            var updatejoin02 = fsql.Update<User1>()
+                .Join<UserGroup>((a, b) => a.GroupId == b.Id)
+                .Set((a, b) => a.Nickname == b.GroupName)
+                .ExecuteAffrows();
+
             var sql1c2 = fsql.Select<User1>()
                 .GroupBy(a => new { a.Nickname, a.Avatar })
                 .WithTempQuery(b => new
@@ -613,15 +622,6 @@ namespace base_entity
 
         fsql.UseJsonMap();
 
-            var updatejoin01 = fsql.Update<User1>()
-                .Join(fsql.Select<UserGroup>(), (a, b) => a.GroupId == b.Id)
-                .Set((a, b) => a.Nickname == b.GroupName)
-                .ExecuteAffrows();
-            var updatejoin02 = fsql.Update<User1>()
-                .Join<UserGroup>((a, b) => a.GroupId == b.Id)
-                .Set((a, b) => a.Nickname == b.GroupName)
-                .ExecuteAffrows();
-
             fsql.Select<User1>().IncludeMany(a => a.Roles);
 
             var displayNameTb = fsql.CodeFirst.GetTableByEntity(typeof(DeviceCodes));
diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
index 26522f10..594fbad3 100644
--- a/FreeSql.DbContext/FreeSql.DbContext.xml
+++ b/FreeSql.DbContext/FreeSql.DbContext.xml
@@ -733,15 +733,6 @@
             <param name="modelBuilder"></param>
             <returns></returns>
         </member>
-        <member name="M:FreeSqlDbContextExtensions.ApplyConfigurationsFromAssembly(FreeSql.ICodeFirst,System.Reflection.Assembly,System.Func{System.Type,System.Boolean})">
-            <summary>
-            根据Assembly扫描所有继承IEntityTypeConfiguration&lt;T&gt;的配置类
-            </summary>
-            <param name="codeFirst"></param>
-            <param name="assembly"></param>
-            <param name="predicate"></param>
-            <returns></returns>
-        </member>
         <member name="M:FreeSqlDbContextExtensions.CreateDbContext(IFreeSql)">
             <summary>
             创建普通数据上下文档对象
@@ -800,14 +791,5 @@
             <param name="that"></param>
             <returns></returns>
         </member>
-        <member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
-            <summary>
-            批量注入 Repository，可以参考代码自行调整
-            </summary>
-            <param name="services"></param>
-            <param name="globalDataFilter"></param>
-            <param name="assemblies"></param>
-            <returns></returns>
-        </member>
     </members>
 </doc>
diff --git a/FreeSql/Internal/CommonProvider/UpdateJoinProvider.cs b/FreeSql/Internal/CommonProvider/UpdateJoinProvider.cs
index 2e964195..68076243 100644
--- a/FreeSql/Internal/CommonProvider/UpdateJoinProvider.cs
+++ b/FreeSql/Internal/CommonProvider/UpdateJoinProvider.cs
@@ -203,7 +203,7 @@ namespace FreeSql.Internal.CommonProvider
             var sqltab = sql.Substring(7, setStartIndex - 7);
             var sqlset = "";
             var sqlwhere = "";
-            var sqltab2 = _query2Provider._tableRules.FirstOrDefault()?.Invoke(typeof(T2), null).Replace(" \r\n", " \r\n    ") ?? _commonUtils.QuoteSqlName(_query2Provider._tables[1].Table?.DbName);
+            var sqltab2 = _query2Provider._tableRules.FirstOrDefault()?.Invoke(typeof(T2), null)?.Replace(" \r\n", " \r\n    ") ?? _commonUtils.QuoteSqlName(_query2Provider._tables[1].Table?.DbName);
             var whereStartIndex = sql.IndexOf(" \r\nWHERE ", setStartIndex);
             if (whereStartIndex == -1)
             {