diff --git a/Src/Asp.Net/OracleTest/UnitTest/Main.cs b/Src/Asp.Net/OracleTest/UnitTest/Main.cs index 02034efc6..dbc503efa 100644 --- a/Src/Asp.Net/OracleTest/UnitTest/Main.cs +++ b/Src/Asp.Net/OracleTest/UnitTest/Main.cs @@ -40,9 +40,9 @@ namespace OrmTest Ado(); Queryable(); QueryableAsync(); - Thread(); - Thread2(); - Thread3(); + //Thread(); + //Thread2(); + //Thread3(); } } } diff --git a/Src/Asp.Net/OracleTest/UnitTest/UCodeFirst.cs b/Src/Asp.Net/OracleTest/UnitTest/UCodeFirst.cs index c84e84668..e11619c3c 100644 --- a/Src/Asp.Net/OracleTest/UnitTest/UCodeFirst.cs +++ b/Src/Asp.Net/OracleTest/UnitTest/UCodeFirst.cs @@ -12,11 +12,33 @@ namespace OrmTest { if (Db.DbMaintenance.IsAnyTable("UnitCodeTest1", false)) Db.DbMaintenance.DropTable("UnitCodeTest1"); + Demo2(); + Demo3(); + } + + private static void Demo2() + { Db.CodeFirst.InitTables(); Db.CodeFirst.InitTables(); Db.Insertable(new Unitasdfa1() { t1 = 1, t2 = 1 }).ExecuteCommand(); var x = Db.Queryable().ToList(); + if (x.First().t1 == 0 || x.First().t2 == 0) + { + throw new Exception("UnitCodeTest1"); + } } + private static void Demo3() + { + Db.CodeFirst.InitTables(); + Db.CodeFirst.InitTables(); + Db.Insertable(new Unitasdfa2() { t1 = 1, t2 = 1 }).ExecuteCommand(); + var x = Db.Queryable().ToList(); + if (x.First().t1 == 0 || x.First().t2 == 0) + { + throw new Exception("UnitCodeTest1"); + } + } + public class Unitasdfa1 { [SqlSugar.SugarColumn(ColumnDataType = "number(8,2)")] @@ -25,6 +47,14 @@ namespace OrmTest [SqlSugar.SugarColumn(ColumnDataType ="number(8,2)")] public decimal? t1 { get; set; } } + public class Unitasdfa2 + { + [SqlSugar.SugarColumn(ColumnDataType = "number(8,3)")] + public decimal t2 { get; set; } + + [SqlSugar.SugarColumn(ColumnDataType = "number(8,3)")] + public decimal? t1 { get; set; } + } public class UnitCodeTest1 { [SqlSugar.SugarColumn(IndexGroupNameList = new string[] { "group1" })] diff --git a/Src/Asp.Net/OracleTest/UnitTest/UJson.cs b/Src/Asp.Net/OracleTest/UnitTest/UJson.cs index 717607f1d..f0c8de5b3 100644 --- a/Src/Asp.Net/OracleTest/UnitTest/UJson.cs +++ b/Src/Asp.Net/OracleTest/UnitTest/UJson.cs @@ -28,7 +28,7 @@ namespace OrmTest { [SqlSugar.SugarColumn(IsPrimaryKey = true, IsIdentity = true)] public int Id { get; set; } - [SqlSugar.SugarColumn(ColumnDataType = "varchar(max)", IsJson = true)] + [SqlSugar.SugarColumn(ColumnDataType = "varchar(2000)", IsJson = true)] public Order Order { get; set; } } } diff --git a/Src/Asp.Net/OracleTest/UnitTest/Updateable.cs b/Src/Asp.Net/OracleTest/UnitTest/Updateable.cs index 64ec9a824..e5c8d8ab7 100644 --- a/Src/Asp.Net/OracleTest/UnitTest/Updateable.cs +++ b/Src/Asp.Net/OracleTest/UnitTest/Updateable.cs @@ -43,16 +43,16 @@ namespace OrmTest { IsRemind = saveDiary.IsRemind, }).Where(it => it.ID == saveDiary.ID).ToSql(); - UValidate.Check(sql.Key, @"UPDATE ""DIARY"" SET - ""ISREMIND"" = @Const0 WHERE ( ""ID"" = @ID1 )", "Updateable"); + // UValidate.Check(sql.Key, @"UPDATE ""UNITBOOLTEST"" SET + //""BOOLVALUE"" =:BoolValue WHERE ""ID"" =:Id"", "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"); + // 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"); } }