Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ public static DbContextOptionsBuilder UseMySql(
((IDbContextOptionsBuilderInfrastructure)optionsBuilder).AddOrUpdateExtension(extension);
ConfigureWarnings(optionsBuilder);

var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder)
.TranslateParameterizedCollectionsToConstants();
var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder);

mySqlOptionsAction?.Invoke(mySqlDbContextOptionsBuilder);

Expand Down Expand Up @@ -107,8 +106,7 @@ public static DbContextOptionsBuilder UseMySql(
((IDbContextOptionsBuilderInfrastructure)optionsBuilder).AddOrUpdateExtension(extension);
ConfigureWarnings(optionsBuilder);

var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder)
.TranslateParameterizedCollectionsToConstants();
var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder);

mySqlOptionsAction?.Invoke(mySqlDbContextOptionsBuilder);

Expand Down Expand Up @@ -157,8 +155,7 @@ public static DbContextOptionsBuilder UseMySql(
((IDbContextOptionsBuilderInfrastructure)optionsBuilder).AddOrUpdateExtension(extension);
ConfigureWarnings(optionsBuilder);

var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder)
.TranslateParameterizedCollectionsToConstants();
var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder);

mySqlOptionsAction?.Invoke(mySqlDbContextOptionsBuilder);

Expand Down Expand Up @@ -204,8 +201,7 @@ public static DbContextOptionsBuilder UseMySql(
((IDbContextOptionsBuilderInfrastructure)optionsBuilder).AddOrUpdateExtension(extension);
ConfigureWarnings(optionsBuilder);

var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder)
.TranslateParameterizedCollectionsToConstants();
var mySqlDbContextOptionsBuilder = new MySqlDbContextOptionsBuilder(optionsBuilder);

mySqlOptionsAction?.Invoke(mySqlDbContextOptionsBuilder);

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
17 changes: 2 additions & 15 deletions src/EFCore.MySql/Query/Internal/MySqlParameterBasedSqlProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#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 @@ -80,40 +80,6 @@ bool IsJsonEachKeyColumn(SelectExpression selectExpression, ColumnExpression ord
&& IsJsonEachKeyColumn(subquery, projectedColumn)));
}

protected override bool IsValidSelectExpressionForExecuteDelete(
SelectExpression selectExpression,
StructuralTypeShaperExpression shaper,
[NotNullWhen(true)] out TableExpression tableExpression)
{
if (selectExpression.Offset == null
&& selectExpression.GroupBy.Count == 0
&& selectExpression.Having == null
&& (selectExpression.Tables.Count == 1 || selectExpression.Orderings.Count == 0))
{
TableExpressionBase table;
if (selectExpression.Tables.Count == 1)
{
table = selectExpression.Tables[0];
}
else
{
var projectionBindingExpression = (ProjectionBindingExpression)shaper.ValueBufferExpression;
var entityProjectionExpression = (StructuralTypeProjectionExpression)selectExpression.GetProjection(projectionBindingExpression);
var column = entityProjectionExpression.BindProperty(shaper.StructuralType.GetProperties().First());
table = selectExpression.GetTable(column).UnwrapJoin();
}

if (table is TableExpression te)
{
tableExpression = te;
return true;
}
}

tableExpression = null;
return false;
}

protected override bool IsValidSelectExpressionForExecuteUpdate(
SelectExpression selectExpression,
TableExpressionBase targetTable,
Expand Down
8 changes: 4 additions & 4 deletions src/Shared/Check.cs
Original file line number Diff line number Diff line change
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, parameterName);
}

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, parameterName);
}

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, parameterName);
}

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, parameterName);
}

return value;
Expand Down
Loading