Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
</PropertyGroup>

<PropertyGroup>
<PomeloTargetFramework>net8.0</PomeloTargetFramework>
<PomeloTestTargetFramework>net9.0</PomeloTestTargetFramework>
<EfCoreTargetFramework>net8.0</EfCoreTargetFramework>
<EfCoreTestTargetFramework>net9.0</EfCoreTestTargetFramework>
<MySqlConnectorTargetFramework>net8.0</MySqlConnectorTargetFramework>
<MySqlConnectorDependencyInjectionTargetFramework>net8.0</MySqlConnectorDependencyInjectionTargetFramework>
<PomeloTargetFramework>net10.0</PomeloTargetFramework>
<PomeloTestTargetFramework>net10.0</PomeloTestTargetFramework>
<EfCoreTargetFramework>net10.0</EfCoreTargetFramework>
<EfCoreTestTargetFramework>net10.0</EfCoreTestTargetFramework>
<MySqlConnectorTargetFramework>net10.0</MySqlConnectorTargetFramework>
<MySqlConnectorDependencyInjectionTargetFramework>net10.0</MySqlConnectorDependencyInjectionTargetFramework>
</PropertyGroup>

<PropertyGroup>
Expand Down
58 changes: 27 additions & 31 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,60 +1,56 @@
<Project>
<PropertyGroup Label="Common Versions">
<!-- We shoud try: [9.0.0,9.1.0-0)
<!-- We shoud try: [10.0.0,10.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">
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.14.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreVersion)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(EFCoreVersion)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />

<PackageVersion Include="MySqlConnector" Version="2.4.0" />
<PackageVersion Include="MySqlConnector.DependencyInjection" Version="2.4.0" />

<PackageVersion Include="NetTopologySuite" Version="2.5.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />

<PackageVersion Include="Castle.Core" Version="5.1.1" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.0" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.0" />
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0" />
<!--<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />-->
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0" /> <!-- CHECK: used? -->
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
<!-- CHECK: used? -->
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
<PackageVersion Include="System.Collections.Immutable" Version="10.0.0" />
<PackageVersion Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.0" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.0" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
<PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />

<!-- Keep at the same level that the EF Core projects use. -->
<PackageVersion Include="xunit.assert" Version="2.9.2" />
<PackageVersion Include="xunit.core" Version="2.9.2" />
<PackageVersion Include="xunit.assert" Version="2.9.3" />
<PackageVersion Include="xunit.core" Version="2.9.3" />
<PackageVersion Include="xunit.runner.console" Version="2.9.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
<PackageVersion Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
<PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />

<!-- Needed when using EFCore.Design assembly from local EF Core repository. -->
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.10.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.10.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="4.10.0" />
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.14.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="4.14.0" />
<PackageVersion Include="System.Text.Json" Version="10.0.0" />
</ItemGroup>
</Project>
12 changes: 6 additions & 6 deletions Version.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@
We also used alpha/beta/silver release types in the past, but they mix poorly with the ones above when orderend according to SemVer2
rules.
-->
<VersionPrefix>9.0.1</VersionPrefix>
<VersionPrefix>10.0.1</VersionPrefix>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>

<!--
A string like `.efcore.9.0.0` or `.efcore.9.0.0.preview.1` can be added to the version suffix, to indicate that this release targets
A string like `.efcore.10.0.0` or `.efcore.10.0.0.preview.1` can be added to the version suffix, to indicate that this release targets
a specific EF Core release.
This can be useful to distinguish between a release that correlates with a EF Core release (e.g. Pomelo `9.0.0-preview.1` implicitly
targets EF Core `9.0.0-preview.1`) and one that doesn't (e.g. Pomelo `9.0.0-preview.2.efcore.9.0.0.preview.1` explicitly targets EF
Core `9.0.0-preview.1`).
This can be useful to distinguish between a release that correlates with a EF Core release (e.g. Pomelo `10.0.0-preview.1` implicitly
targets EF Core `10.0.0-preview.1`) and one that doesn't (e.g. Pomelo `10.0.0-preview.2.efcore.10.0.0.preview.1` explicitly targets EF
Core `10.0.0-preview.1`).
If no EF Core release is explicitly targeted, release version correlation should be assumed.
-->
<TargetedEfCoreVersionPrefix></TargetedEfCoreVersionPrefix> <!-- e.g. `` (empty) or `9.0.0` -->
<TargetedEfCoreVersionPrefix></TargetedEfCoreVersionPrefix> <!-- e.g. `` (empty) or `10.0.0` -->
<TargetedEfCoreVersionPreReleaseLabel></TargetedEfCoreVersionPreReleaseLabel> <!-- e.g. `` (empty) or `preview` -->
<TargetedEfCoreVersionPreReleaseIteration></TargetedEfCoreVersionPreReleaseIteration> <!-- e.g. `` (empty) or `1` -->

