Skip to content

Commit 909a2f3

Browse files
renemadsenrenemadsen
authored
Merge pull request #87 from microting/copilot/fix-86
Fix EF Core 10 compatibility errors by updating API calls, removing obsolete methods, and implementing abstract members
2 parents cbeef22 + 6ad239e commit 909a2f3

13 files changed

+45
-138
lines changed

‎src/EFCore.MySql/Extensions/MySqlDbContextOptionsBuilderExtensions.cs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ public static DbContextOptionsBuilder UseMySql(
6161
((IDbContextOptionsBuilderInfrastructure)optionsBuilder).AddOrUpdateExtension(extension);
6262
ConfigureWarnings(optionsBuilder);
6363

64-
var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder)
65-
.TranslateParameterizedCollectionsToConstants();
64+
var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder);
6665

6766
mySqlOptionsAction?.Invoke(mySqlDbContextOptionsBuilder);
6867

@@ -107,8 +106,7 @@ public static DbContextOptionsBuilder UseMySql(
107106
((IDbContextOptionsBuilderInfrastructure)optionsBuilder).AddOrUpdateExtension(extension);
108107
ConfigureWarnings(optionsBuilder);
109108

110-
var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder)
111-
.TranslateParameterizedCollectionsToConstants();
109+
var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder);
112110

113111
mySqlOptionsAction?.Invoke(mySqlDbContextOptionsBuilder);
114112

@@ -157,8 +155,7 @@ public static DbContextOptionsBuilder UseMySql(
157155
((IDbContextOptionsBuilderInfrastructure)optionsBuilder).AddOrUpdateExtension(extension);
158156
ConfigureWarnings(optionsBuilder);
159157

160-
var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder)
161-
.TranslateParameterizedCollectionsToConstants();
158+
var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder);
162159

163160
mySqlOptionsAction?.Invoke(mySqlDbContextOptionsBuilder);
164161

@@ -204,8 +201,7 @@ public static DbContextOptionsBuilder UseMySql(
204201
((IDbContextOptionsBuilderInfrastructure)optionsBuilder).AddOrUpdateExtension(extension);
205202
ConfigureWarnings(optionsBuilder);
206203

207-
var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder)
208-
.TranslateParameterizedCollectionsToConstants();
204+
var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder);
209205

210206
mySqlOptionsAction?.Invoke(mySqlDbContextOptionsBuilder);
211207

