- 修复 自动分表 IUpdate/IDelete AsTable 不生效的问题；

Examples/base_entity/Program.cs

@@ -601,6 +601,10 @@ namespace base_entity
             BaseEntity.Initialization(fsql, () => _asyncUow.Value);
             #endregion
 
+            var sqlastable1 = fsql.Select<CurrentDetail>(101).AsTable((t, o) => "current_detail_230501").ToSql();
+            var sqlastable2 = fsql.Update<CurrentDetail>(101).AsTable("current_detail_230501").Set(t => t.StatuId, 1).ToSql();
+            var sqlastable3 = fsql.Delete<CurrentDetail>(101).AsTable("current_detail_230501").ToSql();
+
             fsql.Delete<OracleLongRaw1>().Where("1=1").ExecuteAffrows();
             var longRawData = Encoding.UTF8.GetBytes(string.Join(",", Enumerable.Range(1, 2000).Select(a => "中国人")));
             fsql.Insert(new OracleLongRaw1 { data = longRawData }).NoneParameter(false).ExecuteAffrows();
@@ -2322,4 +2326,62 @@ var sql11111 = fsql.Select<Class1111>()
         [Column(DbType = "long raw")]
         public byte[] data { get; set; }
     }
+
+    [Table(Name = "current_detail_{yyMM01}", AsTable = "recordDate=2022-12-01(1 month)", DisableSyncStructure = true)]
+    public class CurrentDetail
+    {
+        [Column(IsPrimary = true)]
+        public long Id { get; set; }
+
+        public DateTime CreateTime { get; set; } = DateTime.Now;
+
+        /// <summary>
+        /// 创建日期
+        /// </summary>
+        public DateTime RecordDate { get; set; }
+
+        /// <summary>
+        /// 创建小时
+        /// </summary>
+        public int RecordHour { get; set; }
+
+        /// <summary>
+        /// 根据当前分钟数规整到10分钟的倍数
+        /// 例如 21分=>20分
+        /// </summary>
+        public int RecordMinute { get; set; }
+
+
+        /// <summary>
+        /// 记录时间
+        /// </summary>
+        public DateTime RecordTime { get; set; }
+
+        /// <summary>
+        /// 设备Code
+        /// </summary>
+        public int DeviceCode { get; set; }
+
+        /// <summary>
+        /// 控制器序列号
+        /// </summary>
+        public string TerminalSequence { get; set; }
+
+        /// <summary>
+        /// 平均值
+        /// </summary>
+        public float AvgValue { get; set; }
+
+        /// <summary>
+        /// 路数
+        /// </summary>
+        public int RouteNum { get; set; }
+
+        /// <summary>
+        /// 相类型
+        /// </summary>
+        public int PhaseTypeId { get; set; }
+
+        public int StatuId { get; set; }
+    }
 }

Examples/base_entity/base_entity.xml

@@ -250,6 +250,52 @@
             删除时间
             </summary>
         </member>
+        <member name="P:base_entity.CurrentDetail.RecordDate">
+            <summary>
+            创建日期
+            </summary>
+        </member>
+        <member name="P:base_entity.CurrentDetail.RecordHour">
+            <summary>
+            创建小时
+            </summary>
+        </member>
+        <member name="P:base_entity.CurrentDetail.RecordMinute">
+            <summary>
+            根据当前分钟数规整到10分钟的倍数
+            例如 21分=>20分
+            </summary>
+        </member>
+        <member name="P:base_entity.CurrentDetail.RecordTime">
+            <summary>
+            记录时间
+            </summary>
+        </member>
+        <member name="P:base_entity.CurrentDetail.DeviceCode">
+            <summary>
+            设备Code
+            </summary>
+        </member>
+        <member name="P:base_entity.CurrentDetail.TerminalSequence">
+            <summary>
+            控制器序列号
+            </summary>
+        </member>
+        <member name="P:base_entity.CurrentDetail.AvgValue">
+            <summary>
+            平均值
+            </summary>
+        </member>
+        <member name="P:base_entity.CurrentDetail.RouteNum">
+            <summary>
+            路数
+            </summary>
+        </member>
+        <member name="P:base_entity.CurrentDetail.PhaseTypeId">
+            <summary>
+            相类型
+            </summary>
+        </member>
         <member name="T:EMSServerModel.Model.Role">
             <summary>
             角色表

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>

