feat: port Pomelo.EntityFrameworkCore.MySql to .NET 10 / EF Core 10

omarbaruzzo · omarbaruzzo · commit 45aeedaa3f4a · 2026-02-14T13:38:01.000Z
- Target net10.0 in Directory.Build.props and Directory.Packages.props
- Add VisitRightJoin(RightJoinExpression) in MySqlBoolOptimizingExpressionVisitor (EF Core 10)
- Update MySqlParameterBasedSqlProcessor.ProcessSqlNullability to (Expression, ParametersCacheDecorator)
- Mark Optimize and IsValidSelectExpressionForExecuteDelete as [Obsolete] per base class
- Replace TranslateParameterizedCollectionsToConstants with UseParameterizedCollectionMode(ParameterTranslationMode.Constant)
- Replace QueryParameterPrefix with hardcoded "__", QueryContext.ParameterValues with Parameters
- Update MySqlQueryCompilationContext constructor (remove 5-param overload)
- Replace AbstractionsStrings calls with inline messages in Check.cs
- Integrate ported Pomelo via ProjectReference in ZahelLibrary, IdentityProvider, Admin, ServiceTest
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "markdown.styles": [
+        "https://socialsimulation.net/css/post.min.css"
+    ]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,16 +1,21 @@
 {
-    "version": "0.1.0",
+    "version": "2.0.0",
     "command": "dotnet",
-    "isShellCommand": true,
     "args": [],
     "tasks": [
         {
-            "taskName": "build",
+            "label": "build",
+            "type": "shell",
+            "command": "dotnet",
             "args": [
+                "build",
                 "${workspaceRoot}/test/EFCore.MySql.IntegrationTests/EFCore.MySql.IntegrationTests.csproj"
             ],
-            "isBuildCommand": true,
-            "problemMatcher": "$msCompile"
+            "problemMatcher": "$msCompile",
+            "group": {
+                "_id": "build",
+                "isDefault": false
+            }
         }
     ]
 }