‎src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringComparisonMethodTranslator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ protected virtual SqlExpression GetLikeExpressionUsingParameter(
525525
StartsEndsWithContains methodType)
526526
{
527527
if (pattern is SqlParameterExpression patternParameter &&
528-
patternParameter.Name.StartsWith(QueryCompilationContext.QueryParameterPrefix, StringComparison.Ordinal))
528+
patternParameter.Name.StartsWith("@", StringComparison.Ordinal))
529529
{
530530
// The pattern is a parameter, register a runtime parameter that will contain the rewritten LIKE pattern, where
531531
// all special characters have been escaped.
@@ -718,7 +718,7 @@ private static string ConstructLikePatternParameter(
718718
QueryContext queryContext,
719719
string baseParameterName,
720720
StartsEndsWithContains methodType)
721-
=> queryContext.ParameterValues[baseParameterName] switch
721+
=> queryContext.Parameters[baseParameterName] switch
722722
{
723723
null => null,
724724

‎src/EFCore.MySql/Query/ExpressionVisitors/Internal/MySqlBoolOptimizingExpressionVisitor.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,20 @@ protected override Expression VisitLeftJoin(LeftJoinExpression leftJoinExpressio
541541
return leftJoinExpression.Update(table, joinPredicate);
542542
}
543543

544+
protected override Expression VisitRightJoin(RightJoinExpression rightJoinExpression)
545+
{
546+
Check.NotNull(rightJoinExpression, nameof(rightJoinExpression));
547+
548+
var parentOptimize = _optimize;
549+
_optimize = false;
550+
var table = (TableExpressionBase)Visit(rightJoinExpression.Table);
551+
_optimize = true;
552+
var joinPredicate = (SqlExpression)Visit(rightJoinExpression.JoinPredicate);
553+
_optimize = parentOptimize;
554+
555+
return rightJoinExpression.Update(table, joinPredicate);
556+
}
557+
544558
protected override Expression VisitRowValue(RowValueExpression rowValueExpression)
545559
{
546560
var parentOptimize = _optimize;

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

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#nullable enable
55

6+
using System;
67
using System.Collections.Generic;
78
using System.Linq.Expressions;
89
using Microsoft.EntityFrameworkCore.Query;
@@ -25,6 +26,7 @@ public MySqlParameterBasedSqlProcessor(
2526
_options = options;
2627
}
2728

29+
[Obsolete]
2830
public override Expression Optimize(
2931
Expression queryExpression,
3032
IReadOnlyDictionary<string, object?> parametersValues,
@@ -58,20 +60,5 @@ public override Expression Optimize(
5860

5961
return queryExpression;
6062
}
61-
62-
/// <inheritdoc />
63-
protected override Expression ProcessSqlNullability(
64-
Expression queryExpression,
65-
IReadOnlyDictionary<string, object?> parametersValues,
66-
out bool canCache)
67-
{
68-
Check.NotNull(queryExpression, nameof(queryExpression));
69-
Check.NotNull(parametersValues, nameof(parametersValues));
70-
71-
queryExpression = new MySqlSqlNullabilityProcessor(Dependencies, Parameters)
72-
.Process(queryExpression, parametersValues, out canCache);
73-
74-
return queryExpression;
75-
}
7663
}
7764
}

‎src/EFCore.MySql/Query/Internal/MySqlQueryCompilationContext.cs‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,7 @@ public MySqlQueryCompilationContext(
1717
{
1818
}
1919

20-
public MySqlQueryCompilationContext(
21-
[NotNull] QueryCompilationContextDependencies dependencies,
22-
[NotNull] RelationalQueryCompilationContextDependencies relationalDependencies,
23-
bool async,
24-
bool precompiling,
25-
IReadOnlySet<string> nonNullableReferenceTypeParameters)
26-
: base(dependencies, relationalDependencies, async, precompiling, nonNullableReferenceTypeParameters)
27-
{
28-
}
20+
2921

3022
public override bool IsBuffering
3123
=> base.IsBuffering ||

‎src/EFCore.MySql/Query/Internal/MySqlQueryCompilationContextFactory.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ public virtual QueryCompilationContext Create(bool async)
2828
=> new MySqlQueryCompilationContext(_dependencies, _relationalDependencies, async);
2929

3030
public virtual QueryCompilationContext CreatePrecompiled(bool async, IReadOnlySet<string> nonNullableReferenceTypeParameters)
31-
=> new MySqlQueryCompilationContext(
32-
_dependencies, _relationalDependencies, async, precompiling: true, nonNullableReferenceTypeParameters);
31+
=> new MySqlQueryCompilationContext(_dependencies, _relationalDependencies, async);
3332
}
3433
}

‎src/EFCore.MySql/Query/Internal/MySqlQueryableMethodTranslatingExpressionVisitor.cs‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -80,40 +80,6 @@ bool IsJsonEachKeyColumn(SelectExpression selectExpression, ColumnExpression ord
8080
&& IsJsonEachKeyColumn(subquery, projectedColumn)));
8181
}
8282

