Add more cast nodes in multi-line breaks during migrations (#28064)

Resolves #27206
dotnet · May 23, 2022 · 3ff83c4 · 3ff83c4
1 parent bcece16
commit 3ff83c4
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 9 deletions.
diff --git a/src/EFCore.SqlServer/Storage/Internal/SqlServerStringTypeMapping.cs b/src/EFCore.SqlServer/Storage/Internal/SqlServerStringTypeMapping.cs
@@ -187,7 +187,7 @@ protected override string GenerateNonNullSqlLiteral(object value)
  var lastConcatStartPoint = 0;
  var concatCount = 1;
  var concatStartList = new List<int>();
- var castApplied = false;
+ var insideConcat = false;
  for (i = 0; i < stringValue.Length; i++)
  {
  var lineFeed = stringValue[i] == '\n';
@@ -282,12 +282,7 @@ protected override string GenerateNonNullSqlLiteral(object value)
 
  for (var j = concatStartList.Count - 1; j >= 0; j--)
  {
- if (castApplied && j == 0)
- {
- builder.Insert(concatStartList[j], "CAST(");
- }
-
- builder.Insert(concatStartList[j], "CONCAT(");
+ builder.Insert(concatStartList[j], "CONCAT(CAST(");
  builder.Append(')');
  }
 
@@ -307,7 +302,7 @@ void AddConcatOperatorIfNeeded()
  {
  if (builder.Length != 0)
  {
- if (!castApplied)
+ if (!insideConcat)
  {
  builder.Append(" AS ");
  if (_isUtf16)
@@ -316,7 +311,7 @@ void AddConcatOperatorIfNeeded()
  }
 
  builder.Append("varchar(max))");
- castApplied = true;
+ insideConcat = true;
  }
 
  builder.Append(", ");
@@ -331,6 +326,7 @@ void AddConcatOperatorIfNeeded()
  {
  lastConcatStartPoint = builder.Length;
  concatCount = 1;
+ insideConcat = false;
  }
  }
  }

diff --git a/test/EFCore.Relational.Specification.Tests/Migrations/MigrationsSqlGeneratorTestBase.cs b/test/EFCore.Relational.Specification.Tests/Migrations/MigrationsSqlGeneratorTestBase.cs
@@ -694,6 +694,35 @@ public virtual void DefaultValue_with_line_breaks(bool isUnicode)
  }
  });
 
+ [ConditionalTheory]
+ [InlineData(false)]
+ [InlineData(true)]
+ public virtual void DefaultValue_with_line_breaks_2(bool isUnicode)
+ {
+ var defaultValue = Enumerable.Range(0, 300).Select(e => e.ToString())
+ .Select(e => e + "\r\n")
+ .Join("");
+
+ Generate(
+ new CreateTableOperation
+ {
+ Name = "TestLineBreaks",
+ Schema = "dbo",
+ Columns =
+ {
+ new AddColumnOperation
+ {
+ Name = "TestDefaultValue",
+ Table = "TestLineBreaks",
+ Schema = "dbo",
+ ClrType = typeof(string),
+ DefaultValue = defaultValue,
+ IsUnicode = isUnicode
+ }
+ }
+ });
+ }
+
  private static void CreateGotModel(ModelBuilder b)
  => b.HasDefaultSchema("dbo").Entity(
  "Person", pb =>