Fix table casing to be the expected default (Pascal casing) (#24819)

* Fix table casing to be the expected default (Pascal casing) * Normalize delimiters in raw SQL queries.
dotnet · Jun 29, 2021 · 2dd8f76 · 2dd8f76
1 parent 872db6e
commit 2dd8f76
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/test/EFCore.Relational.Specification.Tests/ConcurrencyDetectorDisabledRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/ConcurrencyDetectorDisabledRelationalTestBase.cs
@@ -3,7 +3,6 @@
 
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.TestUtilities;
 using Xunit;
 
@@ -18,11 +17,14 @@ protected ConcurrencyDetectorDisabledRelationalTestBase(TFixture fixture)
         {
         }
 
+        protected string NormalizeDelimitersInRawString(string sql)
+            => (Fixture.TestStore as RelationalTestStore)?.NormalizeDelimitersInRawString(sql) ?? sql;
+
         [ConditionalTheory]
         [MemberData(nameof(IsAsyncData))]
         public virtual Task FromSql(bool async)
             => ConcurrencyDetectorTest(async c => async
-                ? await c.Products.FromSqlRaw("select * from products").ToListAsync()
-                : c.Products.FromSqlRaw("select * from products").ToList());
+                ? await c.Products.FromSqlRaw(NormalizeDelimitersInRawString("select * from [Products]")).ToListAsync()
+                : c.Products.FromSqlRaw(NormalizeDelimitersInRawString("select * from [Products]")).ToList());
     }
 }
diff --git a/test/EFCore.Relational.Specification.Tests/ConcurrencyDetectorEnabledRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/ConcurrencyDetectorEnabledRelationalTestBase.cs
@@ -3,6 +3,7 @@
 
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore.TestUtilities;
 using Xunit;
 
 // ReSharper disable InconsistentNaming
@@ -16,11 +17,14 @@ protected ConcurrencyDetectorEnabledRelationalTestBase(TFixture fixture)
         {
         }
 
+        protected string NormalizeDelimitersInRawString(string sql)
+            => (Fixture.TestStore as RelationalTestStore)?.NormalizeDelimitersInRawString(sql) ?? sql;
+
         [ConditionalTheory]
         [MemberData(nameof(IsAsyncData))]
         public virtual Task FromSql(bool async)
             => ConcurrencyDetectorTest(async c => async
-                ? await c.Products.FromSqlRaw("select * from products").ToListAsync()
-                : c.Products.FromSqlRaw("select * from products").ToList());
+                ? await c.Products.FromSqlRaw(NormalizeDelimitersInRawString("select * from [Products]")).ToListAsync()
+                : c.Products.FromSqlRaw(NormalizeDelimitersInRawString("select * from [Products]")).ToList());
     }
 }