83-
protected override bool IsValidSelectExpressionForExecuteDelete(
84-
SelectExpression selectExpression,
85-
StructuralTypeShaperExpression shaper,
86-
[NotNullWhen(true)] out TableExpression tableExpression)
87-
{
88-
if (selectExpression.Offset == null
89-
&& selectExpression.GroupBy.Count == 0
90-
&& selectExpression.Having == null
91-
&& (selectExpression.Tables.Count == 1 || selectExpression.Orderings.Count == 0))
92-
{
93-
TableExpressionBase table;
94-
if (selectExpression.Tables.Count == 1)
95-
{
96-
table = selectExpression.Tables[0];
97-
}
98-
else
99-
{
100-
var projectionBindingExpression = (ProjectionBindingExpression)shaper.ValueBufferExpression;
101-
var entityProjectionExpression = (StructuralTypeProjectionExpression)selectExpression.GetProjection(projectionBindingExpression);
102-
var column = entityProjectionExpression.BindProperty(shaper.StructuralType.GetProperties().First());
103-
table = selectExpression.GetTable(column).UnwrapJoin();
104-
}
105-
106-
if (table is TableExpression te)
107-
{
108-
tableExpression = te;
109-
return true;
110-
}
111-
}
112-
113-
tableExpression = null;
114-
return false;
115-
}
116-
11783
protected override bool IsValidSelectExpressionForExecuteUpdate(
11884
SelectExpression selectExpression,
11985
TableExpressionBase targetTable,

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ namespace Pomelo.EntityFrameworkCore.MySql.Update.Internal;
2626
public class MySqlModificationCommandBatch : AffectedCountModificationCommandBatch
2727
{
2828
private readonly List<IReadOnlyModificationCommand> _pendingBulkInsertCommands = new();
29+
private readonly Dictionary<string, object> _parameterValues = new();
2930

3031
public MySqlModificationCommandBatch(
3132
ModificationCommandBatchFactoryDependencies dependencies,
@@ -53,7 +54,7 @@ protected override void RollbackLastCommand(IReadOnlyModificationCommand modific
5354
var parameter = RelationalCommandBuilder.Parameters[parameterIndex];
5455

5556
RelationalCommandBuilder.RemoveParameterAt(parameterIndex);
56-
ParameterValues.Remove(parameter.InvariantName);
57+
_parameterValues.Remove(parameter.InvariantName);
5758
}
5859

5960
//
@@ -363,7 +364,7 @@ void AddParameterCore(string name, object value)
363364
columnModification.IsNullable,
364365
direction);
365366

366-
ParameterValues.Add(name, value);
367+
_parameterValues.Add(name, value);
367368

368369
_pendingParameters++;
369370
}

‎src/Shared/Check.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static IReadOnlyList<T> NotEmpty<T>(IReadOnlyList<T> value, [InvokerParam
3838
{
3939
NotEmpty(parameterName, nameof(parameterName));
4040

41-
throw new ArgumentException(AbstractionsStrings.CollectionArgumentIsEmpty(parameterName));
41+
throw new ArgumentException(AbstractionsStrings.CollectionArgumentIsEmpty, parameterName);
4242
}
4343

4444
return value;
@@ -54,7 +54,7 @@ public static string NotEmpty(string value, [InvokerParameterName] [NotNull] str
5454
}
5555
else if (value.Trim().Length == 0)
5656
{
57-
e = new ArgumentException(AbstractionsStrings.ArgumentIsEmpty(parameterName));
57+
e = new ArgumentException(AbstractionsStrings.ArgumentIsEmpty, parameterName);
5858
}
5959

6060
if (e != null)
@@ -74,7 +74,7 @@ public static string NullButNotEmpty(string value, [InvokerParameterName] [NotNu
7474
{
7575
NotEmpty(parameterName, nameof(parameterName));
7676

77-
throw new ArgumentException(AbstractionsStrings.ArgumentIsEmpty(parameterName));
77+
throw new ArgumentException(AbstractionsStrings.ArgumentIsEmpty, parameterName);
7878
}
7979

8080
return value;
@@ -105,7 +105,7 @@ public static IReadOnlyList<string> HasNoEmptyElements(
105105
{
106106
NotEmpty(parameterName, nameof(parameterName));
107107

108-
throw new ArgumentException(AbstractionsStrings.CollectionArgumentHasEmptyElements(parameterName));
108+
throw new ArgumentException(AbstractionsStrings.CollectionArgumentHasEmptyElements, parameterName);
109109
}
110110

111111
return value;

‎test/EFCore.MySql.FunctionalTests/Query/AdHocJsonQueryMySqlTest.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,12 @@ protected override Task SeedArrayOfPrimitives(DbContext ctx)
143143
return ctx.SaveChangesAsync();
144144
}
145145

146+
protected override Task SeedBadJsonProperties(ContextBadJsonProperties ctx)
147+
{
148+
// Stub implementation for disabled JSON functionality in MySQL provider
149+
return Task.CompletedTask;
150+
}
151+
146152
protected override Task SeedJunkInJson(DbContext ctx)
147153
=> ctx.Database.ExecuteSqlAsync(
148154
$$$$"""

0 commit comments

Comments
 (0)