Query: Update formatting of Update command

src/EFCore.Relational/Query/QuerySqlGenerator.cs

@@ -1271,17 +1271,17 @@ protected override Expression VisitUpdate(UpdateExpression updateExpression)
  _relationalCommandBuilder.Append("UPDATE ");
  Visit(updateExpression.Table);
  _relationalCommandBuilder.AppendLine();
+ _relationalCommandBuilder.Append("SET ");
+ _relationalCommandBuilder.Append($"{_sqlGenerationHelper.DelimitIdentifier(updateExpression.SetColumnValues[0].Column.Name)} = ");
+ Visit(updateExpression.SetColumnValues[0].Value);
  using (_relationalCommandBuilder.Indent())
  {
- _relationalCommandBuilder.Append("SET ");
- GenerateList(updateExpression.SetColumnValues,
- e =>
- {
- _relationalCommandBuilder.Append($"{_sqlGenerationHelper.DelimitIdentifier(e.Column.Name)} = ");
- Visit(e.Value);
-
- },
- joinAction: e => e.AppendLine(","));
+ foreach (var setColumnValue in updateExpression.SetColumnValues.Skip(1))
+ {
+ _relationalCommandBuilder.AppendLine(",");
+ _relationalCommandBuilder.Append($"{_sqlGenerationHelper.DelimitIdentifier(setColumnValue.Column.Name)} = ");
+ Visit(setColumnValue.Value);
+ }
  }
 
  var predicate = selectExpression.Predicate;

src/EFCore.Relational/Query/SqlExpressions/UpdateExpression.cs

@@ -120,25 +120,21 @@ public void Print(ExpressionPrinter expressionPrinter)
  }
  expressionPrinter.AppendLine();
  expressionPrinter.AppendLine($"UPDATE {Table.Name} AS {Table.Alias}");
- expressionPrinter.AppendLine("SET");
+ expressionPrinter.AppendLine("SET ");
+ expressionPrinter.Visit(SetColumnValues[0].Column);
+ expressionPrinter.Append(" = ");
+ expressionPrinter.Visit(SetColumnValues[0].Value);
  using (expressionPrinter.Indent())
  {
- var first = true;
- foreach (var setColumnValue in SetColumnValues)
+ foreach (var setColumnValue in SetColumnValues.Skip(1))
  {
- if (first)
- {
- first = false;
- }
- else
- {
- expressionPrinter.AppendLine(",");
- }
+ expressionPrinter.AppendLine(",");
  expressionPrinter.Visit(setColumnValue.Column);
  expressionPrinter.Append(" = ");
  expressionPrinter.Visit(setColumnValue.Value);
  }
  }
+ expressionPrinter.AppendLine();
  expressionPrinter.Visit(SelectExpression);
  }
 

src/EFCore.SqlServer/Query/Internal/SqlServerQuerySqlGenerator.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Text.Json;
+using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Query.SqlExpressions;
 using Microsoft.EntityFrameworkCore.SqlServer.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.SqlServer.Storage.Internal;
@@ -91,22 +92,23 @@ protected override Expression VisitUpdate(UpdateExpression updateExpression)
  GenerateTop(selectExpression);
 
  Sql.AppendLine($"{Dependencies.SqlGenerationHelper.DelimitIdentifier(updateExpression.Table.Alias)}");
+ Sql.Append("SET ");
+ Visit(updateExpression.SetColumnValues[0].Column);
+ Sql.Append(" = ");
+ Visit(updateExpression.SetColumnValues[0].Value);
+
  using (Sql.Indent())
  {
- Sql.Append("SET ");
- GenerateList(updateExpression.SetColumnValues,
- e =>
- {
- Visit(e.Column);
- Sql.Append(" = ");
- Visit(e.Value);
-
- },
- joinAction: e => e.AppendLine(","));
- Sql.AppendLine();
+ foreach (var setColumnValue in updateExpression.SetColumnValues.Skip(1))
+ {
+ Sql.AppendLine(",");
+ Visit(setColumnValue.Column);
+ Sql.Append(" = ");
+ Visit(setColumnValue.Value);
+ }
  }
 
