Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Fix to #18147 - Where bool column needs to convert to equalit… #20425

Merged
merged 1 commit into from
Mar 27, 2020
Merged

Revert "Fix to #18147 - Where bool column needs to convert to equalit… #20425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 9 additions & 22 deletions src/EFCore.Cosmos/Query/Internal/CosmosSqlTranslatingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,22 +101,13 @@ protected override Expression VisitMember(MemberExpression memberExpression)
{
Check.NotNull(memberExpression, nameof(memberExpression));

return CompensateForValueConverter(
TryBindMember(memberExpression.Expression, MemberIdentity.Create(memberExpression.Member), out var result)
? result
: TranslationFailed(memberExpression.Expression, Visit(memberExpression.Expression), out var sqlInnerExpression)
? null
: _memberTranslatorProvider.Translate(sqlInnerExpression, memberExpression.Member, memberExpression.Type));
return TryBindMember(memberExpression.Expression, MemberIdentity.Create(memberExpression.Member), out var result)
? result
: TranslationFailed(memberExpression.Expression, Visit(memberExpression.Expression), out var sqlInnerExpression)
? null
: _memberTranslatorProvider.Translate(sqlInnerExpression, memberExpression.Member, memberExpression.Type);
}

private Expression CompensateForValueConverter(Expression result)
=> result != null
&& result.Type == typeof(bool)
&& result is KeyAccessExpression keyAccessExpression
&& keyAccessExpression.TypeMapping.Converter != null
? _sqlExpressionFactory.Equal(keyAccessExpression, _sqlExpressionFactory.Constant(true, keyAccessExpression.TypeMapping))
: result;

private bool TryBindMember(Expression source, MemberIdentity member, out Expression expression)
{
source = source.UnwrapTypeConversion(out var convertedType);
Expand Down Expand Up @@ -172,19 +163,15 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp

if (methodCallExpression.TryGetEFPropertyArguments(out var source, out var propertyName))
{
return CompensateForValueConverter(
TryBindMember(source, MemberIdentity.Create(propertyName), out var result)
? result
: null);
return TryBindMember(source, MemberIdentity.Create(propertyName), out var result)
? result
: null;
}

// EF Indexer property
if (methodCallExpression.TryGetIndexerArguments(_model, out source, out propertyName))
{
return CompensateForValueConverter(
TryBindMember(source, MemberIdentity.Create(propertyName), out var result)
? result
: null);
return TryBindMember(source, MemberIdentity.Create(propertyName), out var result) ? result : null;
}

if (TranslationFailed(methodCallExpression.Object, Visit(methodCallExpression.Object), out var sqlObject))
Expand Down
10 changes: 4 additions & 6 deletions src/EFCore.Relational/Query/NullabilityBasedSqlProcessingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,12 +724,11 @@ private SqlExpression OptimizeComparison(
}

if (IsTrueOrFalse(right) is bool rightTrueFalseValue
&& !leftNullable
&& left.TypeMapping.Converter == null)
&& !leftNullable)
{
_nullable = leftNullable;

// only correct in 2-value logic and only if 'a' doesn't have value converter applied to it
// only correct in 2-value logic
// a == true -> a
// a == false -> !a
// a != true -> !a
Expand All @@ -740,12 +739,11 @@ private SqlExpression OptimizeComparison(
}

if (IsTrueOrFalse(left) is bool leftTrueFalseValue
&& !rightNullable
&& right.TypeMapping.Converter == null)
&& !rightNullable)
{
_nullable = rightNullable;

// only correct in 2-value logic and only if 'a' doesn't have value converter applied to it
// only correct in 2-value logic
// true == a -> a
// false == a -> !a
// true != a -> !a
Expand Down
28 changes: 8 additions & 20 deletions src/EFCore.Relational/Query/RelationalSqlTranslatingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,21 +250,12 @@ protected override Expression VisitMember(MemberExpression memberExpression)
{
Check.NotNull(memberExpression, nameof(memberExpression));

return CompensateForValueConverter(
TryBindMember(memberExpression.Expression, MemberIdentity.Create(memberExpression.Member), out var result)
? result
: TranslationFailed(memberExpression.Expression, base.Visit(memberExpression.Expression), out var sqlInnerExpression)
? null
: Dependencies.MemberTranslatorProvider.Translate(sqlInnerExpression, memberExpression.Member, memberExpression.Type));
}

private Expression CompensateForValueConverter(Expression result)
=> result != null
&& result.Type == typeof(bool)
&& result is ColumnExpression columnExpression
&& columnExpression.TypeMapping.Converter != null
? SqlExpressionFactory.Equal(columnExpression, SqlExpressionFactory.Constant(true, columnExpression.TypeMapping))
: result;
return TryBindMember(memberExpression.Expression, MemberIdentity.Create(memberExpression.Member), out var result)
? result
: TranslationFailed(memberExpression.Expression, base.Visit(memberExpression.Expression), out var sqlInnerExpression)
? null
: Dependencies.MemberTranslatorProvider.Translate(sqlInnerExpression, memberExpression.Member, memberExpression.Type);
}

