- 修复 UpdateJoin 与全局过滤器别名问题；#1612

Examples/base_entity/Program.cs

@@ -600,6 +600,8 @@ namespace base_entity
             BaseEntity.Initialization(fsql, () => _asyncUow.Value);
             #endregion
 
+            fsql.GlobalFilter.Apply<User1>("test01", a => a.IsDeleted == false);
+
             var updatejoin031sql = fsql.Update<User1>()
                 .Join<UserGroup>((a, b) => a.GroupId == b.Id)
                 .Set((a, b) => b.GroupName == a.Username + "b.groupname")

FreeSql/FreeSql.xml

@@ -1084,6 +1084,82 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="T:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder">
+            <summary>
+            动态创建实体类型
+            </summary>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.#ctor(IFreeSql,System.String,System.Attribute[])">
+            <summary>
+            配置Class
+            </summary>
+            <param name="className">类名</param>
+            <param name="attributes">类标记的特性[Table(Name = "xxx")] [Index(xxxx)]</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Attribute[])">
+            <summary>
+            配置属性
+            </summary>
+            <param name="propertyName">属性名称</param>
+            <param name="propertyType">属性类型</param>
+            <param name="attributes">属性标记的特性-支持多个</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Boolean,System.Attribute[])">
+            <summary>
+            配置属性
+            </summary>
+            <param name="propertyName">属性名称</param>
+            <param name="propertyType">属性类型</param>
+            <param name="isOverride">该属性是否重写父类属性</param>
+            <param name="attributes">属性标记的特性-支持多个</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Property(System.String,System.Type,System.Boolean,System.Object,System.Attribute[])">
+            <summary>
+            配置属性
+            </summary>
+            <param name="propertyName">属性名称</param>
+            <param name="propertyType">属性类型</param>
+            <param name="isOverride">该属性是否重写父类属性</param>
+            <param name="defaultValue">属性默认值</param>
+            <param name="attributes">属性标记的特性-支持多个</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Extend(System.Type)">
+            <summary>
+            配置父类
+            </summary>
+            <param name="superClass">父类类型</param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.OverrideProperty(System.Reflection.Emit.TypeBuilder@,System.Reflection.Emit.MethodBuilder,FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.PropertyMethodEnum,System.String)">
+            <summary>
+            Override属性
+            </summary>
+            <param name="typeBuilder"></param>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.Build">
+            <summary>
+            Emit动态创建出Class - Type
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToLower(System.String)">
+            <summary>
+            首字母小写
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSql.Extensions.DynamicEntity.DynamicCompileBuilder.FirstCharToUpper(System.String)">
+            <summary>
+            首字母大写
+            </summary>
+            <param name="input"></param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSql.Extensions.EntityUtil.EntityUtilExtensions.GetEntityKeyString(IFreeSql,System.Type,System.Object,System.Boolean,System.String)">
             <summary>
             获取实体的主键值，以 "*|_,[,_|*" 分割，当任意一个主键属性无值时，返回 null
@@ -5748,6 +5824,28 @@
             请使用 fsql.InsertDict(dict) 方法插入字典数据
             </summary>
         </member>
+        <member name="M:FreeSqlGlobalDynamicEntityExtensions.DynamicEntity(FreeSql.ICodeFirst,System.String,System.Attribute[])">
+            <summary>
+            动态构建Class Type
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateInstance(FreeSql.Internal.Model.TableInfo,System.Collections.Generic.Dictionary{System.String,System.Object})">
+            <summary>
+            根据字典，创建 table 对应的实体对象
+            </summary>
+            <param name="table"></param>
+            <param name="dict"></param>
+            <returns></returns>
+        </member>
+        <member name="M:FreeSqlGlobalDynamicEntityExtensions.CreateDictionary(FreeSql.Internal.Model.TableInfo,System.Object)">
+            <summary>
+            根据实体对象，创建 table 对应的字典
+            </summary>
+            <param name="table"></param>
+            <param name="instance"></param>
+            <returns></returns>
+        </member>
         <member name="M:FreeSqlGlobalExpressionCallExtensions.Between(System.DateTime,System.DateTime,System.DateTime)">
             <summary>
             C#： that >= between &amp;&amp; that &lt;= and<para></para>

FreeSql/Internal/CommonProvider/UpdateJoinProvider.cs