- Sql.Append("FROM ");
+ Sql.AppendLine().Append("FROM ");
  GenerateList(selectExpression.Tables, e => Visit(e), sql => sql.AppendLine());
 
  if (selectExpression.Predicate != null)

test/EFCore.SqlServer.FunctionalTests/BulkUpdates/FiltersInheritanceBulkUpdatesSqlServerTest.cs

@@ -128,7 +128,7 @@ public override async Task Update_where_hierarchy(bool async)
 
  AssertExecuteUpdateSql(
  @"UPDATE [a]
- SET [a].[Name] = N'Animal'
+SET [a].[Name] = N'Animal'
 FROM [Animals] AS [a]
 WHERE [a].[CountryId] = 1 AND [a].[Name] = N'Great spotted kiwi'");
  }
@@ -146,7 +146,7 @@ public override async Task Update_where_hierarchy_derived(bool async)
 
  AssertExecuteUpdateSql(
  @"UPDATE [a]
- SET [a].[Name] = N'Kiwi'
+SET [a].[Name] = N'Kiwi'
 FROM [Animals] AS [a]
 WHERE [a].[Discriminator] = N'Kiwi' AND [a].[CountryId] = 1 AND [a].[Name] = N'Great spotted kiwi'");
  }
@@ -157,7 +157,7 @@ public override async Task Update_where_using_hierarchy(bool async)
 
  AssertExecuteUpdateSql(
  @"UPDATE [c]
- SET [c].[Name] = N'Monovia'
+SET [c].[Name] = N'Monovia'
 FROM [Countries] AS [c]
 WHERE (
  SELECT COUNT(*)
@@ -171,7 +171,7 @@ public override async Task Update_where_using_hierarchy_derived(bool async)
 
  AssertExecuteUpdateSql(
  @"UPDATE [c]
- SET [c].[Name] = N'Monovia'
+SET [c].[Name] = N'Monovia'
 FROM [Countries] AS [c]
 WHERE (
  SELECT COUNT(*)

test/EFCore.SqlServer.FunctionalTests/BulkUpdates/InheritanceBulkUpdatesSqlServerTest.cs

@@ -127,7 +127,7 @@ public override async Task Update_where_hierarchy(bool async)
 
  AssertExecuteUpdateSql(
  @"UPDATE [a]
- SET [a].[Name] = N'Animal'
+SET [a].[Name] = N'Animal'
 FROM [Animals] AS [a]
 WHERE [a].[Name] = N'Great spotted kiwi'");
  }
@@ -145,7 +145,7 @@ public override async Task Update_where_hierarchy_derived(bool async)
 
  AssertExecuteUpdateSql(
  @"UPDATE [a]
- SET [a].[Name] = N'Kiwi'
+SET [a].[Name] = N'Kiwi'
 FROM [Animals] AS [a]
 WHERE [a].[Discriminator] = N'Kiwi' AND [a].[Name] = N'Great spotted kiwi'");
  }
@@ -156,7 +156,7 @@ public override async Task Update_where_using_hierarchy(bool async)
 
  AssertExecuteUpdateSql(
  @"UPDATE [c]
- SET [c].[Name] = N'Monovia'
+SET [c].[Name] = N'Monovia'
 FROM [Countries] AS [c]
 WHERE (
  SELECT COUNT(*)
@@ -170,7 +170,7 @@ public override async Task Update_where_using_hierarchy_derived(bool async)
 
  AssertExecuteUpdateSql(
  @"UPDATE [c]
- SET [c].[Name] = N'Monovia'
+SET [c].[Name] = N'Monovia'
 FROM [Countries] AS [c]
 WHERE (
  SELECT COUNT(*)