diff --git a/.vscode/tasks.json.old b/.vscode/tasks.json.old
@@ -0,0 +1,16 @@
+{
+    "version": "0.1.0",
+    "command": "dotnet",
+    "isShellCommand": true,
+    "args": [],
+    "tasks": [
+        {
+            "taskName": "build",
+            "args": [
+                "${workspaceRoot}/test/EFCore.MySql.IntegrationTests/EFCore.MySql.IntegrationTests.csproj"
+            ],
+            "isBuildCommand": true,
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -26,10 +26,10 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <PomeloTargetFramework>net8.0</PomeloTargetFramework>
-    <PomeloTestTargetFramework>net9.0</PomeloTestTargetFramework>
-    <EfCoreTargetFramework>net8.0</EfCoreTargetFramework>
-    <EfCoreTestTargetFramework>net9.0</EfCoreTestTargetFramework>
+    <PomeloTargetFramework>net10.0</PomeloTargetFramework>
+    <PomeloTestTargetFramework>net10.0</PomeloTestTargetFramework>
+    <EfCoreTargetFramework>net10.0</EfCoreTargetFramework>
+    <EfCoreTestTargetFramework>net10.0</EfCoreTestTargetFramework>
     <MySqlConnectorTargetFramework>net8.0</MySqlConnectorTargetFramework>
     <MySqlConnectorDependencyInjectionTargetFramework>net8.0</MySqlConnectorDependencyInjectionTargetFramework>
   </PropertyGroup>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,7 +3,7 @@
     <!-- We shoud try: [9.0.0,9.1.0-0)
          `-0` is the smallest possible prerelease version according to SemVer2.
     -->
-    <EFCoreVersion>[9.0.0,9.0.999]</EFCoreVersion>
+    <EFCoreVersion>[10.0.0,10.0.999]</EFCoreVersion>
   </PropertyGroup>
 
   <ItemGroup Label="Dependencies">
diff --git a/src/EFCore.MySql/Extensions/MySqlDbContextOptionsBuilderExtensions.cs b/src/EFCore.MySql/Extensions/MySqlDbContextOptionsBuilderExtensions.cs
@@ -62,7 +62,7 @@ public static DbContextOptionsBuilder UseMySql(
             ConfigureWarnings(optionsBuilder);
 
             var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder)
-                .TranslateParameterizedCollectionsToConstants();
+                .UseParameterizedCollectionMode(ParameterTranslationMode.Constant);
 
             mySqlOptionsAction?.Invoke(mySqlDbContextOptionsBuilder);
 
@@ -108,7 +108,7 @@ public static DbContextOptionsBuilder UseMySql(
             ConfigureWarnings(optionsBuilder);
 
             var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder)
-                .TranslateParameterizedCollectionsToConstants();
+                .UseParameterizedCollectionMode(ParameterTranslationMode.Constant);
 
             mySqlOptionsAction?.Invoke(mySqlDbContextOptionsBuilder);
 
@@ -158,7 +158,7 @@ public static DbContextOptionsBuilder UseMySql(
             ConfigureWarnings(optionsBuilder);
 
             var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder)
-                .TranslateParameterizedCollectionsToConstants();
+                .UseParameterizedCollectionMode(ParameterTranslationMode.Constant);
 
             mySqlOptionsAction?.Invoke(mySqlDbContextOptionsBuilder);
 
@@ -205,7 +205,7 @@ public static DbContextOptionsBuilder UseMySql(
             ConfigureWarnings(optionsBuilder);
 
             var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder)
-                .TranslateParameterizedCollectionsToConstants();
+                .UseParameterizedCollectionMode(ParameterTranslationMode.Constant);
 
             mySqlOptionsAction?.Invoke(mySqlDbContextOptionsBuilder);
 
diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringComparisonMethodTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringComparisonMethodTranslator.cs
@@ -525,7 +525,7 @@ protected virtual SqlExpression GetLikeExpressionUsingParameter(
             StartsEndsWithContains methodType)
         {
             if (pattern is SqlParameterExpression patternParameter &&
-                patternParameter.Name.StartsWith(QueryCompilationContext.QueryParameterPrefix, StringComparison.Ordinal))
+                patternParameter.Name.StartsWith("__", StringComparison.Ordinal))
             {
                 // The pattern is a parameter, register a runtime parameter that will contain the rewritten LIKE pattern, where
                 // all special characters have been escaped.
@@ -718,7 +718,7 @@ private static string ConstructLikePatternParameter(
             QueryContext queryContext,
             string baseParameterName,
             StartsEndsWithContains methodType)
-            => queryContext.ParameterValues[baseParameterName] switch
+            => queryContext.Parameters[baseParameterName] switch
             {
                 null => null,
 
diff --git a/src/EFCore.MySql/Query/ExpressionVisitors/Internal/MySqlBoolOptimizingExpressionVisitor.cs b/src/EFCore.MySql/Query/ExpressionVisitors/Internal/MySqlBoolOptimizingExpressionVisitor.cs
@@ -541,6 +541,20 @@ protected override Expression VisitLeftJoin(LeftJoinExpression leftJoinExpressio
             return leftJoinExpression.Update(table, joinPredicate);
         }
 
+        protected override Expression VisitRightJoin(RightJoinExpression rightJoinExpression)
+        {
+            Check.NotNull(rightJoinExpression, nameof(rightJoinExpression));
+
+            var parentOptimize = _optimize;
+            _optimize = false;
+            var table = (TableExpressionBase)Visit(rightJoinExpression.Table);
+            _optimize = true;
+            var joinPredicate = (SqlExpression)Visit(rightJoinExpression.JoinPredicate);
+            _optimize = parentOptimize;
+
+            return rightJoinExpression.Update(table, joinPredicate);
+        }
+
         protected override Expression VisitRowValue(RowValueExpression rowValueExpression)
         {
             var parentOptimize = _optimize;
diff --git a/src/EFCore.MySql/Query/Internal/MySqlParameterBasedSqlProcessor.cs b/src/EFCore.MySql/Query/Internal/MySqlParameterBasedSqlProcessor.cs
@@ -1,8 +1,9 @@
-﻿// Copyright (c) Pomelo Foundation. All rights reserved.
+// Copyright (c) Pomelo Foundation. All rights reserved.
 // Licensed under the MIT. See LICENSE in the project root for license information.
 
 #nullable enable
 
+using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore.Query;
@@ -25,6 +26,7 @@ public MySqlParameterBasedSqlProcessor(
             _options = options;
         }
 
+        [Obsolete("RelationalParameterBasedSqlProcessor.Optimize is obsolete")]
         public override Expression Optimize(
             Expression queryExpression,
             IReadOnlyDictionary<string, object?> parametersValues,
@@ -62,16 +64,13 @@ public override Expression Optimize(
         /// <inheritdoc />
         protected override Expression ProcessSqlNullability(
             Expression queryExpression,
-            IReadOnlyDictionary<string, object?> parametersValues,
-            out bool canCache)
+            ParametersCacheDecorator parametersDecorator)
         {
             Check.NotNull(queryExpression, nameof(queryExpression));
-            Check.NotNull(parametersValues, nameof(parametersValues));
+            Check.NotNull(parametersDecorator, nameof(parametersDecorator));
 
-            queryExpression = new MySqlSqlNullabilityProcessor(Dependencies, Parameters)
-                .Process(queryExpression, parametersValues, out canCache);
-
-            return queryExpression;
+            return new MySqlSqlNullabilityProcessor(Dependencies, Parameters)
+                .Process(queryExpression, parametersDecorator);
         }
     }
 }
diff --git a/src/EFCore.MySql/Query/Internal/MySqlQueryCompilationContext.cs b/src/EFCore.MySql/Query/Internal/MySqlQueryCompilationContext.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) Pomelo Foundation. All rights reserved.
+// Copyright (c) Pomelo Foundation. All rights reserved.
 // Licensed under the MIT. See LICENSE in the project root for license information.
 
 using System.Collections.Generic;
@@ -21,9 +21,8 @@ public MySqlQueryCompilationContext(
             [NotNull] QueryCompilationContextDependencies dependencies,
             [NotNull] RelationalQueryCompilationContextDependencies relationalDependencies,
             bool async,
-            bool precompiling,
-            IReadOnlySet<string> nonNullableReferenceTypeParameters)
-            : base(dependencies, relationalDependencies, async, precompiling, nonNullableReferenceTypeParameters)
+            bool precompiling)
+            : base(dependencies, relationalDependencies, async, precompiling)
         {
         }
 
diff --git a/src/EFCore.MySql/Query/Internal/MySqlQueryCompilationContextFactory.cs b/src/EFCore.MySql/Query/Internal/MySqlQueryCompilationContextFactory.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) Pomelo Foundation. All rights reserved.
+// Copyright (c) Pomelo Foundation. All rights reserved.
 // Licensed under the MIT. See LICENSE in the project root for license information.
 
 using System.Collections.Generic;
@@ -28,7 +28,6 @@ public virtual QueryCompilationContext Create(bool async)
             => new MySqlQueryCompilationContext(_dependencies, _relationalDependencies, async);
 
         public virtual QueryCompilationContext CreatePrecompiled(bool async, IReadOnlySet<string> nonNullableReferenceTypeParameters)
-            => new MySqlQueryCompilationContext(
-                _dependencies, _relationalDependencies, async, precompiling: true, nonNullableReferenceTypeParameters);
+            => new MySqlQueryCompilationContext(_dependencies, _relationalDependencies, async, precompiling: true);
     }
 }
