From bc756d198b5586c931694c7808ab0ba8dea4cb4f Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Tue, 4 Jun 2019 15:23:17 +0800 Subject: [PATCH] Update demo --- Src/Asp.Net/PgSqlTest/Config.cs | 20 +- .../PgSqlTest/Demo/Demo0_SqlSugarClient.cs | 173 +++++++++- Src/Asp.Net/PgSqlTest/Demo/Demo1_Queryable.cs | 68 +++- .../PgSqlTest/Demo/Demo2_Updateable.cs | 8 +- .../PgSqlTest/Demo/Demo3_Insertable.cs | 16 +- .../PgSqlTest/Demo/Demo4_Deleteable.cs | 8 +- .../PgSqlTest/Demo/Demo5_SqlQueryable.cs | 6 +- Src/Asp.Net/PgSqlTest/Demo/Demo6_Queue.cs | 2 +- Src/Asp.Net/PgSqlTest/Demo/Demo7_Ado.cs | 57 ++++ Src/Asp.Net/PgSqlTest/Demo/Demo8_Saveable.cs | 48 +++ .../PgSqlTest/Demo/Demo9_EntityMain.cs | 46 +++ Src/Asp.Net/PgSqlTest/Demo/DemoA_DbMain.cs | 42 +++ Src/Asp.Net/PgSqlTest/Demo/DemoB_Aop.cs | 68 ++++ Src/Asp.Net/PgSqlTest/Demo/DemoE_CodeFirst.cs | 5 +- Src/Asp.Net/PgSqlTest/Demo/DemoF_Utilities.cs | 46 +++ .../PgSqlTest/Demo/DemoG_SimpleClient.cs | 36 +++ .../PgSqlTest/Demo/Democ_GobalFilter.cs | 10 +- .../PgSqlTest/Models/AttributeTable.cs | 20 ++ Src/Asp.Net/PgSqlTest/Models/EntityMapper.cs | 15 + Src/Asp.Net/PgSqlTest/Models/Mapper.cs | 54 ++++ Src/Asp.Net/PgSqlTest/Models/Order.cs | 11 +- .../PgSqlTest/Models/{Mappers.cs => Tree.cs} | 0 Src/Asp.Net/PgSqlTest/PgSqlTest.csproj | 12 +- Src/Asp.Net/PgSqlTest/Program.cs | 22 +- Src/Asp.Net/PgSqlTest/UnitTest/Main.cs | 6 + Src/Asp.Net/PgSqlTest/UnitTest/UAdo.cs | 4 +- Src/Asp.Net/PgSqlTest/UnitTest/UCodeFirst.cs | 3 +- Src/Asp.Net/PgSqlTest/UnitTest/UJson.cs | 18 +- Src/Asp.Net/PgSqlTest/UnitTest/UQueryable.cs | 296 +++++++++++++++++- Src/Asp.Net/PgSqlTest/UnitTest/UThread3.cs | 8 +- Src/Asp.Net/PgSqlTest/UnitTest/UValidate.cs | 2 +- Src/Asp.Net/PgSqlTest/UnitTest/Updateable.cs | 133 +++++++- 32 files changed, 1170 insertions(+), 93 deletions(-) create mode 100644 Src/Asp.Net/PgSqlTest/Demo/Demo7_Ado.cs create mode 100644 Src/Asp.Net/PgSqlTest/Demo/Demo8_Saveable.cs create mode 100644 Src/Asp.Net/PgSqlTest/Demo/Demo9_EntityMain.cs create mode 100644 Src/Asp.Net/PgSqlTest/Demo/DemoA_DbMain.cs create mode 100644 Src/Asp.Net/PgSqlTest/Demo/DemoB_Aop.cs create mode 100644 Src/Asp.Net/PgSqlTest/Demo/DemoF_Utilities.cs create mode 100644 Src/Asp.Net/PgSqlTest/Demo/DemoG_SimpleClient.cs create mode 100644 Src/Asp.Net/PgSqlTest/Models/AttributeTable.cs create mode 100644 Src/Asp.Net/PgSqlTest/Models/EntityMapper.cs create mode 100644 Src/Asp.Net/PgSqlTest/Models/Mapper.cs rename Src/Asp.Net/PgSqlTest/Models/{Mappers.cs => Tree.cs} (100%) diff --git a/Src/Asp.Net/PgSqlTest/Config.cs b/Src/Asp.Net/PgSqlTest/Config.cs index f6e313fb4..c8c29c8d8 100644 --- a/Src/Asp.Net/PgSqlTest/Config.cs +++ b/Src/Asp.Net/PgSqlTest/Config.cs @@ -6,10 +6,26 @@ using System.Threading.Tasks; namespace OrmTest { + /// + /// Setting up the database name does not require you to create the database + /// 设置好数据库名不需要你去手动建库 + /// public class Config { + /// + /// Account have permission to create database + /// 用有建库权限的数据库账号 + /// public static string ConnectionString = "PORT=5432;DATABASE=SqlSugar4xTest;HOST=localhost;PASSWORD=haosql;USER ID=postgres"; - public static string ConnectionString2 = "PORT=5432;DATABASE=SqlSugar4xTest;HOST=localhost;PASSWORD=haosql;USER ID=postgres"; - public static string ConnectionString3 = "PORT=5432;DATABASE=SqlSugar4xTest;HOST=localhost;PASSWORD=haosql;USER ID=postgres"; + /// + /// Account have permission to create database + /// 用有建库权限的数据库账号 + /// + public static string ConnectionString2 = "PORT=5432;DATABASE=SqlSugar4xTest2;HOST=localhost;PASSWORD=haosql;USER ID=postgres"; + /// + /// Account have permission to create database + /// 用有建库权限的数据库账号 + /// + public static string ConnectionString3 = "PORT=5432;DATABASE=SqlSugar4xTest3;HOST=localhost;PASSWORD=haosql;USER ID=postgres"; } } diff --git a/Src/Asp.Net/PgSqlTest/Demo/Demo0_SqlSugarClient.cs b/Src/Asp.Net/PgSqlTest/Demo/Demo0_SqlSugarClient.cs index 81a556044..ed581f597 100644 --- a/Src/Asp.Net/PgSqlTest/Demo/Demo0_SqlSugarClient.cs +++ b/Src/Asp.Net/PgSqlTest/Demo/Demo0_SqlSugarClient.cs @@ -16,10 +16,37 @@ namespace OrmTest SqlSugarClient();//Create db DbContext();//Optimizing SqlSugarClient usage SingletonPattern();//Singleten Pattern - DistributedTransactionExample(); + DistributedTransactionExample(); + MasterSlave();//Read-write separation CustomAttribute(); } + private static void MasterSlave() + { + Console.WriteLine(""); + Console.WriteLine("#### MasterSlave Start ####"); + SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() + { + ConnectionString = Config.ConnectionString,//Master Connection + DbType = DbType.PostgreSQL, + InitKeyType = InitKeyType.Attribute, + IsAutoCloseConnection = true, + SlaveConnectionConfigs = new List() { + new SlaveConnectionConfig() { HitRate=10, ConnectionString=Config.ConnectionString2 } , + new SlaveConnectionConfig() { HitRate=10, ConnectionString=Config.ConnectionString2 } + } + }); + db.Aop.OnLogExecuted = (s, p) => + { + Console.WriteLine(db.Ado.Connection.ConnectionString); + }; + Console.WriteLine("Master:"); + db.Insertable(new Order() { Name = "abc", CustomId = 1, CreateTime = DateTime.Now }).ExecuteCommand(); + Console.WriteLine("Slave:"); + db.Queryable().First(); + Console.WriteLine("#### MasterSlave End ####"); + } + private static void SqlSugarClient() { //Create db @@ -40,16 +67,18 @@ namespace OrmTest } }); - //if no exist create datebase SQLSUGAR4XTEST (bin/database/) + //If no exist create datebase db.DbMaintenance.CreateDatabase(); - //Use db + //Use db query var dt = db.Ado.GetDataTable("select 1"); - //create table OrderDetail - db.CodeFirst.InitTables(typeof(OrderItem)); + //Create tables + db.CodeFirst.InitTables(typeof(OrderItem),typeof(Order)); + var id = db.Insertable(new Order() { Name = "order1", CustomId = 1, Price = 0, CreateTime = DateTime.Now }).ExecuteReturnIdentity(); - db.Insertable(new OrderItem() { OrderId = 1, Price = 0 }).ExecuteCommand(); + //Insert data + db.Insertable(new OrderItem() { OrderId = id, Price = 0, CreateTime=DateTime.Now }).ExecuteCommand(); Console.WriteLine("#### SqlSugarClient End ####"); } @@ -78,7 +107,7 @@ namespace OrmTest var data6 = orderDb.GetPageList(it => it.Name == "xx", p, it => it.Name, OrderByType.Asc); Console.Write(p.PageCount); List conModels = new List(); - conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1" , FieldValueConvertFunc=it => Convert.ToInt32(it)});//id=1 + conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1", FieldValueConvertFunc=it=>Convert.ToInt32(it) });//id=1 var data7 = orderDb.GetPageList(conModels, p, it => it.Name, OrderByType.Asc); orderDb.AsQueryable().Where(x => x.Id == 1).ToList(); @@ -91,10 +120,10 @@ namespace OrmTest //Delete orderDb.Delete(insertObj); - orderDb.DeleteById(1); - orderDb.DeleteById(new int[] { 1, 2 }); - orderDb.Delete(it => it.Id == 1); - orderDb.AsDeleteable().Where(it => it.Id == 1).ExecuteCommand(); + orderDb.DeleteById(11111); + orderDb.DeleteById(new int[] { 1111, 2222 }); + orderDb.Delete(it => it.Id == 1111); + orderDb.AsDeleteable().Where(it => it.Id == 1111).ExecuteCommand(); //Update orderDb.Update(insertObj); @@ -142,10 +171,10 @@ namespace OrmTest } } }); - db.CodeFirst.InitTables();//Create Table + db.CodeFirst.InitTables();//Create Table - db.Insertable(new MyCustomAttributeTable() { Id = Guid.NewGuid().ToString(), Name = "Name" }).ExecuteCommand(); - var list = db.Queryable().ToList(); + db.Insertable(new AttributeTable() { Id = Guid.NewGuid().ToString(), Name = "Name" }).ExecuteCommand(); + var list = db.Queryable().ToList(); Console.WriteLine("#### Custom Attribute End ####"); } @@ -193,7 +222,121 @@ namespace OrmTest private static void DistributedTransactionExample() { - //see sqlservertest + Console.WriteLine(""); + Console.WriteLine("#### Distributed TransactionExample Start ####"); + SqlSugarClient db = new SqlSugarClient(new List() + { + new ConnectionConfig(){ ConfigId="1", DbType=DbType.PostgreSQL, ConnectionString=Config.ConnectionString,InitKeyType=InitKeyType.Attribute,IsAutoCloseConnection=true }, + new ConnectionConfig(){ ConfigId="2", DbType=DbType.PostgreSQL, ConnectionString=Config.ConnectionString2 ,InitKeyType=InitKeyType.Attribute ,IsAutoCloseConnection=true} + }); + + //use db1 + db.CodeFirst.SetStringDefaultLength(200).InitTables(typeof(Order), typeof(OrderItem));// + db.Insertable(new Order() { Name = "order1", CreateTime = DateTime.Now }).ExecuteCommand(); + Console.WriteLine(db.CurrentConnectionConfig.DbType + ":" + db.Queryable().Count()); + + //use db2 + db.ChangeDatabase("2"); + db.DbMaintenance.CreateDatabase();//Create Database2 + db.CodeFirst.SetStringDefaultLength(200).InitTables(typeof(Order), typeof(OrderItem)); + db.Insertable(new Order() { Name = "order1", CreateTime = DateTime.Now }).ExecuteCommand(); + Console.WriteLine(db.CurrentConnectionConfig.DbType + ":" + db.Queryable().Count()); + + // Example 1 + Console.WriteLine("Example 1"); + try + { + db.BeginTran(); + + db.ChangeDatabase("1");//use db1 + db.Deleteable().ExecuteCommand(); + Console.WriteLine("---Delete all " + db.CurrentConnectionConfig.DbType); + Console.WriteLine(db.Queryable().Count()); + + db.ChangeDatabase("2");//use db2 + db.Deleteable().ExecuteCommand(); + Console.WriteLine("---Delete all " + db.CurrentConnectionConfig.DbType); + Console.WriteLine(db.Queryable().Count()); + + throw new Exception(); + db.CommitTran(); + } + catch + { + db.RollbackTran(); + Console.WriteLine("---Roll back"); + db.ChangeDatabase("1");//use db1 + Console.WriteLine(db.CurrentConnectionConfig.DbType); + Console.WriteLine(db.Queryable().Count()); + + db.ChangeDatabase("2");//use db2 + Console.WriteLine(db.CurrentConnectionConfig.DbType); + Console.WriteLine(db.Queryable().Count()); + } + + + + // Example 2 + Console.WriteLine("Example 2"); + + var result=db.UseTran(() => + { + + db.ChangeDatabase("1");//use db1 + db.Deleteable().ExecuteCommand(); + Console.WriteLine("---Delete all " + db.CurrentConnectionConfig.DbType); + Console.WriteLine(db.Queryable().Count()); + + db.ChangeDatabase("2");//use db2 + db.Deleteable().ExecuteCommand(); + Console.WriteLine("---Delete all " + db.CurrentConnectionConfig.DbType); + Console.WriteLine(db.Queryable().Count()); + throw new Exception(""); + + }); + if (result.IsSuccess == false) { + Console.WriteLine("---Roll back"); + db.ChangeDatabase("1");//use db1 + Console.WriteLine(db.CurrentConnectionConfig.DbType); + Console.WriteLine(db.Queryable().Count()); + + db.ChangeDatabase("2");//use db2 + Console.WriteLine(db.CurrentConnectionConfig.DbType); + Console.WriteLine(db.Queryable().Count()); + } + + // Example 3 + Console.WriteLine("Example 3"); + + var result2 = db.UseTranAsync(() => + { + + db.ChangeDatabase("1");//use db1 + db.Deleteable().ExecuteCommand(); + Console.WriteLine("---Delete all " + db.CurrentConnectionConfig.DbType); + Console.WriteLine(db.Queryable().Count()); + + db.ChangeDatabase("2");//use db2 + db.Deleteable().ExecuteCommand(); + Console.WriteLine("---Delete all " + db.CurrentConnectionConfig.DbType); + Console.WriteLine(db.Queryable().Count()); + throw new Exception(""); + + }); + result2.Wait(); + if (result.IsSuccess == false) + { + Console.WriteLine("---Roll back"); + db.ChangeDatabase("1");//use sqlserver + Console.WriteLine(db.CurrentConnectionConfig.DbType); + Console.WriteLine(db.Queryable().Count()); + + db.ChangeDatabase("2");//use mysql + Console.WriteLine(db.CurrentConnectionConfig.DbType); + Console.WriteLine(db.Queryable().Count()); + } + + Console.WriteLine("#### Distributed TransactionExample End ####"); } } diff --git a/Src/Asp.Net/PgSqlTest/Demo/Demo1_Queryable.cs b/Src/Asp.Net/PgSqlTest/Demo/Demo1_Queryable.cs index 194e2f07e..3113645c2 100644 --- a/Src/Asp.Net/PgSqlTest/Demo/Demo1_Queryable.cs +++ b/Src/Asp.Net/PgSqlTest/Demo/Demo1_Queryable.cs @@ -15,7 +15,7 @@ namespace OrmTest { EasyExamples(); QueryConditions(); - //JoinTable(); + JoinTable(); Async(); NoEntity(); Mapper(); @@ -123,7 +123,7 @@ namespace OrmTest Console.WriteLine(""); Console.WriteLine("#### SqlFunc Start ####"); var db = GetInstance(); - var index= db.Queryable().Select(it => SqlFunc.Contains(it.Name, "cccacc")).First(); + var index= db.Queryable().Select(it => SqlFunc.Contains("a", "cccacc")).First(); Console.WriteLine("#### SqlFunc End ####"); } @@ -142,13 +142,43 @@ namespace OrmTest db.Insertable(new Tree() { Id = 2, Name = "root" }).ExecuteCommand(); db.Insertable(new Tree() { Id = 22, Name = "child3", ParentId = 2 }).ExecuteCommand(); - var list=db.Queryable() + // Same property name mapping,Both entities have parentId + var list = db.Queryable().Mapper(it => it.Parent, it => it.ParentId).ToList(); + + + //If both entities have parentId, I don't want to associate with parentId. + var list1 =db.Queryable() //parent=(select * from parent where id=it.parentid) .Mapper(it=>it.Parent,it=>it.ParentId, it=>it.Parent.Id) //Child=(select * from parent where ParentId=it.id) .Mapper(it => it.Child, it => it.Id, it => it.Parent.ParentId) .ToList(); + //one to one + var list2 = db.Queryable().Mapper(it => it.Order, it => it.OrderId).ToList(); + //one to many + var list3 = db.Queryable().Mapper(it => it.Items, it => it.Items.First().OrderId).ToList(); + + //many to many + db.CodeFirst.InitTables(); + + db.Insertable(new A() { Name = "A" }).ExecuteCommand(); + db.Insertable(new B() { Name = "B" }).ExecuteCommand(); + db.Insertable(new ABMapping() { AId = 1, BId = 1 }).ExecuteCommand(); + + var list4 = db.Queryable() + .Mapper(it => it.A, it => it.AId) + .Mapper(it => it.B, it => it.BId).ToList(); + + //Manual mode + var result = db.Queryable().Take(10).Select().Mapper((itemModel, cache) => + { + var allItems = cache.Get(orderList => { + var allIds = orderList.Select(it => it.Id).ToList(); + return db.Queryable().Where(it => allIds.Contains(it.OrderId)).ToList();//Execute only once + }); + itemModel.Items = allItems.Where(it => it.OrderId==itemModel.Id).ToList();//Every time it's executed + }).ToList(); Console.WriteLine("#### End Start ####"); } @@ -159,7 +189,7 @@ namespace OrmTest Console.WriteLine("#### No Entity Start ####"); var db = GetInstance(); - var list = db.Queryable().AS("order").Where("id=@id", new { id = 1 }).ToList(); + var list = db.Queryable().AS("order").Where("id=id", new { id = 1 }).ToList(); var list2 = db.Queryable("o").AS("order").AddJoinInfo("OrderDetail", "i", "o.id=i.OrderId").Where("id=id", new { id = 1 }).Select("o.*").ToList(); Console.WriteLine("#### No Entity End ####"); @@ -216,20 +246,42 @@ namespace OrmTest .Or(it => it.Name.Contains("jack")).ToExpression(); var list3 = db.Queryable().Where(exp).ToList(); - + + /*** By sql***/ + + //id=@id + var list4 = db.Queryable().Where("id=@id", new { id = 1 }).ToList(); + //id=@id or name like '%'+@name+'%' + var list5 = db.Queryable().Where("id=@id or name like @name ", new { id = 1, name = "%jack%" }).ToList(); + /*** By dynamic***/ //id=1 var conModels = new List(); - conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1" , FieldValueConvertFunc = it => Convert.ToInt32(it) });//id=1 + conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1" , FieldValueConvertFunc=it=>Convert.ToInt32(it) });//id=1 var student = db.Queryable().Where(conModels).ToList(); //Complex use case List Order = new List(); - conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1", FieldValueConvertFunc=it=>Convert.ToInt32(it) });//id=1 - + conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1", FieldValueConvertFunc = it => Convert.ToInt32(it) });//id=1 + //conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Like, FieldValue = "1", FieldValueConvertFunc = it => Convert.ToInt32(it) });// id like '%1%' + //conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.IsNullOrEmpty }); + //conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.In, FieldValue = "1,2,3" }); + //conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.NotIn, FieldValue = "1,2,3" }); + //conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.NoEqual, FieldValue = "1,2,3" }); + //conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.IsNot, FieldValue = null });// id is not null + + conModels.Add(new ConditionalCollections() + { + ConditionalList = new List>()// (id=1 or id=2 and id=1) + { + //new KeyValuePair( WhereType.And ,new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1" }), + new KeyValuePair (WhereType.Or,new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "2" , FieldValueConvertFunc = it => Convert.ToInt32(it) }), + new KeyValuePair ( WhereType.And,new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "2" ,FieldValueConvertFunc = it => Convert.ToInt32(it)}) + } + }); var list6 = db.Queryable().Where(conModels).ToList(); /*** Conditional builder ***/ diff --git a/Src/Asp.Net/PgSqlTest/Demo/Demo2_Updateable.cs b/Src/Asp.Net/PgSqlTest/Demo/Demo2_Updateable.cs index ae5259aef..60a5ce9d7 100644 --- a/Src/Asp.Net/PgSqlTest/Demo/Demo2_Updateable.cs +++ b/Src/Asp.Net/PgSqlTest/Demo/Demo2_Updateable.cs @@ -64,7 +64,7 @@ namespace OrmTest var result71 = db.Updateable().SetColumns(it => new Order() { Name = "a", CreateTime = DateTime.Now }).Where(it => it.Id == 11).ExecuteCommand(); //only update name var result8 = db.Updateable(it => it.Name == "Name").Where(it => it.Id == 1).ExecuteCommand(); - var result81 = db.Updateable().SetColumns(it => it.Name == "Name").Where(it => it.Id == 1).ExecuteCommand(); + var result81 = db.Updateable().SetColumns(it => it.Name == "Name" ).Where(it => it.Id == 1).ExecuteCommand(); // @@ -73,13 +73,13 @@ namespace OrmTest /*** 3.by Dictionary ***/ var dt = new Dictionary(); dt.Add("id", 1); - dt.Add("name", null); + dt.Add("name", "abc"); dt.Add("createTime", DateTime.Now); var dtList = new List>(); dtList.Add(dt); - var t66 = db.Updateable(dt).AS("student").WhereColumns("id").ExecuteCommand(); - var t666 = db.Updateable(dtList).AS("student").WhereColumns("id").ExecuteCommand(); + var t66 = db.Updateable(dt).AS("order").WhereColumns("id").ExecuteCommand(); + var t666 = db.Updateable(dtList).AS("order").WhereColumns("id").ExecuteCommand(); diff --git a/Src/Asp.Net/PgSqlTest/Demo/Demo3_Insertable.cs b/Src/Asp.Net/PgSqlTest/Demo/Demo3_Insertable.cs index 292ed577d..b0973505c 100644 --- a/Src/Asp.Net/PgSqlTest/Demo/Demo3_Insertable.cs +++ b/Src/Asp.Net/PgSqlTest/Demo/Demo3_Insertable.cs @@ -30,22 +30,22 @@ namespace OrmTest } }); - var insertObj = new Order() { Id = 1, Name = "order1" }; + var insertObj = new Order() { Id = 1, Name = "order1",Price=0 }; var updateObjs = new List { - new Order() { Id = 11, Name = "order11" }, - new Order() { Id = 12, Name = "order12" } + new Order() { Id = 11, Name = "order11", Price=0 }, + new Order() { Id = 12, Name = "order12" , Price=0} }; - //Ignore Price - db.Insertable(insertObj).IgnoreColumns(it => new { it.Price }).ExecuteReturnIdentity();//get identity - db.Insertable(insertObj).IgnoreColumns("Name", "TestId").ExecuteReturnIdentity(); + //Ignore CreateTime + db.Insertable(insertObj).IgnoreColumns(it => new { it.CreateTime }).ExecuteReturnIdentity();//get identity + db.Insertable(insertObj).IgnoreColumns("CreateTime").ExecuteReturnIdentity(); //Only insert Name and Price db.Insertable(insertObj).InsertColumns(it => new { it.Name, it.Price }).ExecuteReturnIdentity(); - db.Insertable(insertObj).InsertColumns("Name", "SchoolId").ExecuteReturnIdentity(); + db.Insertable(insertObj).InsertColumns("Name", "Price").ExecuteReturnIdentity(); //ignore null columns - db.Insertable(insertObj).IgnoreColumns(ignoreNullColumn: true).ExecuteCommand();//get change row count + db.Insertable(updateObjs).ExecuteCommand();//get change row count //Use Lock db.Insertable(insertObj).With(SqlWith.UpdLock).ExecuteCommand(); diff --git a/Src/Asp.Net/PgSqlTest/Demo/Demo4_Deleteable.cs b/Src/Asp.Net/PgSqlTest/Demo/Demo4_Deleteable.cs index 39fe7ab67..c9461903b 100644 --- a/Src/Asp.Net/PgSqlTest/Demo/Demo4_Deleteable.cs +++ b/Src/Asp.Net/PgSqlTest/Demo/Demo4_Deleteable.cs @@ -30,16 +30,16 @@ namespace OrmTest } }); //by entity - db.Deleteable().Where(new Order() { Id = 1 }).ExecuteCommand(); + db.Deleteable().Where(new Order() { Id = 1111 }).ExecuteCommand(); //by primary key - db.Deleteable().In(1).ExecuteCommand(); + db.Deleteable().In(1111).ExecuteCommand(); //by primary key array - db.Deleteable().In(new int[] { 1, 2 }).ExecuteCommand(); + db.Deleteable().In(new int[] { 1111, 2222 }).ExecuteCommand(); //by expression - db.Deleteable().Where(it => it.Id == 1).ExecuteCommand(); + db.Deleteable().Where(it => it.Id == 11111).ExecuteCommand(); Console.WriteLine("#### Deleteable End ####"); diff --git a/Src/Asp.Net/PgSqlTest/Demo/Demo5_SqlQueryable.cs b/Src/Asp.Net/PgSqlTest/Demo/Demo5_SqlQueryable.cs index 8aa49913f..8316053fe 100644 --- a/Src/Asp.Net/PgSqlTest/Demo/Demo5_SqlQueryable.cs +++ b/Src/Asp.Net/PgSqlTest/Demo/Demo5_SqlQueryable.cs @@ -23,13 +23,13 @@ namespace OrmTest }); int total = 0; - var list = db.SqlQueryable("select * from student").ToPageList(1, 2, ref total); + var list = db.SqlQueryable("select * from \"order\"").ToPageList(1, 2, ref total); //by expression - var list2 = db.SqlQueryable("select * from student").Where(it => it.Id == 1).ToPageList(1, 2); + var list2 = db.SqlQueryable("select * from \"order\"").Where(it => it.Id == 1).ToPageList(1, 2); //by sql - var list3 = db.SqlQueryable("select * from student").Where("id=@id", new { id = 1 }).ToPageList(1, 2); + var list3 = db.SqlQueryable("select * from \"order\"").Where("id=@id", new { id = 1 }).ToPageList(1, 2); Console.WriteLine("#### SqlQueryable End ####"); } diff --git a/Src/Asp.Net/PgSqlTest/Demo/Demo6_Queue.cs b/Src/Asp.Net/PgSqlTest/Demo/Demo6_Queue.cs index 6748569f3..c6a6a7519 100644 --- a/Src/Asp.Net/PgSqlTest/Demo/Demo6_Queue.cs +++ b/Src/Asp.Net/PgSqlTest/Demo/Demo6_Queue.cs @@ -43,7 +43,7 @@ namespace OrmTest db.Queryable().AddQueue(); db.Queryable().AddQueue(); - db.AddQueue("select * from \"order\" where id=@id", new { id = 10000 }); + db.AddQueue("select * from `order` where id=@id", new { id = 10000 }); var result2 = db.SaveQueues(); Console.WriteLine("#### Queue End ####"); diff --git a/Src/Asp.Net/PgSqlTest/Demo/Demo7_Ado.cs b/Src/Asp.Net/PgSqlTest/Demo/Demo7_Ado.cs new file mode 100644 index 000000000..726f21ead --- /dev/null +++ b/Src/Asp.Net/PgSqlTest/Demo/Demo7_Ado.cs @@ -0,0 +1,57 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace OrmTest +{ + public class Demo7_Ado + { + public static void Init() + { + Console.WriteLine(""); + Console.WriteLine("#### Ado Start ####"); + + SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() + { + DbType = DbType.PostgreSQL, + ConnectionString = Config.ConnectionString, + InitKeyType = InitKeyType.Attribute, + IsAutoCloseConnection = true, + AopEvents = new AopEvents + { + OnLogExecuting = (sql, p) => + { + Console.WriteLine(sql); + Console.WriteLine(string.Join(",", p?.Select(it => it.ParameterName + ":" + it.Value))); + } + } + }); + //sql + var dt = db.Ado.GetDataTable("select * from \"order\" where @id>0 or name=@name", new List(){ + new SugarParameter("@id",1), + new SugarParameter("@name","2") + }); + + //sql + var dt2 = db.Ado.GetDataTable("select * from \"order\" where @id>0 or name=@name", new { id = 1, name = "2" }); + + //Stored Procedure + //var dt3 = db.Ado.UseStoredProcedure().GetDataTable("sp_school", new { name = "张三", age = 0 }); + //var nameP = new SugarParameter("@name", "张三"); + //var ageP = new SugarParameter("@age", null, true);//isOutput=true + //var dt4 = db.Ado.UseStoredProcedure().GetDataTable("sp_school", nameP, ageP); + + + + //There are many methods to under db.ado + var list= db.Ado.SqlQuery("select * from \"order\" "); + var intValue=db.Ado.SqlQuerySingle("select 1"); + db.Ado.ExecuteCommand("delete from \"order\" where id>1000"); + //db.Ado.xxx + Console.WriteLine("#### Ado End ####"); + } + } +} diff --git a/Src/Asp.Net/PgSqlTest/Demo/Demo8_Saveable.cs b/Src/Asp.Net/PgSqlTest/Demo/Demo8_Saveable.cs new file mode 100644 index 000000000..ff26b98c5 --- /dev/null +++ b/Src/Asp.Net/PgSqlTest/Demo/Demo8_Saveable.cs @@ -0,0 +1,48 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace OrmTest +{ + public class Demo8_Saveable + { + public static void Init() + { + Console.WriteLine(""); + Console.WriteLine("#### Saveable Start ####"); + + SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() + { + DbType = DbType.PostgreSQL, + ConnectionString = Config.ConnectionString, + InitKeyType = InitKeyType.Attribute, + IsAutoCloseConnection = true, + AopEvents = new AopEvents + { + OnLogExecuting = (sql, p) => + { + Console.WriteLine(sql); + Console.WriteLine(string.Join(",", p?.Select(it => it.ParameterName + ":" + it.Value))); + } + } + }); + + + //insert or update + db.Saveable(new Order() { Id=1, Name="jack" }).ExecuteReturnEntity(); + + + //insert or update + db.Saveable(new Order() { Id = 1000, Name = "jack", CreateTime=DateTime.Now }) + .InsertColumns(it => new { it.Name,it.CreateTime, it.Price})//if insert into name,CreateTime,Price + .UpdateColumns(it => new { it.Name, it.CreateTime })//if update set name CreateTime + .ExecuteReturnEntity(); + + Console.WriteLine(""); + Console.WriteLine("#### Saveable End ####"); + } + } +} diff --git a/Src/Asp.Net/PgSqlTest/Demo/Demo9_EntityMain.cs b/Src/Asp.Net/PgSqlTest/Demo/Demo9_EntityMain.cs new file mode 100644 index 000000000..ef47852fc --- /dev/null +++ b/Src/Asp.Net/PgSqlTest/Demo/Demo9_EntityMain.cs @@ -0,0 +1,46 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace OrmTest +{ + public class Demo9_EntityMain + { + public static void Init() + { + Console.WriteLine(""); + Console.WriteLine("#### EntityMain Start ####"); + + SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() + { + DbType = DbType.PostgreSQL, + ConnectionString = Config.ConnectionString, + InitKeyType = InitKeyType.Attribute, + IsAutoCloseConnection = true, + AopEvents = new AopEvents + { + OnLogExecuting = (sql, p) => + { + Console.WriteLine(sql); + Console.WriteLine(string.Join(",", p?.Select(it => it.ParameterName + ":" + it.Value))); + } + } + }); + var entityInfo = db.EntityMaintenance.GetEntityInfo(); + foreach (var column in entityInfo.Columns) + { + Console.WriteLine(column.DbColumnName); + } + + var dbColumnsName = db.EntityMaintenance.GetDbColumnName("Name"); + + var dbTableName = db.EntityMaintenance.GetTableName(); + + //more https://github.com/sunkaixuan/SqlSugar/wiki/9.EntityMain + Console.WriteLine("#### EntityMain End ####"); + } + } +} diff --git a/Src/Asp.Net/PgSqlTest/Demo/DemoA_DbMain.cs b/Src/Asp.Net/PgSqlTest/Demo/DemoA_DbMain.cs new file mode 100644 index 000000000..0cc6af948 --- /dev/null +++ b/Src/Asp.Net/PgSqlTest/Demo/DemoA_DbMain.cs @@ -0,0 +1,42 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace OrmTest +{ + public class DemoA_DbMain + { + public static void Init() + { + Console.WriteLine(""); + Console.WriteLine("#### DbMain Start ####"); + + SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() + { + DbType = DbType.PostgreSQL, + ConnectionString = Config.ConnectionString, + InitKeyType = InitKeyType.Attribute, + IsAutoCloseConnection = true, + AopEvents = new AopEvents + { + OnLogExecuting = (sql, p) => + { + Console.WriteLine(sql); + Console.WriteLine(string.Join(",", p?.Select(it => it.ParameterName + ":" + it.Value))); + } + } + }); + + var tables = db.DbMaintenance.GetTableInfoList(); + foreach (var table in tables) + { + Console.WriteLine(table.Description); + } + //more https://github.com/sunkaixuan/SqlSugar/wiki/a.DbMain + Console.WriteLine("#### DbMain End ####"); + } + } +} diff --git a/Src/Asp.Net/PgSqlTest/Demo/DemoB_Aop.cs b/Src/Asp.Net/PgSqlTest/Demo/DemoB_Aop.cs new file mode 100644 index 000000000..a8b633e8f --- /dev/null +++ b/Src/Asp.Net/PgSqlTest/Demo/DemoB_Aop.cs @@ -0,0 +1,68 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace OrmTest +{ + public class DemoB_Aop + { + public static void Init() + { + Console.WriteLine(""); + Console.WriteLine("#### Aop Start ####"); + + SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() + { + DbType = DbType.PostgreSQL, + ConnectionString = Config.ConnectionString, + InitKeyType = InitKeyType.Attribute, + IsAutoCloseConnection = true + }); + db.Aop.OnLogExecuted = (sql, pars) => //SQL executed event + { + Console.WriteLine("OnLogExecuted"+sql); + }; + db.Aop.OnLogExecuting = (sql, pars) => //SQL executing event (pre-execution) + { + Console.WriteLine("OnLogExecuting" + sql); + }; + db.Aop.OnError = (exp) =>//SQL execution error event + { + //exp.sql + }; + db.Aop.OnExecutingChangeSql = (sql, pars) => //SQL executing event (pre-execution,SQL script can be modified) + { + return new KeyValuePair(sql, pars); + }; + db.Aop.OnDiffLogEvent = it =>//Get data changes + { + var editBeforeData = it.BeforeData; + var editAfterData = it.AfterData; + var sql = it.Sql; + var parameter = it.Parameters; + var businessData = it.BusinessData; + var time = it.Time; + var diffType = it.DiffType;//enum insert 、update and delete + Console.WriteLine(businessData); + Console.WriteLine(editBeforeData[0].Columns[1].Value); + Console.WriteLine("to"); + Console.WriteLine(editAfterData[0].Columns[1].Value); + //Write logic + }; + + + db.Queryable().ToList(); + db.Queryable().ToList(); + + //OnDiffLogEvent + var data = db.Queryable().First(); + data.Name = "changeName"; + db.Updateable(data).EnableDiffLogEvent("--update Order--").ExecuteCommand(); + + Console.WriteLine("#### Aop End ####"); + } + } +} diff --git a/Src/Asp.Net/PgSqlTest/Demo/DemoE_CodeFirst.cs b/Src/Asp.Net/PgSqlTest/Demo/DemoE_CodeFirst.cs index 178a60a71..c474195d2 100644 --- a/Src/Asp.Net/PgSqlTest/Demo/DemoE_CodeFirst.cs +++ b/Src/Asp.Net/PgSqlTest/Demo/DemoE_CodeFirst.cs @@ -15,11 +15,11 @@ namespace OrmTest SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() { DbType = DbType.PostgreSQL, - ConnectionString = "PORT=5432;DATABASE=MyDbTest;HOST=localhost;PASSWORD=haosql;USER ID=postgres", + ConnectionString = Config.ConnectionString3, InitKeyType = InitKeyType.Attribute, IsAutoCloseConnection = true }); - db.DbMaintenance.CreateDatabase(@"c:\"); + db.DbMaintenance.CreateDatabase(); db.CodeFirst.InitTables(typeof(CodeFirstTable1));//Create CodeFirstTable1 db.Insertable(new CodeFirstTable1() { Name = "a", Text="a" }).ExecuteCommand(); var list = db.Queryable().ToList(); @@ -32,6 +32,7 @@ namespace OrmTest [SugarColumn(IsIdentity = true, IsPrimaryKey = true)] public int Id { get; set; } public string Name { get; set; } + [SugarColumn(ColumnDataType = "varchar(255)")]//custom public string Text { get; set; } [SugarColumn(IsNullable = true)] public DateTime CreateTime { get; set; } diff --git a/Src/Asp.Net/PgSqlTest/Demo/DemoF_Utilities.cs b/Src/Asp.Net/PgSqlTest/Demo/DemoF_Utilities.cs new file mode 100644 index 000000000..af5618575 --- /dev/null +++ b/Src/Asp.Net/PgSqlTest/Demo/DemoF_Utilities.cs @@ -0,0 +1,46 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace OrmTest +{ + public class DemoF_Utilities + { + public static void Init() + { + Console.WriteLine(""); + Console.WriteLine("#### Utilities Start ####"); + + SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() + { + DbType = DbType.PostgreSQL, + ConnectionString = Config.ConnectionString, + InitKeyType = InitKeyType.Attribute, + IsAutoCloseConnection = true, + AopEvents = new AopEvents + { + OnLogExecuting = (sql, p) => + { + Console.WriteLine(sql); + Console.WriteLine(string.Join(",", p?.Select(it => it.ParameterName + ":" + it.Value))); + } + } + }); + + + List ids = Enumerable.Range(1, 100).ToList(); + db.Utilities.PageEach(ids, 10, list => + { + Console.WriteLine(string.Join("," ,list)); + }); + + var list2= db.Utilities.DataTableToList(db.Ado.GetDataTable("select * from \"order\"")); + + //more https://github.com/sunkaixuan/SqlSugar/wiki/f.Utilities + Console.WriteLine("#### Utilities End ####"); + } + } +} diff --git a/Src/Asp.Net/PgSqlTest/Demo/DemoG_SimpleClient.cs b/Src/Asp.Net/PgSqlTest/Demo/DemoG_SimpleClient.cs new file mode 100644 index 000000000..0dca10b95 --- /dev/null +++ b/Src/Asp.Net/PgSqlTest/Demo/DemoG_SimpleClient.cs @@ -0,0 +1,36 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace OrmTest +{ + public class DemoG_SimpleClient + { + public static void Init() + { + Console.WriteLine(""); + Console.WriteLine("#### SimpleClient Start ####"); + + SqlSugarClient db = new SqlSugarClient(new ConnectionConfig() + { + DbType = DbType.PostgreSQL, + ConnectionString = Config.ConnectionString, + InitKeyType = InitKeyType.Attribute, + IsAutoCloseConnection = true, + AopEvents = new AopEvents + { + OnLogExecuting = (sql, p) => + { + Console.WriteLine(sql); + Console.WriteLine(string.Join(",", p?.Select(it => it.ParameterName + ":" + it.Value))); + } + } + }); + + Console.WriteLine("#### SimpleClient End ####"); + } + } +} diff --git a/Src/Asp.Net/PgSqlTest/Demo/Democ_GobalFilter.cs b/Src/Asp.Net/PgSqlTest/Demo/Democ_GobalFilter.cs index d615c7bc9..6592c48db 100644 --- a/Src/Asp.Net/PgSqlTest/Demo/Democ_GobalFilter.cs +++ b/Src/Asp.Net/PgSqlTest/Demo/Democ_GobalFilter.cs @@ -6,7 +6,7 @@ using System.Text; namespace OrmTest { - public class Democ_GobalFilter + public class DemoC_GobalFilter { public static void Init() { @@ -16,21 +16,21 @@ namespace OrmTest var sql = db.Queryable().ToSql(); - //SELECT [Id],[Name],[Price],[CreateTime] FROM [Order] WHERE isDelete=0 + //SELECT [Id],[Name],[Price],[CreateTime] FROM `order` WHERE isDelete=0 Console.WriteLine(sql); var sql2 = db.Queryable((main,ot)=> main.Id==ot.OrderId).ToSql(); - //SELECT [Id],[Name],[Price],[CreateTime] FROM [Order] main ,[OrderDetail] ot WHERE ( [main].[Id] = [ot].[OrderId] ) AND main.isDelete=0 + //SELECT [Id],[Name],[Price],[CreateTime] FROM `order` main ,[OrderDetail] ot WHERE ( [main].[Id] = [ot].[OrderId] ) AND main.isDelete=0 Console.WriteLine(sql2); var sql3 = db.Queryable().Filter("Myfilter").ToSql();// Myfilter+Gobal - //SELECT [Id],[Name],[Price],[CreateTime] FROM [Order] WHERE Name='jack' AND isDelete=0 + //SELECT [Id],[Name],[Price],[CreateTime] FROM `order` WHERE Name='jack' AND isDelete=0 Console.WriteLine(sql3); var sql4 = db.Queryable().Filter("Myfilter",isDisabledGobalFilter:true).ToSql();//only Myfilter - //SELECT [Id],[Name],[Price],[CreateTime] FROM [Order] WHERE Name='jack' + //SELECT [Id],[Name],[Price],[CreateTime] FROM `order` WHERE Name='jack' Console.WriteLine(sql4); Console.WriteLine("#### Filter End ####"); } diff --git a/Src/Asp.Net/PgSqlTest/Models/AttributeTable.cs b/Src/Asp.Net/PgSqlTest/Models/AttributeTable.cs new file mode 100644 index 000000000..c1a43ad12 --- /dev/null +++ b/Src/Asp.Net/PgSqlTest/Models/AttributeTable.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; + +namespace OrmTest +{ + [Table("MyAttributeTable")] + //[SugarTable("CustomAttributeTable")] + public class AttributeTable + { + + [Key] + //[SugarColumn(IsPrimaryKey =true)] + public string Id { get; set; } + public string Name { get; set; } + } +} diff --git a/Src/Asp.Net/PgSqlTest/Models/EntityMapper.cs b/Src/Asp.Net/PgSqlTest/Models/EntityMapper.cs new file mode 100644 index 000000000..b597012fb --- /dev/null +++ b/Src/Asp.Net/PgSqlTest/Models/EntityMapper.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using SqlSugar; +namespace OrmTest +{ + [SugarTable("MyEntityMapper")] + public class EntityMapper + { + [SugarColumn(ColumnName ="MyName")] + public string Name { get; set; } + } +} diff --git a/Src/Asp.Net/PgSqlTest/Models/Mapper.cs b/Src/Asp.Net/PgSqlTest/Models/Mapper.cs new file mode 100644 index 000000000..8d7991d6c --- /dev/null +++ b/Src/Asp.Net/PgSqlTest/Models/Mapper.cs @@ -0,0 +1,54 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace OrmTest +{ + [SugarTable("OrderDetail")] + public class OrderItemInfo + { + [SqlSugar.SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + public int ItemId { get; set; } + public int OrderId { get; set; } + public decimal? Price { get; set; } + [SqlSugar.SugarColumn(IsNullable = true)] + public DateTime? CreateTime { get; set; } + [SugarColumn(IsIgnore = true)] + public Order Order { get; set; } + } + [SugarTable("Order")] + public class OrderInfo + { + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + public string Name { get; set; } + [SugarColumn(IsIgnore = true)] + public List Items { get; set; } + } + public class ABMapping + { + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + public int AId { get; set; } + public int BId { get; set; } + [SugarColumn(IsIgnore = true)] + public A A { get; set; } + [SugarColumn(IsIgnore = true)] + public B B { get; set; } + + } + public class A + { + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + public string Name { get; set; } + } + public class B + { + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + public int Id { get; set; } + public string Name { get; set; } + } +} diff --git a/Src/Asp.Net/PgSqlTest/Models/Order.cs b/Src/Asp.Net/PgSqlTest/Models/Order.cs index c03613669..d7ff068b8 100644 --- a/Src/Asp.Net/PgSqlTest/Models/Order.cs +++ b/Src/Asp.Net/PgSqlTest/Models/Order.cs @@ -1,4 +1,5 @@ -using System; +using SqlSugar; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -8,14 +9,16 @@ namespace OrmTest public class Order { - [SqlSugar.SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } public string Name { get; set; } public decimal Price { get; set; } - [SqlSugar.SugarColumn(IsNullable = true)] + [SugarColumn(IsNullable = true)] public DateTime CreateTime { get; set; } - [SqlSugar.SugarColumn(IsNullable =true)] + [SugarColumn(IsNullable =true)] public int CustomId { get; set; } + [SugarColumn(IsIgnore = true)] + public List Items { get; set; } } } diff --git a/Src/Asp.Net/PgSqlTest/Models/Mappers.cs b/Src/Asp.Net/PgSqlTest/Models/Tree.cs similarity index 100% rename from Src/Asp.Net/PgSqlTest/Models/Mappers.cs rename to Src/Asp.Net/PgSqlTest/Models/Tree.cs diff --git a/Src/Asp.Net/PgSqlTest/PgSqlTest.csproj b/Src/Asp.Net/PgSqlTest/PgSqlTest.csproj index 93e025e30..c46c0898f 100644 --- a/Src/Asp.Net/PgSqlTest/PgSqlTest.csproj +++ b/Src/Asp.Net/PgSqlTest/PgSqlTest.csproj @@ -67,16 +67,26 @@ + + + + + + + + - + + + diff --git a/Src/Asp.Net/PgSqlTest/Program.cs b/Src/Asp.Net/PgSqlTest/Program.cs index 893b1d331..72832d0a2 100644 --- a/Src/Asp.Net/PgSqlTest/Program.cs +++ b/Src/Asp.Net/PgSqlTest/Program.cs @@ -6,20 +6,30 @@ namespace OrmTest { static void Main(string[] args) { - // OldTestMain.Init(); - //Demo Demo0_SqlSugarClient.Init(); Demo1_Queryable.Init(); Demo2_Updateable.Init(); - Democ_GobalFilter.Init(); - DemoD_DbFirst.Init(); - DemoE_CodeFirst.Init(); + Demo3_Insertable.Init(); + Demo4_Deleteable.Init(); Demo5_SqlQueryable.Init(); Demo6_Queue.Init(); + Demo7_Ado.Init(); + Demo8_Saveable.Init(); + Demo9_EntityMain.Init(); + DemoA_DbMain.Init(); + DemoB_Aop.Init(); + DemoC_GobalFilter.Init(); + DemoD_DbFirst.Init(); ; + DemoE_CodeFirst.Init(); + DemoF_Utilities.Init(); + DemoG_SimpleClient.Init(); //Unit test - NewUnitTest.Init(); + //NewUnitTest.Init(); + + //Rest Data + NewUnitTest.RestData(); Console.WriteLine("all successfully."); Console.ReadKey(); diff --git a/Src/Asp.Net/PgSqlTest/UnitTest/Main.cs b/Src/Asp.Net/PgSqlTest/UnitTest/Main.cs index a18614ff5..269bae0f5 100644 --- a/Src/Asp.Net/PgSqlTest/UnitTest/Main.cs +++ b/Src/Asp.Net/PgSqlTest/UnitTest/Main.cs @@ -23,6 +23,12 @@ namespace OrmTest } } }); + + public static void RestData() + { + Db.DbMaintenance.TruncateTable(); + Db.DbMaintenance.TruncateTable(); + } public static void Init() { CodeFirst(); diff --git a/Src/Asp.Net/PgSqlTest/UnitTest/UAdo.cs b/Src/Asp.Net/PgSqlTest/UnitTest/UAdo.cs index 5ce737a52..f2578cf29 100644 --- a/Src/Asp.Net/PgSqlTest/UnitTest/UAdo.cs +++ b/Src/Asp.Net/PgSqlTest/UnitTest/UAdo.cs @@ -48,9 +48,9 @@ namespace OrmTest task8.Wait(); UValidate.Check(8, task8.Result[0].id, "ado"); - var task9=Db.Ado.SqlQuery("select * from \"order\";select * from OrderDetail"); + var task9=Db.Ado.SqlQuery("select * from `order`;select * from OrderDetail"); - var task10 = Db.Ado.SqlQueryAsync("select * from \"order\";select * from OrderDetail"); + var task10 = Db.Ado.SqlQueryAsync("select * from `order`;select * from OrderDetail"); task10.Wait(); } } diff --git a/Src/Asp.Net/PgSqlTest/UnitTest/UCodeFirst.cs b/Src/Asp.Net/PgSqlTest/UnitTest/UCodeFirst.cs index b6b47d028..3c853a7d5 100644 --- a/Src/Asp.Net/PgSqlTest/UnitTest/UCodeFirst.cs +++ b/Src/Asp.Net/PgSqlTest/UnitTest/UCodeFirst.cs @@ -13,13 +13,12 @@ namespace OrmTest if (Db.DbMaintenance.IsAnyTable("UnitCodeTest1", false)) Db.DbMaintenance.DropTable("UnitCodeTest1"); Db.CodeFirst.InitTables(); - Db.CodeFirst.InitTables(); } public class UnitCodeTest1 { [SqlSugar.SugarColumn(IndexGroupNameList = new string[] { "group1" })] public int Id { get; set; } - [SqlSugar.SugarColumn(DefaultValue="now()", IndexGroupNameList =new string[] {"group1" } )] + [SqlSugar.SugarColumn(DefaultValue="getdate()", IndexGroupNameList =new string[] {"group1" } )] public DateTime? CreateDate { get; set; } } } diff --git a/Src/Asp.Net/PgSqlTest/UnitTest/UJson.cs b/Src/Asp.Net/PgSqlTest/UnitTest/UJson.cs index daf55b4b7..717607f1d 100644 --- a/Src/Asp.Net/PgSqlTest/UnitTest/UJson.cs +++ b/Src/Asp.Net/PgSqlTest/UnitTest/UJson.cs @@ -11,24 +11,24 @@ namespace OrmTest public static void Json() { - Db.CodeFirst.InitTables(); - Db.DbMaintenance.TruncateTable(); - Db.Insertable(new JsonTest() { Order = new Order { Id = 1, Name = "order1" } }).ExecuteCommand(); - var list = Db.Queryable().ToList(); + Db.CodeFirst.InitTables(); + Db.DbMaintenance.TruncateTable(); + Db.Insertable(new UnitJsonTest() { Order = new Order { Id = 1, Name = "order1" } }).ExecuteCommand(); + var list = Db.Queryable().ToList(); UValidate.Check("order1", list.First().Order.Name, "Json"); - var x=Db.Updateable(new JsonTest() { Id = Db.Queryable().Max(it => it.Id), Order = new Order { Id = Db.Queryable().Max(it=>it.Id), Name = "order2" } }).ExecuteCommand(); - list= Db.Queryable().ToList(); + Db.Updateable(new UnitJsonTest() { Id = 1, Order = new Order { Id = 2, Name = "order2" } }).ExecuteCommand(); + list= Db.Queryable().ToList(); UValidate.Check("order2", list.First().Order.Name, "Json"); - var list2 = Db.Queryable().ToList(); + var list2 = Db.Queryable().ToList(); } } - public class JsonTest + public class UnitJsonTest { [SqlSugar.SugarColumn(IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } - [SqlSugar.SugarColumn(ColumnDataType = "varchar(4000)", IsJson = true)] + [SqlSugar.SugarColumn(ColumnDataType = "varchar(max)", IsJson = true)] public Order Order { get; set; } } } diff --git a/Src/Asp.Net/PgSqlTest/UnitTest/UQueryable.cs b/Src/Asp.Net/PgSqlTest/UnitTest/UQueryable.cs index 62bc9d064..2731ed6d9 100644 --- a/Src/Asp.Net/PgSqlTest/UnitTest/UQueryable.cs +++ b/Src/Asp.Net/PgSqlTest/UnitTest/UQueryable.cs @@ -1,4 +1,5 @@ -using System; +using SqlSugar; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -8,13 +9,14 @@ namespace OrmTest { public partial class NewUnitTest { - public static void Queryable() { + public static void Queryable() + { var pageindex = 1; var pagesize = 10; var total = 0; var totalPage = 0; - var list=Db.Queryable().ToPageList(pageindex, pagesize, ref total, ref totalPage); + var list = Db.Queryable().ToPageList(pageindex, pagesize, ref total, ref totalPage); //Db.CodeFirst.InitTables(typeof(CarType)); //Db.Updateable() @@ -26,12 +28,294 @@ namespace OrmTest //Db.Ado.ExecuteCommand("insert testtree values(hierarchyid::GetRoot(),geography :: STGeomFromText ('POINT(55.9271035250276 -3.29431266523898)',4326),'name')"); //var list2 = Db.Queryable().ToList(); - Db.CodeFirst.InitTables(); - Db.Queryable().Where(it => it.Id.HasValue).ToList(); + Db.CodeFirst.InitTables(); + Db.Queryable().Where(it => it.Id.HasValue).ToList(); + + Db.Queryable().Where(it => SqlSugar.SqlFunc.Equals(it.CreateTime.Date, it.CreateTime.Date)).ToList(); + + var sql = Db.Queryable().Select(it => new UnitSelectTest() + { + + DcNull = it.Dc, + Dc = it.Int + }).ToSql().Key; + UValidate.Check(sql, "SELECT [Dc] AS [DcNull] , [Int] AS [Dc] FROM [UnitSelectTest]", "Queryable"); + + sql = Db.Updateable(new UnitSelectTest2()).ToSql().Key; + UValidate.Check(sql, @"UPDATE [UnitSelectTest2] SET + [Dc]=@Dc,[IntNull]=@IntNull WHERE [Int]=@Int", "Queryable"); + + sql = Db.Queryable().IgnoreColumns(it => it.CreateTime).ToSql().Key; + UValidate.Check(sql, "SELECT [Id],[Name],[Price],[CustomId] FROM `order` ", "Queryable"); + sql = Db.Queryable().IgnoreColumns(it => new { it.Id, it.Name }).ToSql().Key; + UValidate.Check(sql, "SELECT [Price],[CreateTime],[CustomId] FROM `order` ", "Queryable"); + sql = Db.Queryable().IgnoreColumns("id").ToSql().Key; + UValidate.Check(sql, "SELECT [Name],[Price],[CreateTime],[CustomId] FROM `order` ", "Queryable"); + + var cts = IEnumerbleContains.Data(); + var list2=Db.Queryable() + .Where(p => /*ids.*/cts.Select(c => c.Id).Contains(p.Id)).ToList(); + + var cts2 = IEnumerbleContains.Data().ToList(); ; + var list3 = Db.Queryable() + .Where(p => /*ids.*/cts2.Select(c => c.Id).Contains(p.Id)).ToList(); + + + var list4 = Db.Queryable() + .Where(p => new List { 1, 2, 3 }.Where(b => b > 1).Contains(p.Id)).ToList(); + + Db.CodeFirst.InitTables(); + var list5 = Db.Queryable().Where(it => SqlSugar.SqlFunc.ToString(it.Date.Value.Year) == "1").ToList(); + var list6 = Db.Queryable().Where(it => it.Date.Value.Year == 1).ToList(); + var list7 = Db.Queryable().Where(it => it.Date.Value.Date == DateTime.Now.Date).ToList(); + + + SaleOrder saleOrderInfo = new SaleOrder(); + Db.CodeFirst.InitTables(); + var result = Db.GetSimpleClient().Update(o => new SaleOrder() + { + OrderStatus = 1, + CheckMan = saleOrderInfo.CheckMan, + CheckTime = DateTime.Now + }, o => o.OrderSn == saleOrderInfo.OrderSn && o.OrderStatus != 1); + } + + public static class IEnumerbleContains + { + public static IEnumerable Data() + { + for (int i = 0; i < 100; i++) + { + yield return new Order + { + Id = i, + }; + } + } + } + [SugarTable("UnitSaleOrder")] + public class SaleOrder + { + public SaleOrder() + { + SaleDate = DateTime.Now; + Team = 1; + AddTime = DateTime.Now; + OrderStatus = 0; + Points = 0; + PayPoints = 0; + PointsExchangeMoney = decimal.Zero; + IsPushMessage = false; + CostAmount = decimal.Zero; + OrderAmount = decimal.Zero; + RealOrderAmount = decimal.Zero; + AccountsDueAmount = decimal.Zero; + SettleType = 0; + IsPushMessage = false; + } + + /// + /// 订单号 + /// + public string OrderSn { get; set; } + + /// + /// 客户编号 + /// + public string CustomerNo { get; set; } + + + /// + /// 收货人姓名 + /// + public string CustomerName { get; set; } + + /// + /// 成本总金额 + /// + public decimal CostAmount { get; set; } + + /// + /// 订单总金额 + /// + public decimal OrderAmount { get; set; } + + /// + /// 实收金额（整单优惠后） + /// + public decimal RealOrderAmount { get; set; } + + /// + /// 销货日期 + /// + public DateTime SaleDate { get; set; } + + /// + /// 下单时间 + /// + public DateTime AddTime { get; set; } + + /// + /// 媒体资源投放ID + /// + public string IndustryCode { get; set; } + + public string IndustryName { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + /// + /// 班组 + /// + public int Team { get; set; } + + /// + /// 销售员编号 + /// + public string SellerNo { get; set; } + + /// + /// 销售员姓名 + /// + public string SellerName { get; set; } + + /// + /// 操作人ID + /// + public virtual string HandlerCode { get; set; } + + /// + /// 操作者 + /// + public string Handler { get; set; } + + /// + /// 发货仓库代号 + /// + public string StoreCode { get; set; } + + /// + /// 发货仓库名称 + /// + public string StoreName { get; set; } + + /// + /// 销货店铺渠道代号 + /// + public string ShopChannelCode { get; set; } + + /// + /// 销货店铺渠道名称 + /// + public string ShopChannelName { get; set; } + + /// + /// 订单产品数 + /// + public int GoodsNum { get; set; } + + /// + /// 礼品数量 + /// + public int GiftNum { get; set; } + + /// + /// 对应预订单号 + /// + public string CustomerOrderSn { get; set; } + + /// + /// 订单赠送积分 + /// + public int Points { get; set; } + + /// + /// 应收款金额 + /// + public decimal AccountsDueAmount { get; set; } + + /// + /// 来自预约单号 + /// + public string ReserationOrderSn { get; set; } + + + /// + /// 订单状态 0为未审核 1为已审核 + /// + public int OrderStatus { get; set; } + + /// + /// 审核人 + /// + public string CheckMan { get; set; } + + /// + /// 审核时间 + /// + public DateTime? CheckTime { get; set; } + + /// + /// 结算类型 0为非金工石（零售） 1为金工石 + /// + public int SettleType { get; set; } + + /// + /// 使用积分 + /// + public int PayPoints { get; set; } + + /// + /// 积分抵现金额 + /// + public decimal PointsExchangeMoney { get; set; } + + /// + /// 是否已推送微信消息 + /// + public bool IsPushMessage { get; set; } + + } + + public class SaleOrderBaseInfo + { + public int GoodsNum { get; set; } + + public int GiftNum { get; set; } + + public decimal OrderAmount { get; set; } + } - public class GuidTable + public class UnitTest3 + { + public DateTime? Date { get; set; } + } + + + public class UnitSelectTest2 + { + [SqlSugar.SugarColumn(IsOnlyIgnoreUpdate = true)] + public decimal? DcNull { get; set; } + public decimal Dc { get; set; } + public int? IntNull { get; set; } + [SqlSugar.SugarColumn(IsPrimaryKey = true)] + public decimal Int { get; set; } + } + + public class UnitSelectTest + { + public decimal? DcNull { get; set; } + public decimal Dc { get; set; } + public int? IntNull { get; set; } + public decimal Int { get; set; } + } + + public class UnitGuidTable { public Guid? Id { get; set; } } diff --git a/Src/Asp.Net/PgSqlTest/UnitTest/UThread3.cs b/Src/Asp.Net/PgSqlTest/UnitTest/UThread3.cs index 04794aeba..9e0e644c4 100644 --- a/Src/Asp.Net/PgSqlTest/UnitTest/UThread3.cs +++ b/Src/Asp.Net/PgSqlTest/UnitTest/UThread3.cs @@ -13,10 +13,10 @@ namespace OrmTest public static void Thread3() { Console.WriteLine("Thread3"); - SimpleAsync3(); - IsShardSameThreadAsync3(); - SingleAsync3(); - SingleAndIsShardSameThreadAsync3(); + SimpleAsync3().Wait(); + IsShardSameThreadAsync3().Wait(); + SingleAsync3().Wait(); + SingleAndIsShardSameThreadAsync3().Wait(); } diff --git a/Src/Asp.Net/PgSqlTest/UnitTest/UValidate.cs b/Src/Asp.Net/PgSqlTest/UnitTest/UValidate.cs index c766e9b02..bc2b97fc2 100644 --- a/Src/Asp.Net/PgSqlTest/UnitTest/UValidate.cs +++ b/Src/Asp.Net/PgSqlTest/UnitTest/UValidate.cs @@ -10,7 +10,7 @@ namespace OrmTest { public static void Check(object a, object b, object name) { - if (a?.ToString() != b?.ToString()) + if (a?.ToString()?.Trim() != b?.ToString()?.Trim()) { throw new Exception(name + " error"); } diff --git a/Src/Asp.Net/PgSqlTest/UnitTest/Updateable.cs b/Src/Asp.Net/PgSqlTest/UnitTest/Updateable.cs index 881eca2da..2397d6032 100644 --- a/Src/Asp.Net/PgSqlTest/UnitTest/Updateable.cs +++ b/Src/Asp.Net/PgSqlTest/UnitTest/Updateable.cs @@ -11,18 +11,139 @@ namespace OrmTest { public static void Updateable() { - Db.CodeFirst.InitTables(typeof(SYS_USER)); - Db.DbMaintenance.TruncateTable(); - Db.Insertable(new SYS_USER() { USER_ID=1,USER_ACCOUNT = "a", USER_PWD = "b", USER_NAME = "c", PWD_LASTCHTIME = DateTime.Now, PWD_ERRORCOUNT = 1, PWD_LASTERRTIME = DateTime.Now }).ExecuteCommand(); - Db.Updateable(new SYS_USER() { USER_ID=1, PWD_LASTERRTIME = null }).WhereColumns(it=> new{ it.PWD_ERRORCOUNT, it.PWD_LASTERRTIME }).ExecuteCommand(); - + Db.CodeFirst.InitTables(typeof(UnitUser)); + Db.DbMaintenance.TruncateTable(); + Db.Insertable(new UnitUser() { USER_ID=1,USER_ACCOUNT = "a", USER_PWD = "b", USER_NAME = "c", PWD_LASTCHTIME = DateTime.Now, PWD_ERRORCOUNT = 1, PWD_LASTERRTIME = DateTime.Now }).ExecuteCommand(); + Db.Updateable(new UnitUser() { USER_ID=1, PWD_LASTERRTIME = null }).WhereColumns(it=> new{ it.PWD_ERRORCOUNT, it.PWD_LASTERRTIME }).ExecuteCommand(); + Db.CodeFirst.InitTables(typeof(UnitBoolTest)); + var x = new UnitBoolTest(); + Db.Updateable().SetColumns(it => new UnitBoolTest() { BoolValue = !it.BoolValue }).Where(it=>it.Id==1).ExecuteCommand(); + Db.Updateable().SetColumns(it => it.BoolValue == !it.BoolValue ).Where(it=>it.Id==1).ExecuteCommand(); + Db.Updateable().SetColumns(it => new UnitBoolTest() { BoolValue = x.BoolValue }).Where(it => it.Id == 1).ExecuteCommand(); + Db.Updateable().SetColumns(it => it.BoolValue == x.BoolValue).Where(it => it.Id == 1).ExecuteCommand(); + Db.Updateable().SetColumns(it => new UnitBoolTest() { BoolValue = !x.BoolValue }).Where(it => it.Id == 1).ExecuteCommand(); + Db.Updateable().SetColumns(it => it.BoolValue == !x.BoolValue).Where(it => it.Id == 1).ExecuteCommand(); + Db.Updateable(x).ReSetValue(it => it.BoolValue == it.BoolValue).ExecuteCommand(); + Db.Updateable(x).ReSetValue(it => it.BoolValue == true).ExecuteCommand(); + Db.Updateable(x).ReSetValue(it => it.BoolValue == !it.BoolValue).ExecuteCommand(); + Db.Updateable(x).UpdateColumns(it =>new { it.BoolValue }) .ExecuteCommand(); + + + + UnitSaveDiary saveDiary = new UnitSaveDiary(); + saveDiary.ID = 2; + saveDiary.TypeID = 10; + saveDiary.TypeName = "类型100"; + saveDiary.Title = "标题1000"; + saveDiary.Content = "内容"; + saveDiary.Time = DateTime.Now; + saveDiary.IsRemind = false;//无论传false/true 最终执行的结果都是以true执行的 + + var sql = Db.Updateable().SetColumns(it => new UnitDiary() + { + IsRemind = saveDiary.IsRemind, + }).Where(it => it.ID == saveDiary.ID).ToSql(); + UValidate.Check(sql.Key, @"UPDATE [Diary] SET + [IsRemind] = @Const0 WHERE ( [ID] = @ID1 )", "Updateable"); + + + sql = Db.Updateable().SetColumns(it => new UnitDiary() + { + TypeID = saveDiary.TypeID, + }).Where(it => it.ID == saveDiary.ID).ToSql(); + UValidate.Check(sql.Key, @"UPDATE [Diary] SET + [TypeID] = @Const0 WHERE ( [ID] = @ID1 )", "Updateable"); + } } + public class UnitSaveDiary + { + public int ID { get; set; } + public int TypeID { get; set; } + public string TypeName { get; set; } + public string Title { get; set; } + public string Content { get; set; } + public DateTime? Time { get; set; } + public bool IsRemind { get; set; } + } + /// + /// 日记表 + /// + [SugarTable("Diary")] + public class UnitDiary + { + [SugarColumn(IsPrimaryKey = true, IsIdentity = true)] + public int ID { get; set; } + /// + /// 用户ID + /// + public int? UserID { get; set; } + /// + /// 日记类型ID + /// + public int? TypeID { get; set; } + /// + /// 日记类型名称 + /// + public string TypeName { get; set; } + /// + /// 标题 + /// + public string Title { get; set; } + /// + /// 内容 + /// + public string Content { get; set; } + /// + /// 时间 + /// + public DateTime? Time { get; set; } + /// + /// 是否提醒 + /// + public bool? IsRemind { get; set; } + /// + /// 封面图 + /// + public string Cover { get; set; } + /// + /// 是否为系统日记 1:系统日记 0:用户日记 + /// + public bool? IsSystem { get; set; } + /// + /// 权重(排序) + /// + public int? Sequence { get; set; } + /// + /// + /// + public string IP { get; set; } + /// + /// + /// + public DateTime? CreateTime { get; set; } + /// + /// + /// + public DateTime? UpdateTime { get; set; } + /// + /// + /// + public bool? IsDelete { get; set; } + } + + public class UnitBoolTest + { + [SugarColumn(IsPrimaryKey =true)] + public int Id { get; set; } + public bool BoolValue { get; set; } + public string Name { get; set; } + } /// /// 普通用户表 /// [Serializable] - public class SYS_USER + public class UnitUser { private System.Int64? _USER_ID; ///