From b0da2e106568b7452ac7d71fa5724777a89add09 Mon Sep 17 00:00:00 2001 From: Rafael Almeida Santos Date: Wed, 8 Jan 2020 18:54:09 -0300 Subject: [PATCH] =?UTF-8?q?Cleanup:=20Extra=20line=20=F0=9F=94=A5=20(#1951?= =?UTF-8?q?9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cleanup: Extra line 🔥 --- src/EFCore.Relational/Query/QuerySqlGenerator.cs | 2 +- ...orthwindAggregateOperatorsQuerySqlServerTest.cs | 9 +++------ .../Query/NorthwindWhereQuerySqlServerTest.cs | 14 +++----------- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/EFCore.Relational/Query/QuerySqlGenerator.cs b/src/EFCore.Relational/Query/QuerySqlGenerator.cs index 0e94e805dc5..5e9f7314ffe 100644 --- a/src/EFCore.Relational/Query/QuerySqlGenerator.cs +++ b/src/EFCore.Relational/Query/QuerySqlGenerator.cs @@ -637,7 +637,7 @@ protected override Expression VisitIn(InExpression inExpression) Visit(inExpression.Subquery); } - _relationalCommandBuilder.AppendLine().AppendLine(")"); + _relationalCommandBuilder.AppendLine().Append(")"); } return inExpression; diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindAggregateOperatorsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindAggregateOperatorsQuerySqlServerTest.cs index 71fdcd5636e..b41bed1b4b7 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindAggregateOperatorsQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindAggregateOperatorsQuerySqlServerTest.cs @@ -965,8 +965,7 @@ SELECT CASE WHEN @__p_0 IN ( SELECT [c].[CustomerID] FROM [Customers] AS [c] - ) - THEN CAST(1 AS bit) + ) THEN CAST(1 AS bit) ELSE CAST(0 AS bit) END"); } @@ -1084,8 +1083,7 @@ WHEN @__entity_equality_p_0_OrderID IN ( SELECT [o].[OrderID] FROM [Orders] AS [o] WHERE [o].[CustomerID] = N'VINET' - ) - THEN CAST(1 AS bit) + ) THEN CAST(1 AS bit) ELSE CAST(0 AS bit) END"); } @@ -1178,8 +1176,7 @@ WHEN @__entity_equality_p_0_OrderID IN ( SELECT [o].[OrderID] FROM [Orders] AS [o] WHERE [o].[CustomerID] = N'VINET' - ) - THEN CAST(1 AS bit) + ) THEN CAST(1 AS bit) ELSE CAST(0 AS bit) END"); } diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindWhereQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindWhereQuerySqlServerTest.cs index 509933bf69c..05b5f72a975 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindWhereQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/NorthwindWhereQuerySqlServerTest.cs @@ -1573,8 +1573,7 @@ WHERE [o].[ProductID] IN ( SELECT TOP(1) [p].[ProductID] FROM [Products] AS [p] ORDER BY [p].[ProductID] -) - OR [o].[OrderID] IN ( +) OR [o].[OrderID] IN ( SELECT TOP(1) [o0].[OrderID] FROM [Orders] AS [o0] ORDER BY [o0].[OrderID] @@ -1592,8 +1591,7 @@ WHERE [o].[ProductID] IN ( SELECT TOP(20) [p].[ProductID] FROM [Products] AS [p] ORDER BY [p].[ProductID] -) - AND [o].[OrderID] IN ( +) AND [o].[OrderID] IN ( SELECT TOP(10) [o0].[OrderID] FROM [Orders] AS [o0] ORDER BY [o0].[OrderID] @@ -1614,8 +1612,7 @@ WHERE [o].[OrderID] IN ( SELECT [o0].[OrderID] FROM [Orders] AS [o0] WHERE [c].[CustomerID] = [o0].[CustomerID] - ) -)"); + ))"); } public override async Task Where_subquery_FirstOrDefault_is_null(bool async) @@ -1803,7 +1800,6 @@ SELECT [o0].[CustomerID] FROM [Orders] AS [o0] WHERE [o0].[CustomerID] = [c].[CustomerID] ) - ORDER BY [c].[CustomerID], [o].[OrderID]"); } @@ -1835,7 +1831,6 @@ SELECT [o0].[CustomerID] FROM [Orders] AS [o0] WHERE [o0].[CustomerID] = [c].[CustomerID] ) - ORDER BY [c].[CustomerID], [o].[OrderID]"); } @@ -1867,7 +1862,6 @@ SELECT [o0].[CustomerID] FROM [Orders] AS [o0] WHERE [o0].[CustomerID] = [c].[CustomerID] ) - ORDER BY [c].[CustomerID], [o].[OrderID]"); } @@ -1923,7 +1917,6 @@ SELECT [o0].[OrderID] FROM [Orders] AS [o0] WHERE [c].[CustomerID] = [o0].[CustomerID] ) - ORDER BY [c].[CustomerID], [o].[OrderID]"); } @@ -1979,7 +1972,6 @@ SELECT [o0].[OrderID] FROM [Orders] AS [o0] WHERE [c].[CustomerID] = [o0].[CustomerID] ) - ORDER BY [c].[CustomerID], [o].[OrderID]"); }