diff --git a/src/EFCore.MySql/Query/Internal/MySqlQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.MySql/Query/Internal/MySqlQueryableMethodTranslatingExpressionVisitor.cs
@@ -80,10 +80,11 @@ bool IsJsonEachKeyColumn(SelectExpression selectExpression, ColumnExpression ord
                        && IsJsonEachKeyColumn(subquery, projectedColumn)));
     }
 
+    [Obsolete("RelationalQueryableMethodTranslatingExpressionVisitor.IsValidSelectExpressionForExecuteDelete is obsolete")]
     protected override bool IsValidSelectExpressionForExecuteDelete(
         SelectExpression selectExpression,
         StructuralTypeShaperExpression shaper,
-        [NotNullWhen(true)] out TableExpression tableExpression)
+        out TableExpression tableExpression)
     {
         if (selectExpression.Offset == null
             && selectExpression.GroupBy.Count == 0
diff --git a/src/Shared/Check.cs b/src/Shared/Check.cs
@@ -1,12 +1,11 @@
-﻿// Copyright (c) Pomelo Foundation. All rights reserved.
+// Copyright (c) Pomelo Foundation. All rights reserved.
 // Licensed under the MIT. See LICENSE in the project root for license information.
 
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using JetBrains.Annotations;
-using Microsoft.EntityFrameworkCore.Diagnostics;
 using CA = System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.EntityFrameworkCore.Utilities
@@ -38,7 +37,7 @@ public static IReadOnlyList<T> NotEmpty<T>(IReadOnlyList<T> value, [InvokerParam
             {
                 NotEmpty(parameterName, nameof(parameterName));
 
-                throw new ArgumentException(AbstractionsStrings.CollectionArgumentIsEmpty(parameterName));
+                throw new ArgumentException($"The collection argument '{parameterName}' cannot be empty.");
             }
 
             return value;
@@ -54,7 +53,7 @@ public static string NotEmpty(string value, [InvokerParameterName] [NotNull] str
             }
             else if (value.Trim().Length == 0)
             {
-                e = new ArgumentException(AbstractionsStrings.ArgumentIsEmpty(parameterName));
+                e = new ArgumentException($"The string argument '{parameterName}' cannot be empty.");
             }
 
             if (e != null)
@@ -74,7 +73,7 @@ public static string NullButNotEmpty(string value, [InvokerParameterName] [NotNu
             {
                 NotEmpty(parameterName, nameof(parameterName));
 
-                throw new ArgumentException(AbstractionsStrings.ArgumentIsEmpty(parameterName));
+                throw new ArgumentException($"The string argument '{parameterName}' cannot be empty.");
             }
 
             return value;
@@ -105,7 +104,7 @@ public static IReadOnlyList<string> HasNoEmptyElements(
             {
                 NotEmpty(parameterName, nameof(parameterName));
 
-                throw new ArgumentException(AbstractionsStrings.CollectionArgumentHasEmptyElements(parameterName));
+                throw new ArgumentException($"The collection argument '{parameterName}' cannot contain empty elements.");
             }
 
             return value;

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +    "markdown.styles": [
 +        "https://socialsimulation.net/css/post.min.css"
 +    ]
 +}
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,21 @@`
`1`	`1`	`{`
`2`		`- "version": "0.1.0",`
	`2`	`+ "version": "2.0.0",`
`3`	`3`	`"command": "dotnet",`
`4`		`- "isShellCommand": true,`
`5`	`4`	`"args": [],`
`6`	`5`	`"tasks": [`
`7`	`6`	`{`
`8`		`- "taskName": "build",`
	`7`	`+ "label": "build",`
	`8`	`+ "type": "shell",`
	`9`	`+ "command": "dotnet",`
`9`	`10`	`"args": [`
	`11`	`+ "build",`
`10`	`12`	`"${workspaceRoot}/test/EFCore.MySql.IntegrationTests/EFCore.MySql.IntegrationTests.csproj"`
`11`	`13`	`],`
`12`		`- "isBuildCommand": true,`
`13`		`- "problemMatcher": "$msCompile"`
	`14`	`+ "problemMatcher": "$msCompile",`
	`15`	`+ "group": {`
	`16`	`+ "_id": "build",`
	`17`	`+ "isDefault": false`
	`18`	`+ }`
`14`	`19`	`}`
`15`	`20`	`]`
`16`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -525,7 +525,7 @@ protected virtual SqlExpression GetLikeExpressionUsingParameter(`
`525`	`525`	`StartsEndsWithContains methodType)`
`526`	`526`	`{`
`527`	`527`	`if (pattern is SqlParameterExpression patternParameter &&`
`528`		`- patternParameter.Name.StartsWith(QueryCompilationContext.QueryParameterPrefix, StringComparison.Ordinal))`
	`528`	`+ patternParameter.Name.StartsWith("__", StringComparison.Ordinal))`
`529`	`529`	`{`
`530`	`530`	`// The pattern is a parameter, register a runtime parameter that will contain the rewritten LIKE pattern, where`
`531`	`531`	`// all special characters have been escaped.`
`@@ -718,7 +718,7 @@ private static string ConstructLikePatternParameter(`
`718`	`718`	`QueryContext queryContext,`
`719`	`719`	`string baseParameterName,`
`720`	`720`	`StartsEndsWithContains methodType)`
`721`		`- => queryContext.ParameterValues[baseParameterName] switch`
	`721`	`+ => queryContext.Parameters[baseParameterName] switch`
`722`	`722`	`{`
`723`	`723`	`null => null,`
`724`	`724`