Merge pull request #109 from microting/copilot/fix-failing-tests-issue

Fix EF Core 10 API breaking changes in query processor and modification command batch

Author: renemadsen

src/EFCore.MySql/Query/ExpressionVisitors/Internal/MySqlParameterInliningExpressionVisitor.cs

@@ -23,8 +23,7 @@ public class MySqlParameterInliningExpressionVisitor : ExpressionVisitor
     private readonly ISqlExpressionFactory _sqlExpressionFactory;
     private readonly IMySqlOptions _options;
 
-    private IReadOnlyDictionary<string, object> _parametersValues;
-    private bool _canCache;
+    private ParametersCacheDecorator _parametersDecorator;
 
     private bool _shouldInlineParameters;
 
@@ -38,18 +37,15 @@ public MySqlParameterInliningExpressionVisitor(
         _options = options;
     }
 
-    public virtual Expression Process(Expression expression, IReadOnlyDictionary<string, object> parametersValues, out bool canCache)
+    public virtual Expression Process(Expression expression, ParametersCacheDecorator parametersDecorator)
     {
         Check.NotNull(expression, nameof(expression));
 
-        _parametersValues = parametersValues;
-        _canCache = true;
+        _parametersDecorator = parametersDecorator;
         _shouldInlineParameters = false;
 
         var result = Visit(expression);
 
-        canCache = _canCache;
-
         return result;
     }
 
@@ -103,12 +99,12 @@ protected virtual Expression VisitSqlParameter(SqlParameterExpression sqlParamet
             return sqlParameterExpression;
         }
 
-        _canCache = false;
+        var parameterValues = _parametersDecorator.GetAndDisableCaching();
 
         return new MySqlInlinedParameterExpression(
             sqlParameterExpression,
             (SqlConstantExpression)_sqlExpressionFactory.Constant(
-                _parametersValues[sqlParameterExpression.Name],
+                parameterValues[sqlParameterExpression.Name],
                 sqlParameterExpression.TypeMapping));
     }
 

src/EFCore.MySql/Query/Internal/MySqlParameterBasedSqlProcessor.cs

@@ -3,8 +3,6 @@
 
 #nullable enable
 
-using System;
-using System.Collections.Generic;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Utilities;
@@ -26,20 +24,14 @@ public MySqlParameterBasedSqlProcessor(
             _options = options;
         }
 
-        [Obsolete]
-        public override Expression Optimize(
-            Expression queryExpression,
-            IReadOnlyDictionary<string, object?> parametersValues,
-            out bool canCache)
+        public override Expression Process(Expression queryExpression, ParametersCacheDecorator parametersDecorator)
         {
-            queryExpression = base.Optimize(queryExpression, parametersValues, out canCache);
+            queryExpression = base.Process(queryExpression, parametersDecorator);
 
             if (_options.ServerVersion.Supports.MySqlBugLimit0Offset0ExistsWorkaround)
             {
                 queryExpression = new SkipTakeCollapsingExpressionVisitor(Dependencies.SqlExpressionFactory)
-                    .Process(queryExpression, parametersValues, out var canCache2);
-
-                canCache &= canCache2;
+                    .Process(queryExpression, parametersDecorator);
             }
 
             if (_options.IndexOptimizedBooleanColumns)
@@ -51,14 +43,16 @@ public override Expression Optimize(
             queryExpression = new MySqlParameterInliningExpressionVisitor(
                 Dependencies.TypeMappingSource,
                 Dependencies.SqlExpressionFactory,
-                _options).Process(queryExpression, parametersValues, out var canCache3);
-
-            canCache &= canCache3;
+                _options).Process(queryExpression, parametersDecorator);
 
             // Run the compatibility checks as late in the query pipeline (before the actual SQL translation happens) as reasonable.
             queryExpression = new MySqlCompatibilityExpressionVisitor(_options).Visit(queryExpression);
 
             return queryExpression;
         }
