Remove workaround for dotnet/efcore#24819.

lauxjpn · Nov 9, 2021 · f0fbbc2 · f0fbbc2
1 parent fb7d600
commit f0fbbc2
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/...FCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringComparisonMethodTranslator.cs b/...FCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringComparisonMethodTranslator.cs
@@ -388,6 +388,7 @@ private SqlExpression MakeStartsWithEndsWithExpressionImpl(
                                         : string.Empty))));
                 }
 
+                // TODO: EF Core 5
                 // https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql/issues/996#issuecomment-607876040
                 // Can return NULL in .NET 5 after https://github.com/dotnet/efcore/issues/20498 has been fixed.
                 // `something LIKE NULL` always returns `NULL`. We will return `false`, to indicate, that no match

diff --git a/test/EFCore.MySql.FunctionalTests/ConcurrencyDetectorDisabledMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/ConcurrencyDetectorDisabledMySqlTest.cs
@@ -24,12 +24,6 @@ protected override async Task ConcurrencyDetectorTest(Func<ConcurrencyDetectorDb
             Assert.NotEmpty(Fixture.TestSqlLoggerFactory.SqlStatements);
         }
 
-        // TODO: Will be fixed by https://github.com/dotnet/efcore/pull/24819
-        public override Task FromSql(bool async)
-            => ConcurrencyDetectorTest(async c => async
-                ? await c.Products.FromSqlRaw("SELECT * FROM `Products`").ToListAsync()
-                : c.Products.FromSqlRaw("SELECT * FROM `Products`").ToList());
-
         public class ConcurrencyDetectorMySqlFixture : ConcurrencyDetectorFixtureBase
         {
             protected override ITestStoreFactory TestStoreFactory

diff --git a/test/EFCore.MySql.FunctionalTests/ConcurrencyDetectorEnabledMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/ConcurrencyDetectorEnabledMySqlTest.cs
@@ -24,12 +24,6 @@ protected override async Task ConcurrencyDetectorTest(Func<ConcurrencyDetectorDb
             Assert.Empty(Fixture.TestSqlLoggerFactory.SqlStatements);
         }
 
-        // TODO: Will be fixed by https://github.com/dotnet/efcore/pull/24819
-        public override Task FromSql(bool async)
-            => ConcurrencyDetectorTest(async c => async
-                ? await c.Products.FromSqlRaw("SELECT * FROM `Products`").ToListAsync()
-                : c.Products.FromSqlRaw("SELECT * FROM `Products`").ToList());
-
         public class ConcurrencyDetectorMySqlFixture : ConcurrencyDetectorFixtureBase
         {
             protected override ITestStoreFactory TestStoreFactory