- 增加 自动分表 IAsTable.SetDefaultAllTables 拦截未使用 where 条件的场景；修复 自动分表 IAsTable.SetTableName 位置 bug；

Examples/base_entity/ModAsTableImpl.cs

@@ -23,7 +23,7 @@ class ModAsTableImpl : IAsTable
 
     public string[] AllTables { get; }
 
-    public string GetTableNameByColumnValue(object columnValue, bool autoExpand = false)
+	public string GetTableNameByColumnValue(object columnValue, bool autoExpand = false)
     {
         var modid = (int)columnValue;
         return $"order_{(modid % 10)}";
@@ -43,6 +43,10 @@ class ModAsTableImpl : IAsTable
         return tables;
     }
 
+	public IAsTable SetDefaultAllTables(Func<string[], string[]> audit)
+	{
+		throw new NotImplementedException();
+	}
 	public IAsTable SetTableName(int index, string tableName)
 	{
 		throw new NotImplementedException();

Examples/base_entity/Program.cs

@@ -618,7 +618,12 @@ namespace base_entity
 
 			fsql.CodeFirst.GetTableByEntity(typeof(AsTableLog)).AsTableImpl
                 .SetTableName(0, "AsTableLog1")
-                .SetTableName(1, "AsTableLog2");
+                .SetTableName(1, "AsTableLog2")
+                .SetDefaultAllTables(value =>
+                {
+                    if (value.Length > 3) return value.Take(3).ToArray();
+                    return value;
+                });
 
 			var testitems = new[]
 			{

FreeSql.DbContext/FreeSql.DbContext.xml

@@ -800,5 +800,14 @@
             <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/DataAnnotations/TableAttribute.cs

@@ -90,7 +90,8 @@ namespace FreeSql.DataAnnotations
 		string GetTableNameByColumnValue(object columnValue, bool autoExpand = false);
         string[] GetTableNamesByColumnValueRange(object columnValue1, object columnValue2);
         string[] GetTableNamesBySqlWhere(string sqlWhere, List<DbParameter> dbParams, SelectTableInfo tb, CommonUtils commonUtils);
-    }
+        IAsTable SetDefaultAllTables(Func<string[], string[]> audit);
+	}
 	class DateTimeAsTableImpl : IAsTable
     {
         readonly object _lock = new object();
@@ -239,23 +240,31 @@ namespace FreeSql.DataAnnotations
                 };
             });
         }
-        /// <summary>
+
-        /// 可以匹配以下条件（支持参数化）：<para></para>
+        Func<string[], string[]> _GetDefaultAllTables;
-        /// `field` BETWEEN '2022-01-01 00:00:00' AND '2022-03-01 00:00:00'<para></para>
+        public IAsTable SetDefaultAllTables(Func<string[], string[]> audit)
-        /// `field` &gt; '2022-01-01 00:00:00' AND `field` &lt; '2022-03-01 00:00:00'<para></para>
-        /// `field` &gt; '2022-01-01 00:00:00' AND `field` &lt;= '2022-03-01 00:00:00'<para></para>
-        /// `field` &gt;= '2022-01-01 00:00:00' AND `field` &lt; '2022-03-01 00:00:00'<para></para>
-        /// `field` &gt;= '2022-01-01 00:00:00' AND `field` &lt;= '2022-03-01 00:00:00'<para></para>
-        /// `field` &gt; '2022-01-01 00:00:00'<para></para>
-        /// `field` &gt;= '2022-01-01 00:00:00'<para></para>
-        /// `field` &lt; '2022-01-01 00:00:00'<para></para>
-        /// `field` &lt;= '2022-01-01 00:00:00'<para></para>
-        /// </summary>
-        /// <returns></returns>
-        /// <exception cref="Exception"></exception>
-        public string[] GetTableNamesBySqlWhere(string sqlWhere, List<DbParameter> dbParams, SelectTableInfo tb, CommonUtils commonUtils)
         {
-            if (string.IsNullOrWhiteSpace(sqlWhere)) return AllTables;
+			_GetDefaultAllTables = audit;
+            return this;
+        }
+
+		/// <summary>
+		/// 可以匹配以下条件（支持参数化）：<para></para>
+		/// `field` BETWEEN '2022-01-01 00:00:00' AND '2022-03-01 00:00:00'<para></para>
+		/// `field` &gt; '2022-01-01 00:00:00' AND `field` &lt; '2022-03-01 00:00:00'<para></para>
+		/// `field` &gt; '2022-01-01 00:00:00' AND `field` &lt;= '2022-03-01 00:00:00'<para></para>
+		/// `field` &gt;= '2022-01-01 00:00:00' AND `field` &lt; '2022-03-01 00:00:00'<para></para>
+		/// `field` &gt;= '2022-01-01 00:00:00' AND `field` &lt;= '2022-03-01 00:00:00'<para></para>
+		/// `field` &gt; '2022-01-01 00:00:00'<para></para>
+		/// `field` &gt;= '2022-01-01 00:00:00'<para></para>
+		/// `field` &lt; '2022-01-01 00:00:00'<para></para>
+		/// `field` &lt;= '2022-01-01 00:00:00'<para></para>
+		/// </summary>
+		/// <returns></returns>
+		/// <exception cref="Exception"></exception>
+		public string[] GetTableNamesBySqlWhere(string sqlWhere, List<DbParameter> dbParams, SelectTableInfo tb, CommonUtils commonUtils)
+		{
+            if (string.IsNullOrWhiteSpace(sqlWhere)) return _GetDefaultAllTables?.Invoke(AllTables) ?? AllTables;
             var quoteParameterName = "";
             if (commonUtils._orm.Ado.DataType == DataType.ClickHouse) quoteParameterName = "@"; //特殊处理 Clickhouse 参数化
             else quoteParameterName = commonUtils.QuoteParamterName("");
@@ -299,7 +308,7 @@ namespace FreeSql.DataAnnotations
                 if (val1 == null) throw new Exception(CoreStrings.Failed_SubTable_FieldValue(sqlWhere));
                 return LocalGetTables2(m.Groups[1].Value, ParseColumnValue(val1));
             }
-            return AllTables;
+            return _GetDefaultAllTables?.Invoke(AllTables) ?? AllTables;
 
             object LocalGetParamValue(string paramName)
             {
@@ -345,7 +354,7 @@ namespace FreeSql.DataAnnotations
                         }
                         break;
                 }
-                return AllTables;
+                return _GetDefaultAllTables?.Invoke(AllTables) ?? AllTables;
             }
             string[] LocalGetTables2(string opt, DateTime val1)
             {
@@ -364,7 +373,7 @@ namespace FreeSql.DataAnnotations
                     case ">=":
                         return GetTableNamesByColumnValueRange(val1, _lastTime);
                 }
-                return AllTables;
+                return _GetDefaultAllTables?.Invoke(AllTables) ?? AllTables;
             }
         }
 
@@ -382,6 +391,7 @@ namespace FreeSql.DataAnnotations
         {
 			lock (_lock)
 			{
+                index = _allTables.Count - 1 - index;
                 _allTables[index] = tableName;
 			}
             return this;

FreeSql/FreeSql.xml

@@ -1104,82 +1104,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
@@ -5884,28 +5808,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>