- fix: AsTable

Author: 2881099

Examples/base_entity/Program.cs

@@ -99,7 +99,7 @@ class A
             public B B { get; set; }
         }
 
-        [Table(Name = "as_table_log_{yyyyMMdd}", AsTable = "createtime=2022-1-1(1 month)")]
+        [Table(Name = "as_table_log_{yyyyMM}", AsTable = "createtime=2022-1-1(1 month)")]
         class AsTableLog
         {
             public Guid id { get; set; }
@@ -157,7 +157,8 @@ static void Main(string[] args)
                 new AsTableLog{ msg = "msg04", createtime = DateTime.Parse("2022-2-8 15:00:13") },
                 new AsTableLog{ msg = "msg05", createtime = DateTime.Parse("2022-3-8 15:00:13") },
                 new AsTableLog{ msg = "msg06", createtime = DateTime.Parse("2022-4-8 15:00:13") },
-                new AsTableLog{ msg = "msg07", createtime = DateTime.Parse("2022-6-8 15:00:13") }
+                new AsTableLog{ msg = "msg07", createtime = DateTime.Parse("2022-6-8 15:00:13") },
+                new AsTableLog{ msg = "msg07", createtime = DateTime.Parse("2022-7-1") }
             };
             var sqlatb = fsql.Insert(testitems).NoneParameter();
             var sqlat = sqlatb.ToSql();
@@ -187,14 +188,18 @@ static void Main(string[] args)
             var sqlatd501 = sqlatd5.ToSql();
             var sqlatd502 = sqlatd5.ExecuteAffrows();
 
-            var sqlatd6 = fsql.Update<AsTableLog>(Guid.NewGuid()).Set(a => a.msg == "newmsg").Where(a => a.createtime > DateTime.Parse("2022-3-1"));
+            var sqlatd6 = fsql.Update<AsTableLog>(Guid.NewGuid()).Set(a => a.msg == "newmsg").Where(a => a.createtime > DateTime.Parse("2022-3-1") && a.createtime < DateTime.Parse("2022-5-1"));
             var sqlatd601 = sqlatd6.ToSql();
             var sqlatd602 = sqlatd6.ExecuteAffrows();
 
-            var sqlatd7 = fsql.Update<AsTableLog>(Guid.NewGuid()).Set(a => a.msg == "newmsg").Where(a => a.createtime < DateTime.Parse("2022-5-1"));
+            var sqlatd7 = fsql.Update<AsTableLog>(Guid.NewGuid()).Set(a => a.msg == "newmsg").Where(a => a.createtime > DateTime.Parse("2022-3-1"));
             var sqlatd701 = sqlatd7.ToSql();
             var sqlatd702 = sqlatd7.ExecuteAffrows();
 
+            var sqlatd8 = fsql.Update<AsTableLog>(Guid.NewGuid()).Set(a => a.msg == "newmsg").Where(a => a.createtime < DateTime.Parse("2022-5-1"));
+            var sqlatd801 = sqlatd8.ToSql();
+            var sqlatd802 = sqlatd8.ExecuteAffrows();
+
             fsql.Aop.AuditValue += new EventHandler<FreeSql.Aop.AuditValueEventArgs>((_, e) =>
             {
 

FreeSql/DataAnnotations/TableAttribute.cs

@@ -105,7 +105,7 @@ public DateTimeAsTableImpl(string tableName, DateTime beginTime, Func<DateTime,
         void ExpandTable(DateTime beginTime, DateTime endTime)
         {
             if (beginTime > endTime) endTime = _nextTimeFunc(beginTime);
-            while (beginTime < endTime)
+            while (beginTime <= endTime)
             {
                 var dtstr = beginTime.ToString(_tableNameFormat.Groups[1].Value);
                 var name = _tableName.Replace(_tableNameFormat.Groups[0].Value, dtstr);
@@ -139,10 +139,10 @@ public string GetTableNameByColumnValue(object columnValue, bool autoExpand = fa
             var dt = ParseColumnValue(columnValue);
             if (dt < _allTablesTime.Last()) throw new Exception($"分表字段值 \"{dt.ToString("yyyy-MM-dd HH:mm:ss")}\" 不能小于 \"{_beginTime.ToString("yyyy-MM-dd HH:mm:ss")} \"");
             var tmpTime = _nextTimeFunc(_lastTime);
-            if (dt > tmpTime && autoExpand)
+            if (dt >= tmpTime && autoExpand)
             {
                 // 自动建表
-                ExpandTable(tmpTime, _nextTimeFunc(dt));
+                ExpandTable(tmpTime, dt);
             }
             for (var a = 0; a < _allTables.Count; a++)
                 if (dt >= _allTablesTime[a])