FreeSql/FreeSql.xml

@@ -1073,82 +1073,6 @@
             </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
@@ -5768,28 +5692,6 @@
             请使用 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/DeleteProvider.cs

@@ -196,8 +196,9 @@ namespace FreeSql.Internal.CommonProvider
             }
 
             var sb = new StringBuilder();
-            if (_table.AsTableImpl != null)
+            if (_table.AsTableImpl != null && _tableRule != null && string.IsNullOrWhiteSpace(_tableRule(_table.DbName)) == true)
             {
+                var oldTableRule = _tableRule;
                 var names = _table.AsTableImpl.GetTableNamesBySqlWhere(newwhere.ToString(), _params, new SelectTableInfo { Table = _table }, _commonUtils);
                 foreach (var name in names)
                 {
@@ -206,6 +207,7 @@ namespace FreeSql.Internal.CommonProvider
                     _interceptSql?.Invoke(sb);
                     fetch(sb);
                 }
+                _tableRule = oldTableRule;
                 return;
             }
 
@@ -229,8 +231,9 @@ namespace FreeSql.Internal.CommonProvider
             }
 
             var sb = new StringBuilder();
-            if (_table.AsTableImpl != null)
+            if (_table.AsTableImpl != null && _tableRule != null && string.IsNullOrWhiteSpace(_tableRule(_table.DbName)) == true)
             {
+                var oldTableRule = _tableRule;
                 var names = _table.AsTableImpl.GetTableNamesBySqlWhere(newwhere.ToString(), _params, new SelectTableInfo { Table = _table }, _commonUtils);
                 foreach (var name in names)
                 {
@@ -239,6 +242,7 @@ namespace FreeSql.Internal.CommonProvider
                     _interceptSql?.Invoke(sb);
                     await fetchAsync(sb);
                 }
+                _tableRule = oldTableRule;
                 return;
             }
 

FreeSql/Internal/CommonProvider/UpdateProvider.cs

@@ -1004,8 +1004,9 @@ namespace FreeSql.Internal.CommonProvider
             ToSqlWhere(newwhere);
 
             var sb = new StringBuilder();
-            if (_table.AsTableImpl != null)
+            if (_table.AsTableImpl != null && _tableRule != null && string.IsNullOrWhiteSpace(_tableRule(_table.DbName)) == true)
             {
+                var oldTableRule = _tableRule;
                 var names = _table.AsTableImpl.GetTableNamesBySqlWhere(newwhere.ToString(), _params, new SelectTableInfo { Table = _table }, _commonUtils);
                 foreach (var name in names)
                 {
@@ -1013,6 +1014,7 @@ namespace FreeSql.Internal.CommonProvider
                     ToSqlExtension110(sb.Clear(), true);
                     fetch(sb);
                 }
+                _tableRule = oldTableRule;
                 return;
             }
 
@@ -1036,8 +1038,9 @@ namespace FreeSql.Internal.CommonProvider
             ToSqlWhere(newwhere);
 
             var sb = new StringBuilder();
-            if (_table.AsTableImpl != null)
+            if (_table.AsTableImpl != null && _tableRule != null && string.IsNullOrWhiteSpace(_tableRule(_table.DbName)) == true)
             {
+                var oldTableRule = _tableRule;
                 var names = _table.AsTableImpl.GetTableNamesBySqlWhere(newwhere.ToString(), _params, new SelectTableInfo { Table = _table }, _commonUtils);
                 foreach (var name in names)
                 {
@@ -1045,6 +1048,7 @@ namespace FreeSql.Internal.CommonProvider
                     ToSqlExtension110(sb.Clear(), true);
                     await fetchAsync(sb);
                 }
+                _tableRule = oldTableRule;
                 return;
             }