+
+        /// <inheritdoc />
+        protected override Expression ProcessSqlNullability(Expression selectExpression, ParametersCacheDecorator parametersDecorator)
+            => new MySqlSqlNullabilityProcessor(Dependencies, Parameters).Process(selectExpression, parametersDecorator);
     }
 }

src/EFCore.MySql/Query/Internal/SkipTakeCollapsingExpressionVisitor.cs

@@ -15,32 +15,27 @@ public class SkipTakeCollapsingExpressionVisitor : ExpressionVisitor
     {
         private readonly ISqlExpressionFactory _sqlExpressionFactory;
 
-        private IReadOnlyDictionary<string, object?> _parameterValues;
-        private bool _canCache;
+        private ParametersCacheDecorator _parametersDecorator;
 
         public SkipTakeCollapsingExpressionVisitor(ISqlExpressionFactory sqlExpressionFactory)
         {
             Check.NotNull(sqlExpressionFactory, nameof(sqlExpressionFactory));
 
             _sqlExpressionFactory = sqlExpressionFactory;
-            _parameterValues = null!;
+            _parametersDecorator = null!;
         }
 
         public virtual Expression Process(
             Expression selectExpression,
-            IReadOnlyDictionary<string, object?> parametersValues,
-            out bool canCache)
+            ParametersCacheDecorator parametersDecorator)
         {
             Check.NotNull(selectExpression, nameof(selectExpression));
-            Check.NotNull(parametersValues, nameof(parametersValues));
+            Check.NotNull(parametersDecorator, nameof(parametersDecorator));
 
-            _parameterValues = parametersValues;
-            _canCache = true;
+            _parametersDecorator = parametersDecorator;
 
             var result = Visit(selectExpression);
 
-            canCache = _canCache;
-
             return result;
         }
 
@@ -74,8 +69,8 @@ bool IsZero(SqlExpression? sqlExpression)
                         when constant.Value is int intValue:
                             return intValue == 0;
                         case SqlParameterExpression parameter:
-                            _canCache = false;
-                            return _parameterValues[parameter.Name] is int value && value == 0;
+                            var parameterValues = _parametersDecorator.GetAndDisableCaching();
+                            return parameterValues[parameter.Name] is int value && value == 0;
 
                         default:
                             return false;

src/EFCore.MySql/Update/Internal/MySqlModificationCommandBatch.cs

@@ -26,7 +26,6 @@ namespace Pomelo.EntityFrameworkCore.MySql.Update.Internal;
 public class MySqlModificationCommandBatch : AffectedCountModificationCommandBatch
 {
     private readonly List<IReadOnlyModificationCommand> _pendingBulkInsertCommands = new();
-    private readonly Dictionary<string, object> _parameterValues = new();
 
     public MySqlModificationCommandBatch(
         ModificationCommandBatchFactoryDependencies dependencies,
@@ -45,21 +44,6 @@ protected override void RollbackLastCommand(IReadOnlyModificationCommand modific
             _pendingBulkInsertCommands.RemoveAt(_pendingBulkInsertCommands.Count - 1);
         }
 
-        //////
-        // Pulled up from the base implementation to support our _pendingParameters field:
-
-        for (var i = 0; i < _pendingParameters; i++)
-        {
-            var parameterIndex = RelationalCommandBuilder.Parameters.Count - 1;
-            var parameter = RelationalCommandBuilder.Parameters[parameterIndex];
-
-            RelationalCommandBuilder.RemoveParameterAt(parameterIndex);
-            _parameterValues.Remove(parameter.InvariantName);
-        }
-
-        //
-        //////
-
         base.RollbackLastCommand(modificationCommand);
     }
 
@@ -364,7 +348,7 @@ void AddParameterCore(string name, object value)
                 columnModification.IsNullable,
                 direction);
 
-            _parameterValues.Add(name, value);
+            ParameterValues.Add(name, value);
 
             _pendingParameters++;
         }