diff --git a/Src/Asp.Net/OracleTest/Demo/DemoN_SplitTable.cs b/Src/Asp.Net/OracleTest/Demo/DemoN_SplitTable.cs new file mode 100644 index 000000000..4c294b3a5 --- /dev/null +++ b/Src/Asp.Net/OracleTest/Demo/DemoN_SplitTable.cs @@ -0,0 +1,100 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace OrmTest +{ + public class DemoN_SplitTable + { + public static void Init() + { + Console.WriteLine(""); + Console.WriteLine("#### CodeFirst Start ####"); + SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() + { + DbType = DbType.Oracle, + ConnectionString = Config.ConnectionString, + InitKeyType = InitKeyType.Attribute, + IsAutoCloseConnection = true + }); + db.Aop.OnLogExecuted = (s, p) => + { + Console.WriteLine(s); + Console.WriteLine(string.Join(",", p?.Select(it => it.ParameterName + ":" + it.Value))); + }; + + //初始化分表 + db.CodeFirst.SplitTables().InitTables(); + + Console.WriteLine(); + + ////根据最近3个表进行查询 + var list = db.Queryable() + .SplitTable(DateTime.Now.Date.AddYears(-1), DateTime.Now) + .ToList(); + + Console.WriteLine(); + + //根据时间选出的表进行查询 + var list2 = db.Queryable().SplitTable(tabs => tabs.Where(it=> it.Date>=DateTime.Now.AddYears(-2))).ToList(); + + Console.WriteLine(); + + //删除数据只在最近3张表执行操作 + var x = db.Deleteable().Where(it=>it.Pk==Guid.NewGuid()).SplitTable(tabs => tabs.Take(3)).ExecuteCommand(); + + Console.WriteLine(); + + var tableName = db.SplitHelper().GetTableName(DateTime.Now.AddDays(0)); + + var listNull= db.Queryable().SplitTable(ta => ta.InTableNames(tableName)).ToList(); + + var tableName2 = db.SplitHelper(new OrderSpliteTest() { Time=DateTime.Now}).GetTableNames(); + var tableName3 = db.SplitHelper(new List { + new OrderSpliteTest() { Time = DateTime.Now }, + new OrderSpliteTest() { Time = DateTime.Now }, + new OrderSpliteTest() { Time = DateTime.Now.AddMonths(-10) } + }).GetTableNames(); + var x2 = db.Updateable() + .SetColumns(it=>it.Name=="a") + .Where(it => it.Pk == Guid.NewGuid()) + .SplitTable(tabs => tabs.InTableNames(tableName2)) + .ExecuteCommand(); + + Console.WriteLine(); + + //按日分表 + var x3 = db.Insertable(new OrderSpliteTest() { Name="A" }).SplitTable().ExecuteCommand(); + + Console.WriteLine(); + ////强制分表类型 + var x4 = db.Insertable(new OrderSpliteTest() { Name = "A" ,Time=DateTime.Now.AddDays(-1) }).SplitTable().ExecuteCommand(); + + //分表支持BulkCopy + //db.Fastest().SplitTable().BulkCopy(new List { + // new OrderSpliteTest() { Pk=Guid.NewGuid(),Name ="a", Time = DateTime.Now }, + // new OrderSpliteTest() {Pk=Guid.NewGuid(),Name ="a", Time = DateTime.Now }, + // new OrderSpliteTest() {Pk=Guid.NewGuid(),Name ="a", Time = DateTime.Now.AddMonths(-10) } + //}); + + //db.Fastest().SplitTable().BulkUpdate(db.Queryable().SplitTable(it=>it).ToList()); + //db.Fastest().SplitTable().BulkUpdate(db.Queryable().SplitTable(it => it).ToList(),new string[] { "pk"},new string[] { "name"}); + Console.WriteLine("#### CodeFirst end ####"); + } + + [SplitTable(SplitType.Day)] + [SqlSugar.SugarTable("Taxxx0101_{year}{month}{day}")] + public class OrderSpliteTest + { + [SugarColumn(IsPrimaryKey =true)] + public Guid Pk{ get; set; } + public string Name { get; set; } + [SugarColumn(IsNullable =true)] + [SplitField] + public DateTime Time { get; set; } + } + } +} diff --git a/Src/Asp.Net/OracleTest/OracleTest.csproj b/Src/Asp.Net/OracleTest/OracleTest.csproj index 8e2b0d6b9..6afec8c6e 100644 --- a/Src/Asp.Net/OracleTest/OracleTest.csproj +++ b/Src/Asp.Net/OracleTest/OracleTest.csproj @@ -65,6 +65,7 @@ + diff --git a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs index b47251ff1..9ebefee4c 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs @@ -897,7 +897,8 @@ namespace SqlSugar { var splitColumn = this.EntityInfo.Columns.FirstOrDefault(it => it.PropertyInfo.GetCustomAttribute() != null); var columnName = this.SqlBuilder.GetTranslationColumnName(splitColumn.DbColumnName); - return this.Where($" {columnName}>=@spBeginTime AND {columnName}<= @spEndTime",new { spBeginTime = beginTime , spEndTime = endTime}).SplitTable(tas => { + var sqlParameterKeyWord = this.SqlBuilder.SqlParameterKeyWord; + return this.Where($" {columnName}>={sqlParameterKeyWord}spBeginTime AND {columnName}<= {sqlParameterKeyWord}spEndTime",new { spBeginTime = beginTime , spEndTime = endTime}).SplitTable(tas => { var dateNull = DateTime.MinValue; var min = tas.Where(it => it.Date <= beginTime.Date).Select(it=>it.Date).OrderByDescending(it=>it.Date).FirstOrDefault();