Expand Down
2 changes: 1 addition & 1 deletion dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "9.0.0",
"version": "10.0.0",
"commands": [
"dotnet-ef"
]
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.100",
"version": "10.0.100",
"allowPrerelease": false,
"rollForward": "latestFeature"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public static DbContextOptionsBuilder UseMySql(
ConfigureWarnings(optionsBuilder);

var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder)
.TranslateParameterizedCollectionsToConstants();
.UseParameterizedCollectionMode(ParameterTranslationMode.Constant);

mySqlOptionsAction?.Invoke(mySqlDbContextOptionsBuilder);

Expand Down Expand Up @@ -108,7 +108,7 @@ public static DbContextOptionsBuilder UseMySql(
ConfigureWarnings(optionsBuilder);

var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder)
.TranslateParameterizedCollectionsToConstants();
.UseParameterizedCollectionMode(ParameterTranslationMode.Constant);

mySqlOptionsAction?.Invoke(mySqlDbContextOptionsBuilder);

Expand Down Expand Up @@ -158,7 +158,7 @@ public static DbContextOptionsBuilder UseMySql(
ConfigureWarnings(optionsBuilder);

var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder)
.TranslateParameterizedCollectionsToConstants();
.UseParameterizedCollectionMode(ParameterTranslationMode.Constant);

mySqlOptionsAction?.Invoke(mySqlDbContextOptionsBuilder);

Expand Down Expand Up @@ -205,7 +205,7 @@ public static DbContextOptionsBuilder UseMySql(
ConfigureWarnings(optionsBuilder);

var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder)
.TranslateParameterizedCollectionsToConstants();
.UseParameterizedCollectionMode(ParameterTranslationMode.Constant);

mySqlOptionsAction?.Invoke(mySqlDbContextOptionsBuilder);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -718,7 +718,7 @@ private static string ConstructLikePatternParameter(
QueryContext queryContext,
string baseParameterName,
StartsEndsWithContains methodType)
=> queryContext.ParameterValues[baseParameterName] switch
=> queryContext.Parameters[baseParameterName] switch
{
null => null,

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
19 changes: 3 additions & 16 deletions src/EFCore.MySql/Query/Internal/MySqlParameterBasedSqlProcessor.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -25,6 +26,7 @@ public MySqlParameterBasedSqlProcessor(
_options = options;
}

[Obsolete]
public override Expression Optimize(
Expression queryExpression,
IReadOnlyDictionary<string, object?> parametersValues,
Expand Down Expand Up @@ -58,20 +60,5 @@ public override Expression Optimize(

return queryExpression;
}

/// <inheritdoc />
protected override Expression ProcessSqlNullability(
Expression queryExpression,
IReadOnlyDictionary<string, object?> parametersValues,
out bool canCache)
{
Check.NotNull(queryExpression, nameof(queryExpression));
Check.NotNull(parametersValues, nameof(parametersValues));

queryExpression = new MySqlSqlNullabilityProcessor(Dependencies, Parameters)
.Process(queryExpression, parametersValues, out canCache);

return queryExpression;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ public MySqlQueryCompilationContextFactory(
public virtual QueryCompilationContext Create(bool async)
=> new MySqlQueryCompilationContext(_dependencies, _relationalDependencies, async);

public virtual QueryCompilationContext CreatePrecompiled(bool async, IReadOnlySet<string> nonNullableReferenceTypeParameters)
public virtual QueryCompilationContext CreatePrecompiled(bool async)
=> new MySqlQueryCompilationContext(
_dependencies, _relationalDependencies, async, precompiling: true, nonNullableReferenceTypeParameters);
_dependencies, _relationalDependencies, async, true);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ bool IsJsonEachKeyColumn(SelectExpression selectExpression, ColumnExpression ord
&& IsJsonEachKeyColumn(subquery, projectedColumn)));
}

[Obsolete]
protected override bool IsValidSelectExpressionForExecuteDelete(
SelectExpression selectExpression,
StructuralTypeShaperExpression shaper,
Expand Down
10 changes: 5 additions & 5 deletions src/Shared/Check.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -38,7 +38,7 @@ public static IReadOnlyList<T> NotEmpty<T>(IReadOnlyList<T> value, [InvokerParam
{
NotEmpty(parameterName, nameof(parameterName));

throw new ArgumentException(AbstractionsStrings.CollectionArgumentIsEmpty(parameterName));
throw new ArgumentException(AbstractionsStrings.CollectionArgumentIsEmpty);
}

return value;
Expand All @@ -54,7 +54,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(AbstractionsStrings.ArgumentIsEmpty);
}

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

throw new ArgumentException(AbstractionsStrings.ArgumentIsEmpty(parameterName));
throw new ArgumentException(AbstractionsStrings.ArgumentIsEmpty);
}

return value;
Expand Down Expand Up @@ -105,7 +105,7 @@ public static IReadOnlyList<string> HasNoEmptyElements(
{
NotEmpty(parameterName, nameof(parameterName));

throw new ArgumentException(AbstractionsStrings.CollectionArgumentHasEmptyElements(parameterName));
throw new ArgumentException(AbstractionsStrings.CollectionArgumentHasEmptyElements);
}

return value;
Expand Down
Loading