From ae0d5d41bb781d99dbf8543e41ef2c50d5abc77c Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Mon, 28 Aug 2017 01:33:10 +0800 Subject: [PATCH] Update Oracle --- Src/Asp.Net/OracleTest/Program.cs | 2 +- .../UnitTest/ExpressionTest/Select.cs | 69 ++++++++++--------- 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/Src/Asp.Net/OracleTest/Program.cs b/Src/Asp.Net/OracleTest/Program.cs index 2f7a5c49c..4fa04c861 100644 --- a/Src/Asp.Net/OracleTest/Program.cs +++ b/Src/Asp.Net/OracleTest/Program.cs @@ -17,7 +17,7 @@ namespace OrmTest { static void Main(string[] args) { - // throw new Exception(" to be continued ,It will take another week."); + throw new Exception(" to be continued ,It will take another week."); // /***Unit Test***/ new Select(1).Init(); diff --git a/Src/Asp.Net/OracleTest/UnitTest/ExpressionTest/Select.cs b/Src/Asp.Net/OracleTest/UnitTest/ExpressionTest/Select.cs index 295ce0251..ef0d399b3 100644 --- a/Src/Asp.Net/OracleTest/UnitTest/ExpressionTest/Select.cs +++ b/Src/Asp.Net/OracleTest/UnitTest/ExpressionTest/Select.cs @@ -21,7 +21,7 @@ namespace OrmTest.UnitTest base.Begin(); for (int i = 0; i < base.Count; i++) { - single(); + single(); single2(); single3(); single4(); @@ -45,16 +45,16 @@ namespace OrmTest.UnitTest base.Check( selectorValue, pars, - @" @constant0 AS ""Name"" , ""it"".""Id"" AS ""Id"" , ""school"".""Id"" AS ""SchoolId"" , ( ""it"".""Id"" + @Id1 ) AS ""TestId"" ", + @" :CONSTANT0 AS ""NAME"" , ""IT"".""ID"" AS ""ID"" , ""SCHOOL"".""ID"" AS ""SCHOOLID"" , ( ""IT"".""ID"" + :ID1 ) AS ""TESTID"" ", new List(){ - new SugarParameter("@constant0","a"), - new SugarParameter("@Id1",1) + new SugarParameter(":constant0","a"), + new SugarParameter(":Id1",1) }, "Select.Multiple Error"); } private void Multiple2() { - Expression> exp = (it, school) => new ViewModelStudent3() { SchoolName=school.Name,Id=SqlFunc.GetSelfAndAutoFill(it.Id) }; + Expression> exp = (it, school) => new ViewModelStudent3() { SchoolName = school.Name, Id = SqlFunc.GetSelfAndAutoFill(it.Id) }; OracleExpressionContext expContext = new OracleExpressionContext(); expContext.IsSingle = false; expContext.Resolve(exp, ResolveExpressType.SelectMultiple); @@ -63,9 +63,10 @@ namespace OrmTest.UnitTest base.Check( selectorValue, pars, - @" ""school"".""Name"" AS ""SchoolName"" ,it.*", - new List(){ - + @" ""SCHOOL"".""NAME"" AS ""SCHOOLNAME"" ,IT.*", + new List() + { + }, "Select.Multiple Error"); } @@ -82,16 +83,16 @@ namespace OrmTest.UnitTest base.Check( selectorValue, pars, - @" @constant0 AS ""Name"" , ( ""it"".""Id"" / @Id1 ) AS ""Id"" , ""school"".""Id"" AS ""SchoolId"" ", + @" :CONSTANT0 AS ""NAME"" , ( ""IT"".""ID"" / :ID1 ) AS ""ID"" , ""SCHOOL"".""ID"" AS ""SCHOOLID"" ", new List(){ - new SugarParameter("@constant0","a"), - new SugarParameter("@Id1", 2)}, + new SugarParameter(":constant0","a"), + new SugarParameter(":Id1", 2)}, "Select.MultipleDynamic Error"); } - private void single() + private void single() { int p = 1; - Expression> exp = it => new Student() { Name = "a", Id = it.Id, SchoolId = p,TestId=it.Id+11 }; + Expression> exp = it => new Student() { Name = "a", Id = it.Id, SchoolId = p, TestId = it.Id + 11 }; OracleExpressionContext expContext = new OracleExpressionContext(); expContext.Resolve(exp, ResolveExpressType.SelectSingle); var selectorValue = expContext.Result.GetString(); @@ -99,14 +100,14 @@ namespace OrmTest.UnitTest base.Check( selectorValue, pars, - @" @constant0 AS ""Name"" , ""Id"" AS ""Id"" , @constant1 AS ""SchoolId"" , ( ""Id"" + @Id2 ) AS ""TestId"" ", + @" :CONSTANT0 AS ""NAME"" , ""ID"" AS ""ID"" , :CONSTANT1 AS ""SCHOOLID"" , ( ""ID"" + :ID2 ) AS ""TESTID"" ", new List(){ - new SugarParameter("@constant0","a"), - new SugarParameter("@constant1",1), - new SugarParameter("@Id2",11 ) }, + new SugarParameter(":constant0","a"), + new SugarParameter(":constant1",1), + new SugarParameter(":Id2",11 ) }, "Select.single Error"); } - private void single2(int p=1) + private void single2(int p = 1) { Expression> exp = it => new Student() { Name = "a", Id = it.Id, SchoolId = p, TestId = it.Id + 11 }; OracleExpressionContext expContext = new OracleExpressionContext(); @@ -116,22 +117,22 @@ namespace OrmTest.UnitTest base.Check( selectorValue, pars, - @" @constant0 AS ""Name"" , ""Id"" AS ""Id"" , @constant1 AS ""SchoolId"" , ( ""Id"" + @Id2 ) AS ""TestId"" ", + @" :CONSTANT0 AS ""NAME"" , ""ID"" AS ""ID"" , :CONSTANT1 AS ""SCHOOLID"" , ( ""ID"" + :ID2 ) AS ""TESTID"" ", new List(){ - new SugarParameter("@constant0","a"), - new SugarParameter("@constant1",1), - new SugarParameter("@Id2",11 ) }, + new SugarParameter(":constant0","a"), + new SugarParameter(":constant1",1), + new SugarParameter(":Id2",11 ) }, "Select.single Error"); } private void single3(int p = 1) { - Expression> exp = it => new DataTestInfo() { Datetime1=DateTime.Now, String=it.Name}; + Expression> exp = it => new DataTestInfo() { Datetime1 = DateTime.Now, String = it.Name }; OracleExpressionContext expContext = new OracleExpressionContext(); expContext.Resolve(exp, ResolveExpressType.SelectSingle); var selectorValue = expContext.Result.GetString(); var pars = expContext.Parameters; base.Check( - @" @constant0 AS ""Datetime1"" , ""Name"" AS ""String"" ", null,selectorValue,null, + @" :CONSTANT0 AS ""DATETIME1"" , ""NAME"" AS ""STRING"" ", null, selectorValue, null, "Select.single3 Error"); } @@ -144,13 +145,13 @@ namespace OrmTest.UnitTest var selectorValue = expContext.Result.GetString(); var pars = expContext.Parameters; base.Check( - @"( ""it"".""CreateTime""<>'' AND ""it"".""CreateTime"" IS NOT NULL )", null, selectorValue, null, + @"( ""IT"".""CREATETIME""<>'' AND ""IT"".""CREATETIME"" IS NOT NULL )", null, selectorValue, null, "Select.single4 Error"); } private void single5() { - var p =(DateTime?) DateTime.Now; + var p = (DateTime?)DateTime.Now; Expression> exp = it => p.HasValue; OracleExpressionContext expContext = new OracleExpressionContext(); expContext.IsSingle = false; @@ -158,16 +159,16 @@ namespace OrmTest.UnitTest var selectorValue = expContext.Result.GetString(); var pars = expContext.Parameters; base.Check( - @"( @constant0<>'' AND @constant0 IS NOT NULL )", new List() { - new SugarParameter("@constant0",p) + @"( :CONSTANT0<>'' AND :CONSTANT0 IS NOT NULL )", new List() { + new SugarParameter(":constant0",p) }, selectorValue, pars, "Select.single4 Error"); } - private void singleDynamic() + private void singleDynamic() { string a = "a"; - Expression> exp = it => new { x = it.Id, shoolid = 1, name = a,p=it.Id*2 }; + Expression> exp = it => new { x = it.Id, shoolid = 1, name = a, p = it.Id * 2 }; OracleExpressionContext expContext = new OracleExpressionContext(); expContext.Resolve(exp, ResolveExpressType.SelectSingle); var selectorValue = expContext.Result.GetString(); @@ -175,11 +176,11 @@ namespace OrmTest.UnitTest base.Check( selectorValue, pars, - @" ""Id"" AS ""x"" , @constant0 AS ""shoolid"" , @constant1 AS ""name"" , ( ""Id"" * @Id2 ) AS ""p"" ", + @" ""ID"" AS ""X"" , :CONSTANT0 AS ""SHOOLID"" , :CONSTANT1 AS ""NAME"" , ( ""ID"" * :ID2 ) AS ""P"" ", new List(){ - new SugarParameter("@constant0",1), - new SugarParameter("@constant1","a"), - new SugarParameter("@Id2",2)}, + new SugarParameter(":constant0",1), + new SugarParameter(":constant1","a"), + new SugarParameter(":Id2",2)}, "Select.singleDynamic Error"); } }