From 885344efa852490f32419905d59d01b493b9e522 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Thu, 12 Jan 2023 22:39:19 +0800 Subject: [PATCH] Update unit test --- .../SqlServerTest/UnitTest/UCustom021.cs | 2 +- .../SqlServerTest/UnitTest/UCustom04.cs | 2 +- Src/Asp.Net/SqlServerTest/UnitTest/UFilter.cs | 18 +++++++++--------- .../SqlServerTest/UnitTest/UQueryable2.cs | 2 +- .../UnitTest/UnitManyToMay1231.cs | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Src/Asp.Net/SqlServerTest/UnitTest/UCustom021.cs b/Src/Asp.Net/SqlServerTest/UnitTest/UCustom021.cs index a28d0ddd8..068c0cec8 100644 --- a/Src/Asp.Net/SqlServerTest/UnitTest/UCustom021.cs +++ b/Src/Asp.Net/SqlServerTest/UnitTest/UCustom021.cs @@ -34,7 +34,7 @@ namespace OrmTest .Queryable((u, a) => new JoinQueryInfos(JoinType.Inner, u.Id == a.UserId)) .Where((u, a) => u.Id == 1) .Select((u, a) => a).ToSql(); - Check.Exception("SELECT a.* FROM [UserDO] [u] Inner JOIN [MyJoin] a ON ( [u].[Id] = [a].[UserId] ) WHERE ( [u].[Id] = @Id0 )" != sql.Key,"unit error"); + Check.Exception("SELECT a.* FROM [UserDO] [u] Inner JOIN [MyJoin] [a] ON ( [u].[Id] = [a].[UserId] ) WHERE ( [u].[Id] = @Id0 )" != sql.Key,"unit error"); } } public class MyJoin : IUserLink diff --git a/Src/Asp.Net/SqlServerTest/UnitTest/UCustom04.cs b/Src/Asp.Net/SqlServerTest/UnitTest/UCustom04.cs index f15ab0692..db7a8f487 100644 --- a/Src/Asp.Net/SqlServerTest/UnitTest/UCustom04.cs +++ b/Src/Asp.Net/SqlServerTest/UnitTest/UCustom04.cs @@ -17,7 +17,7 @@ namespace OrmTest JoinType.Left, o.CustomId == c.Id )) .Select().ToSql().Key; - UValidate.Check(sql, @"SELECT [o].[Name] AS [Name],[o].[Price] AS [Price],[i].[OrderId] AS [OrderItemOrderId],[i].[Price] AS [OrderItemPrice],[c].[Name] AS [CustomName] FROM [Order] [o] Left JOIN [OrderDetail] i ON ( [o].[Id] = [i].[OrderId] ) Left JOIN [Custom] c ON ( [o].[CustomId] = [c].[Id] )", "unit"); + UValidate.Check(sql, @"SELECT [o].[Name] AS [Name],[o].[Price] AS [Price],[i].[OrderId] AS [OrderItemOrderId],[i].[Price] AS [OrderItemPrice],[c].[Name] AS [CustomName] FROM [Order] [o] Left JOIN [OrderDetail] [i] ON ( [o].[Id] = [i].[OrderId] ) Left JOIN [Custom] [c] ON ( [o].[CustomId] = [c].[Id] )", "unit"); var list = db.Queryable((o, i, c) => new JoinQueryInfos( JoinType.Left, o.Id == i.OrderId, diff --git a/Src/Asp.Net/SqlServerTest/UnitTest/UFilter.cs b/Src/Asp.Net/SqlServerTest/UnitTest/UFilter.cs index 9711f8832..c750f30dd 100644 --- a/Src/Asp.Net/SqlServerTest/UnitTest/UFilter.cs +++ b/Src/Asp.Net/SqlServerTest/UnitTest/UFilter.cs @@ -45,43 +45,43 @@ namespace OrmTest var s6 = db.Queryable((o, i) => i.id == o.id).Select("o.*").ToSql(); - UValidate.Check(s6.Key, "SELECT o.* FROM [UnitFilterClass1] [o] ,[UnitFilterClass2] i WHERE ( [i].[id] = [o].[id] ) AND ( [o].[id] > @id0 )", "UnitFilter"); + UValidate.Check(s6.Key, "SELECT o.* FROM [UnitFilterClass1] [o] ,[UnitFilterClass2] [i] WHERE ( [i].[id] = [o].[id] ) AND ( [o].[id] > @id0 )", "UnitFilter"); var s7 = db.Queryable((o, i) => i.id == o.id).Where(o=>o.id==1).Select("o.*").ToSql(); - UValidate.Check(s7.Key, "SELECT o.* FROM [UnitFilterClass1] [o] ,[UnitFilterClass2] i WHERE ( [i].[id] = [o].[id] ) AND ( [o].[id] = @id0 ) AND ( [o].[id] > @id1 )", "UnitFilter"); + UValidate.Check(s7.Key, "SELECT o.* FROM [UnitFilterClass1] [o] ,[UnitFilterClass2] [i] WHERE ( [i].[id] = [o].[id] ) AND ( [o].[id] = @id0 ) AND ( [o].[id] > @id1 )", "UnitFilter"); var s8 = db.Queryable((o, i) => i.id == o.id).Where(o => o.id == 1).Select("o.*").ToSql(); - UValidate.Check(s8.Key, "SELECT o.* FROM [UnitFilterClass2] [o] ,[UnitFilterClass1] i WHERE ( [i].[id] = [o].[id] ) AND ( [o].[id] = @id0 ) AND ( [i].[id] > @id1 )", "UnitFilter"); + UValidate.Check(s8.Key, "SELECT o.* FROM [UnitFilterClass2] [o] ,[UnitFilterClass1] [i] WHERE ( [i].[id] = [o].[id] ) AND ( [o].[id] = @id0 ) AND ( [i].[id] > @id1 )", "UnitFilter"); var s9 = db.Queryable((o, i) => new JoinQueryInfos(JoinType.Left, o.id == i.id)) .Select("o.*").ToSql(); - UValidate.Check(s9.Key, "SELECT o.* FROM [UnitFilterClass1] [o] Left JOIN [UnitFilterClass2] i ON ( [o].[id] = [i].[id] ) WHERE ( [o].[id] > @id0 )", "UnitFilter"); + UValidate.Check(s9.Key, "SELECT o.* FROM [UnitFilterClass1] [o] Left JOIN [UnitFilterClass2] [i] ON ( [o].[id] = [i].[id] ) WHERE ( [o].[id] > @id0 )", "UnitFilter"); var s91 = db.Queryable().LeftJoin((o, i) => o.id == i.id) .Select("o.*").ToSql(); - UValidate.Check(s91.Key, "SELECT o.* FROM [UnitFilterClass1] [o] Left JOIN [UnitFilterClass2] i ON ( [o].[id] = [i].[id] ) WHERE ( [o].[id] > @id0 )", "UnitFilter"); + UValidate.Check(s91.Key, "SELECT o.* FROM [UnitFilterClass1] [o] Left JOIN [UnitFilterClass2] [i] ON ( [o].[id] = [i].[id] ) WHERE ( [o].[id] > @id0 )", "UnitFilter"); var s10= db.Queryable((o, i) => new JoinQueryInfos(JoinType.Left, o.id == i.id)) .Where((o,i) =>i.id==0).Select("o.*").ToSql(); - UValidate.Check(s10.Key, "SELECT o.* FROM [UnitFilterClass1] [o] Left JOIN [UnitFilterClass2] i ON ( [o].[id] = [i].[id] ) WHERE ( [i].[id] = @id0 ) AND ( [o].[id] > @id1 )", "UnitFilter"); + UValidate.Check(s10.Key, "SELECT o.* FROM [UnitFilterClass1] [o] Left JOIN [UnitFilterClass2] [i] ON ( [o].[id] = [i].[id] ) WHERE ( [i].[id] = @id0 ) AND ( [o].[id] > @id1 )", "UnitFilter"); var s11 = db.Queryable((o, i) => new JoinQueryInfos(JoinType.Left, o.id == i.id)) .Select("o.*").ToSql(); - UValidate.Check(s11.Key, "SELECT o.* FROM [UnitFilterClass2] [o] Left JOIN [UnitFilterClass1] i ON ( [o].[id] = [i].[id] ) WHERE ( [i].[id] > @id0 )", "UnitFilter"); + UValidate.Check(s11.Key, "SELECT o.* FROM [UnitFilterClass2] [o] Left JOIN [UnitFilterClass1] [i] ON ( [o].[id] = [i].[id] ) WHERE ( [i].[id] > @id0 )", "UnitFilter"); db.QueryFilter.Add(new SqlSugar.TableFilterItem(it => it.id==0)); var s12 = db.Queryable((o, i) => new JoinQueryInfos(JoinType.Left, o.id == i.id)) .Select("o.*").ToSql(); - UValidate.Check(s12.Key, "SELECT o.* FROM [UnitFilterClass2] [o] Left JOIN [UnitFilterClass1] i ON ( [o].[id] = [i].[id] ) WHERE ( [i].[id] > @id0 ) AND ( [o].[id] = @id1 )", "UnitFilter"); + UValidate.Check(s12.Key, "SELECT o.* FROM [UnitFilterClass2] [o] Left JOIN [UnitFilterClass1] [i] ON ( [o].[id] = [i].[id] ) WHERE ( [i].[id] > @id0 ) AND ( [o].[id] = @id1 )", "UnitFilter"); var s13 = db.Queryable((o, i) => new JoinQueryInfos(JoinType.Left, o.id == i.id)) .Where(o=>o.name=="") .Select("o.*").ToSql(); - UValidate.Check(s13.Key, "SELECT o.* FROM [UnitFilterClass2] [o] Left JOIN [UnitFilterClass1] i ON ( [o].[id] = [i].[id] ) WHERE ( [o].[name] = @name0 ) AND ( [i].[id] > @id1 ) AND ( [o].[id] = @id2 )", "UnitFilter"); + UValidate.Check(s13.Key, "SELECT o.* FROM [UnitFilterClass2] [o] Left JOIN [UnitFilterClass1] [i] ON ( [o].[id] = [i].[id] ) WHERE ( [o].[name] = @name0 ) AND ( [i].[id] > @id1 ) AND ( [o].[id] = @id2 )", "UnitFilter"); db.QueryFilter.Clear(); db.QueryFilter.Add(new SqlFilterItem() diff --git a/Src/Asp.Net/SqlServerTest/UnitTest/UQueryable2.cs b/Src/Asp.Net/SqlServerTest/UnitTest/UQueryable2.cs index d839004fa..944e31cd9 100644 --- a/Src/Asp.Net/SqlServerTest/UnitTest/UQueryable2.cs +++ b/Src/Asp.Net/SqlServerTest/UnitTest/UQueryable2.cs @@ -288,7 +288,7 @@ namespace OrmTest .LeftJoin((o, i) => o.Id == i.OrderId).AS("[ORDERDETAIL]") .LeftJoin((o, i, c) => c.Id == o.CustomId).AS("[CUSTOM]") .Select().ToSql(); - if (sql14.Key!=("SELECT [c].[Name] AS [CustomName],[o].[Id] AS [Id],[o].[Name] AS [Name],[o].[Price] AS [Price],[o].[CreateTime] AS [CreateTime],[o].[CustomId] AS [CustomId] FROM (SELECT * FROM (select * from [ORDER]) t ) [o] Left JOIN [ORDERDETAIL] i ON ( [o].[Id] = [i].[OrderId] ) Left JOIN [CUSTOM] c ON ( [c].[Id] = [o].[CustomId] ) ")) + if (sql14.Key!=("SELECT [c].[Name] AS [CustomName],[o].[Id] AS [Id],[o].[Name] AS [Name],[o].[Price] AS [Price],[o].[CreateTime] AS [CreateTime],[o].[CustomId] AS [CustomId] FROM (SELECT * FROM (select * from [ORDER]) t ) [o] Left JOIN [ORDERDETAIL] [i] ON ( [o].[Id] = [i].[OrderId] ) Left JOIN [CUSTOM] [c] ON ( [c].[Id] = [o].[CustomId] ) ")) { throw new Exception("unit error"); } diff --git a/Src/Asp.Net/SqlServerTest/UnitTest/UnitManyToMay1231.cs b/Src/Asp.Net/SqlServerTest/UnitTest/UnitManyToMay1231.cs index 7c145f62c..8785b6d00 100644 --- a/Src/Asp.Net/SqlServerTest/UnitTest/UnitManyToMay1231.cs +++ b/Src/Asp.Net/SqlServerTest/UnitTest/UnitManyToMay1231.cs @@ -42,7 +42,7 @@ namespace OrmTest .ToSqlString();//用例代码 - if (result != "SELECT [StudentId],[SchoolNo] FROM [StudentA__1] [student] WHERE EXISTS( ( SELECT 1 FROM [SchoolA__1] [SchoolA__10] Inner JOIN [SchoolAndRoomA__1] SchoolAndRoomA__1_1 ON SchoolAndRoomA__1_1.[SchoolId]=SchoolA__10.[SchoolId] Inner JOIN [RoomA__1] RoomA__11 ON RoomA__11.[RoomId]=SchoolAndRoomA__1_1.[RoomId] WHERE student.[SchoolNo] = SchoolA__10.[SchoolNo] ) ) ") + if (result != "SELECT [StudentId],[SchoolNo] FROM [StudentA__1] [student] WHERE EXISTS( ( SELECT 1 FROM [SchoolA__1] [SchoolA__10] Inner JOIN [SchoolAndRoomA__1] [SchoolAndRoomA__1_1] ON SchoolAndRoomA__1_1.[SchoolId]=SchoolA__10.[SchoolId] Inner JOIN [RoomA__1] [RoomA__11] ON RoomA__11.[RoomId]=SchoolAndRoomA__1_1.[RoomId] WHERE student.[SchoolNo] = SchoolA__10.[SchoolNo] ) ) ") { throw new Exception("unit error"); }