diff --git a/Src/Asp.NetCore2/QuestDbTest/Demo/Demo0_SqlSugarClient.cs b/Src/Asp.NetCore2/QuestDbTest/Demo/Demo0_SqlSugarClient.cs index e79f7da6b..5e953d9e1 100644 --- a/Src/Asp.NetCore2/QuestDbTest/Demo/Demo0_SqlSugarClient.cs +++ b/Src/Asp.NetCore2/QuestDbTest/Demo/Demo0_SqlSugarClient.cs @@ -73,10 +73,12 @@ namespace OrmTest //Use db query var dt = db.Ado.SqlQuery("select @id",new { id=1}); + //Create tables db.CodeFirst.InitTables(typeof(OrderItem),typeof(Order)); + //db.DbMaintenance.TruncateTable(); var xx=db.Insertable(new Order() { Name = "order1", CustomId = 1, Price = 0, CreateTime = DateTime.Now }) - .ExecuteCommand(); + .ExecuteReturnSnowflakeId(); //Insert data // db.Insertable(new OrderItem() { OrderId = id, Price = 0, CreateTime=DateTime.Now }).ExecuteCommand(); Console.WriteLine("#### SqlSugarClient End ####"); @@ -87,7 +89,7 @@ namespace OrmTest { Console.WriteLine(""); Console.WriteLine("#### DbContext Start ####"); - var insertObj = new Order { Name = "jack", CreateTime = DateTime.Now }; + var insertObj = new Order { Id=SnowFlakeSingle.Instance.NextId(),Name = "jack", CreateTime = DateTime.Now }; var InsertObjs = new Order[] { insertObj }; DbContext context = new DbContext(); @@ -97,7 +99,7 @@ namespace OrmTest var orderDb = context.OrderDb; //Select - var data1 = orderDb.GetById(1); + // var data1 = orderDb.GetById(); var data2 = orderDb.GetList(); var data3 = orderDb.GetList(it => it.Id == 1); var data4 = orderDb.GetSingle(it => it.Id == 1); diff --git a/Src/Asp.NetCore2/QuestDbTest/Demo/Demo1_Queryable.cs b/Src/Asp.NetCore2/QuestDbTest/Demo/Demo1_Queryable.cs index 2e6371697..17aca0338 100644 --- a/Src/Asp.NetCore2/QuestDbTest/Demo/Demo1_Queryable.cs +++ b/Src/Asp.NetCore2/QuestDbTest/Demo/Demo1_Queryable.cs @@ -35,7 +35,6 @@ namespace OrmTest var getOrderBy2 = db.Queryable().OrderBy(it => it.Id).OrderBy(it => it.Name, OrderByType.Desc).ToList(); var getOrderBy3 = db.Queryable().OrderBy(it =>new { it.Name,it.Id}).ToList(); //var getRandom = db.Queryable().OrderBy(it => SqlFunc.GetRandom()).First(); - var getByPrimaryKey = db.Queryable().InSingle(2); var getSingleOrDefault = db.Queryable().Where(it => it.Id == 1).Single(); var getFirstOrDefault = db.Queryable().First(); var getByWhere = db.Queryable().Where(it => it.Id == 1 || it.Name == "a").ToList(); @@ -63,18 +62,18 @@ namespace OrmTest } var list = new List(); - for (var i = 0; i < 100; i++) + for (var i = 0; i < 1000; i++) { list.Add(new Users { - Id = i + 1, + Sid=SnowFlakeSingle.Instance.NextId(), createtime = DateTime.Now, username = "161718", password = "161718", }); } - db.Insertable(list).ExecuteReturnSnowflakeId(); + db.Insertable(list).ExecuteCommand(); var list2 = db.Queryable().ToList(); @@ -95,7 +94,7 @@ namespace OrmTest var json = db.Queryable().ToJson(); - List listInt = db.Queryable().Select(it => it.Id).ToList(); + List listInt = db.Queryable().Select(it => it.Id).ToList(); var dynamic = db.Queryable().Select().ToList(); diff --git a/Src/Asp.NetCore2/QuestDbTest/Demo/Demo2_Updateable.cs b/Src/Asp.NetCore2/QuestDbTest/Demo/Demo2_Updateable.cs index c3e76b014..77be8d591 100644 --- a/Src/Asp.NetCore2/QuestDbTest/Demo/Demo2_Updateable.cs +++ b/Src/Asp.NetCore2/QuestDbTest/Demo/Demo2_Updateable.cs @@ -36,8 +36,8 @@ namespace OrmTest var updateObj = new Order() { Id = 1, Name = "order1" }; var updateObjs = new List { - new Order() { Id = 11, Name = "order11" }, - new Order() { Id = 12, Name = "order12" } + new Order() { Id = 11, Name = "order11",CreateTime=DateTime.Now }, + new Order() { Id = 12, Name = "order12" ,CreateTime=DateTime.Now} }; //update all columns by primary key diff --git a/Src/Asp.NetCore2/QuestDbTest/Demo/Demo3_Insertable.cs b/Src/Asp.NetCore2/QuestDbTest/Demo/Demo3_Insertable.cs index 346164f99..e265d9375 100644 --- a/Src/Asp.NetCore2/QuestDbTest/Demo/Demo3_Insertable.cs +++ b/Src/Asp.NetCore2/QuestDbTest/Demo/Demo3_Insertable.cs @@ -32,114 +32,31 @@ namespace OrmTest var insertObj = new Order() { Id = 1, Name = "order1",Price=0 }; var updateObjs = new List { - new Order() { Id = 11, Name = "order11", Price=0 }, - new Order() { Id = 12, Name = "order12" , Price=0} + new Order() { Id = SnowFlakeSingle.Instance.NextId(), Name = "order11", Price=0 }, + new Order() { Id = SnowFlakeSingle.Instance.NextId(), Name = "order12" , Price=0} }; var x = db.Insertable(updateObjs).RemoveDataCache().IgnoreColumns(it => it.CreateTime).UseParameter().ExecuteCommand(); //Ignore CreateTime - db.Insertable(insertObj).IgnoreColumns(it => new { it.CreateTime }).ExecuteReturnIdentity();//get identity - db.Insertable(insertObj).IgnoreColumns("CreateTime").ExecuteReturnIdentity(); + db.Insertable(insertObj).IgnoreColumns(it => new { it.CreateTime }).ExecuteReturnSnowflakeId();//get identity + db.Insertable(insertObj).IgnoreColumns("CreateTime").ExecuteReturnSnowflakeId(); //Only insert Name and Price - db.Insertable(insertObj).InsertColumns(it => new { it.Name, it.Price }).ExecuteReturnIdentity(); - db.Insertable(insertObj).InsertColumns("Name", "Price").ExecuteReturnIdentity(); + db.Insertable(insertObj).InsertColumns(it => new { it.Name, it.Price }).ExecuteReturnSnowflakeId(); + db.Insertable(insertObj).InsertColumns("Name", "Price").ExecuteReturnSnowflakeId(); + foreach (var item in updateObjs) + { + item.Id = 0; + } //ignore null columns - db.Insertable(updateObjs).ExecuteCommand();//get change row count + db.Insertable(updateObjs).ExecuteReturnSnowflakeId();//get change row count //Use Lock - db.Insertable(insertObj).With(SqlWith.UpdLock).ExecuteCommand(); - - - db.CodeFirst.InitTables(); - db.CodeFirst.InitTables(); - db.DbMaintenance.TruncateTable("RootTable0"); - db.DbMaintenance.TruncateTable("TwoItem"); - db.DbMaintenance.TruncateTable("TwoItem2"); - db.DbMaintenance.TruncateTable("TwoItem3"); - db.DbMaintenance.TruncateTable("ThreeItem2"); - Console.WriteLine("SubInsert Start"); - - db.Insertable(new Order() - { - Name = "订单 1", - CustomId = 1, - Price = 100, - CreateTime = DateTime.Now, - Id = 0, - Items = new List() { - new OrderItem(){ - - OrderId=0, - Price=1, - ItemId=1 - }, - new OrderItem(){ - CreateTime=DateTime.Now, - OrderId=0, - Price=2, - ItemId=2 - } - } - }) - .AddSubList(it => it.Items.First().OrderId).ExecuteCommand(); - - - - db.Insertable(new List() { - new RootTable0() - { - Name="aa", - TwoItem2=new TwoItem2() { - Id="1", - ThreeItem2=new List(){ - new ThreeItem2(){ Name="a", TwoItem2Id="1" }, - new ThreeItem2(){ Id=2, Name="a2", TwoItem2Id="2" } - } - }, - TwoItem=new TwoItem() - { - Name ="itema" , - RootId=2 - }, - TwoItem3=new List(){ - new TwoItem3(){ Id=0, Name="a",Desc="" }, - - } - }, - new RootTable0() - { - Name="bb", - TwoItem2=new TwoItem2() { - Id="2" - }, - TwoItem=new TwoItem() - { - Name ="itemb" , - RootId=2, - - }, - TwoItem3=new List(){ - new TwoItem3(){ Id=1, Name="b",Desc="" }, - new TwoItem3(){ Id=2, Name="b1",Desc="1" }, - } - } - }) - .AddSubList(it => it.TwoItem.RootId) - .AddSubList(it => new SubInsertTree() - { - Expression = it.TwoItem2.RootId, - ChildExpression = new List() { - new SubInsertTree(){ - Expression=it.TwoItem2.ThreeItem2.First().TwoItem2Id - } - } - }) - .AddSubList(it => it.TwoItem3) - .ExecuteCommand(); + db.Insertable(insertObj).With(SqlWith.UpdLock).ExecuteReturnSnowflakeId(); + Console.WriteLine("#### Insertable End ####"); } } diff --git a/Src/Asp.NetCore2/QuestDbTest/Models/Custom.cs b/Src/Asp.NetCore2/QuestDbTest/Models/Custom.cs index 3b8871c57..5e446d8ac 100644 --- a/Src/Asp.NetCore2/QuestDbTest/Models/Custom.cs +++ b/Src/Asp.NetCore2/QuestDbTest/Models/Custom.cs @@ -6,9 +6,10 @@ using System.Threading.Tasks; namespace OrmTest { + [SqlSugar.SugarTable("Custom_1")] public class Custom { - public int Id { get; set; } + public long Id { get; set; } public string Name { get; set; } } } diff --git a/Src/Asp.NetCore2/QuestDbTest/Models/Order.cs b/Src/Asp.NetCore2/QuestDbTest/Models/Order.cs index 56a442c88..222a0df8f 100644 --- a/Src/Asp.NetCore2/QuestDbTest/Models/Order.cs +++ b/Src/Asp.NetCore2/QuestDbTest/Models/Order.cs @@ -6,19 +6,19 @@ using System.Text; namespace OrmTest { - + [SugarTable("order_1")] public class Order { //不支持自增和主键 （标识主键是用来更新用的） [SugarColumn(IsPrimaryKey = true)] - public int Id { get; set; } + public long Id { get; set; } public string Name { get; set; } public decimal Price { get; set; } // [SugarColumn(IsNullable = true,SqlParameterDbType =System.Data.DbType.Date)] public DateTime CreateTime { get; set; } [SugarColumn(IsNullable =true)] - public int CustomId { get; set; } + public long CustomId { get; set; } [SugarColumn(IsIgnore = true)] public List Items { get; set; } } diff --git a/Src/Asp.NetCore2/QuestDbTest/Models/OrderItem.cs b/Src/Asp.NetCore2/QuestDbTest/Models/OrderItem.cs index 68263a13a..bc921efb7 100644 --- a/Src/Asp.NetCore2/QuestDbTest/Models/OrderItem.cs +++ b/Src/Asp.NetCore2/QuestDbTest/Models/OrderItem.cs @@ -5,13 +5,13 @@ using System.Text; namespace OrmTest { - [SqlSugar.SugarTable("OrderDetail")] + [SqlSugar.SugarTable("OrderDetail_1")] public class OrderItem { //不支持自增和主键 （标识主键是用来更新用的） [SqlSugar.SugarColumn(IsPrimaryKey =true)] - public int ItemId { get; set; } - public int OrderId { get; set; } + public long ItemId { get; set; } + public long OrderId { get; set; } public decimal? Price { get; set; } [SqlSugar.SugarColumn(IsNullable = true)] public DateTime? CreateTime { get; set; } diff --git a/Src/Asp.NetCore2/QuestDbTest/Models/users.cs b/Src/Asp.NetCore2/QuestDbTest/Models/users.cs index 99a52b41f..6b90a67d8 100644 --- a/Src/Asp.NetCore2/QuestDbTest/Models/users.cs +++ b/Src/Asp.NetCore2/QuestDbTest/Models/users.cs @@ -10,12 +10,9 @@ namespace OrmTest public class Users { [SugarColumn(IsPrimaryKey = true)] - public long Sid { get; set; } - - public int Id { get; set; } + public long Sid { get; set; } - [SqlSugar.SugarColumn(IsNullable = true)] - public DateTime? createtime { get; set; } + public DateTime createtime { get; set; } public string username { get; set; } public string password { get; set; }