@@ -279,6 +279,7 @@ namespace FreeSql.Internal.CommonProvider
         public string ToSql()
         {
             _updateProvider._interceptSql = InterceptSql;
+            _updateProvider._tableAlias = _query2Provider._tables[0].Alias;
             try
             {
                 return _update.ToSql();
@@ -286,11 +287,13 @@ namespace FreeSql.Internal.CommonProvider
             finally
             {
                 _updateProvider._interceptSql = null;
+                _updateProvider._tableAlias = null;
             }
         }
         public int ExecuteAffrows()
         {
             _updateProvider._interceptSql = InterceptSql;
+            _updateProvider._tableAlias = _query2Provider._tables[0].Alias;
             try
             {
                 return _update.ExecuteAffrows();
@@ -298,6 +301,7 @@ namespace FreeSql.Internal.CommonProvider
             finally
             {
                 _updateProvider._interceptSql = null;
+                _updateProvider._tableAlias = null;
             }
         }
 #if net40
@@ -305,6 +309,7 @@ namespace FreeSql.Internal.CommonProvider
         async public Task<int> ExecuteAffrowsAsync(CancellationToken cancellationToken = default)
         {
             _updateProvider._interceptSql = InterceptSql;
+            _updateProvider._tableAlias = _query2Provider._tables[0].Alias;
             try
             {
                 return await _update.ExecuteAffrowsAsync(cancellationToken);
@@ -312,6 +317,7 @@ namespace FreeSql.Internal.CommonProvider
             finally
             {
                 _updateProvider._interceptSql = null;
+                _updateProvider._tableAlias = null;
             }
         }
 #endif

FreeSql/Internal/CommonProvider/UpdateProvider.cs

@@ -37,6 +37,7 @@ namespace FreeSql.Internal.CommonProvider
         public DbConnection _connection;
         public int _commandTimeout = 0;
         public Action<StringBuilder> _interceptSql;
+        public string _tableAlias;
         public object _updateVersionValue;
         public bool _isAutoSyncStructure;
 
@@ -214,6 +215,7 @@ namespace FreeSql.Internal.CommonProvider
             _whereGlobalFilter = _orm.GlobalFilter.GetFilters();
             _batchProgress = null;
             _interceptSql = null;
+            _tableAlias = null;
             _versionColumn = _table?.VersionColumn;
             _ignoreVersion = false;
         }
@@ -1234,21 +1236,41 @@ namespace FreeSql.Internal.CommonProvider
 
         public virtual void ToSqlWhere(StringBuilder sb)
         {
+            var andTimes = 0;
             sb.Append(" \r\nWHERE ");
             if (_source.Any())
             {
                 if (_tempPrimarys.Any() == false) throw new ArgumentException(CoreStrings.NoPrimaryKey_UseSetDto(_table.Type.DisplayCsharp()));
                 sb.Append('(').Append(_commonUtils.WhereItems(_tempPrimarys, "", _source)).Append(')');
+                andTimes++;
             }
 
-            if (_where.Length > 0)
-                sb.Append(_source.Any() ? _where.ToString() : _where.ToString().Substring(5));
-
             if (_whereGlobalFilter.Any())
             {
-                var globalFilterCondi = _commonExpression.GetWhereCascadeSql(new SelectTableInfo { Table = _table }, _whereGlobalFilter, false);
+                var globalFilterCondi = _commonExpression.GetWhereCascadeSql(new SelectTableInfo { Table = _table, Alias = _tableAlias }, _whereGlobalFilter.Where(a => a.Before == true), false);
                 if (string.IsNullOrEmpty(globalFilterCondi) == false)
-                    sb.Append(" AND ").Append(globalFilterCondi);
+                {
+                    if (andTimes > 0) sb.Append(" AND ");
+                    sb.Append(globalFilterCondi);
+                    andTimes++;
+                }
+            }
+
+            if (_where.Length > 0)
+            {
+                sb.Append(andTimes > 0 ? _where.ToString() : _where.ToString().Substring(5));
+                andTimes++;
+            }
+
+            if (_whereGlobalFilter.Any())
+            {
+                var globalFilterCondi = _commonExpression.GetWhereCascadeSql(new SelectTableInfo { Table = _table, Alias = _tableAlias }, _whereGlobalFilter.Where(a => a.Before == false), false);
+                if (string.IsNullOrEmpty(globalFilterCondi) == false)
+                {
+                    if (andTimes > 0) sb.Append(" AND ");
+                    sb.Append(globalFilterCondi);
+                    andTimes++;
+                }
             }
 
             if (_versionColumn != null)