private bool TryBindMember(Expression source, MemberIdentity member, out Expression expression)
{
Expand Down Expand Up @@ -381,7 +372,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
{
if (TryBindMember(source, MemberIdentity.Create(propertyName), out var result))
{
return CompensateForValueConverter(result);
return result;
}

throw new InvalidOperationException(CoreStrings.EFPropertyCalledWithWrongPropertyName);
Expand All @@ -390,10 +381,7 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
// EF Indexer property
if (methodCallExpression.TryGetIndexerArguments(_model, out source, out propertyName))
{
return CompensateForValueConverter(
TryBindMember(source, MemberIdentity.Create(propertyName), out var result)
? result
: null);
return TryBindMember(source, MemberIdentity.Create(propertyName), out var result) ? result : null;
}

// GroupBy Aggregate case
Expand Down
4 changes: 3 additions & 1 deletion test/EFCore.Cosmos.FunctionalTests/CustomConvertersCosmosTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public override void Value_conversion_is_appropriately_used_for_left_join_condit
base.Value_conversion_is_appropriately_used_for_left_join_condition();
}

[ConditionalFact]
[ConditionalFact(Skip = "Issue#18147")]
public override void Where_bool_gets_converted_to_equality_when_value_conversion_is_used()
{
base.Where_bool_gets_converted_to_equality_when_value_conversion_is_used();
Expand All @@ -149,6 +149,7 @@ FROM root c
WHERE (c[""Discriminator""] IN (""Blog"", ""RssBlog"") AND (c[""IsVisible""] = ""Y""))");
}

[ConditionalFact(Skip = "Issue#18147")]
public override void Where_bool_gets_converted_to_equality_when_value_conversion_is_used_using_EFProperty()
{
base.Where_bool_gets_converted_to_equality_when_value_conversion_is_used_using_EFProperty();
Expand All @@ -159,6 +160,7 @@ FROM root c
WHERE (c[""Discriminator""] IN (""Blog"", ""RssBlog"") AND (c[""IsVisible""] = ""Y""))");
}

[ConditionalFact(Skip = "Issue#18147")]
public override void Where_bool_gets_converted_to_equality_when_value_conversion_is_used_using_indexer()
{
base.Where_bool_gets_converted_to_equality_when_value_conversion_is_used_using_indexer();
Expand Down
8 changes: 5 additions & 3 deletions test/EFCore.Sqlite.FunctionalTests/CustomConvertersSqliteTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public override void Can_insert_and_read_back_with_case_insensitive_string_key()
{
}

[ConditionalFact]
[ConditionalFact(Skip = "Issue#18147")]
public override void Value_conversion_is_appropriately_used_for_join_condition()
{
base.Value_conversion_is_appropriately_used_for_join_condition();
Expand All @@ -34,7 +34,7 @@ public override void Value_conversion_is_appropriately_used_for_join_condition()
WHERE ""b"".""IsVisible"" = 'Y'");
}

[ConditionalFact]
[ConditionalFact(Skip = "Issue#18147")]
public override void Value_conversion_is_appropriately_used_for_left_join_condition()
{
base.Value_conversion_is_appropriately_used_for_left_join_condition();
Expand All @@ -48,7 +48,7 @@ public override void Value_conversion_is_appropriately_used_for_left_join_condit
WHERE ""b"".""IsVisible"" = 'Y'");
}

[ConditionalFact]
[ConditionalFact(Skip = "Issue#18147")]
public override void Where_bool_gets_converted_to_equality_when_value_conversion_is_used()
{
base.Where_bool_gets_converted_to_equality_when_value_conversion_is_used();
Expand All @@ -59,6 +59,7 @@ public override void Where_bool_gets_converted_to_equality_when_value_conversion
WHERE ""b"".""IsVisible"" = 'Y'");
}

[ConditionalFact(Skip = "Issue#18147")]
public override void Where_bool_gets_converted_to_equality_when_value_conversion_is_used_using_EFProperty()
{
base.Where_bool_gets_converted_to_equality_when_value_conversion_is_used_using_EFProperty();
Expand All @@ -69,6 +70,7 @@ public override void Where_bool_gets_converted_to_equality_when_value_conversion
WHERE ""b"".""IsVisible"" = 'Y'");
}

[ConditionalFact(Skip = "Issue#18147")]
public override void Where_bool_gets_converted_to_equality_when_value_conversion_is_used_using_indexer()
{
base.Where_bool_gets_converted_to_equality_when_value_conversion_is_used_using_indexer();
Expand Down