SqlServer: Block arithmetic on date/time expressions when type mappin…

…g is not known (#28052) Resolves #27028
dotnet · May 18, 2022 · 1f27c57 · 1f27c57
1 parent 0a125ab
commit 1f27c57
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 10 deletions.
diff --git a/src/EFCore.SqlServer/Query/Internal/SqlServerSqlTranslatingExpressionVisitor.cs b/src/EFCore.SqlServer/Query/Internal/SqlServerSqlTranslatingExpressionVisitor.cs
@@ -13,7 +13,7 @@ namespace Microsoft.EntityFrameworkCore.SqlServer.Query.Internal;
 /// </summary>
 public class SqlServerSqlTranslatingExpressionVisitor : RelationalSqlTranslatingExpressionVisitor
 {
- private static readonly HashSet<string?> DateTimeDataTypes
+ private static readonly HashSet<string> DateTimeDataTypes
  = new()
  {
  "time",
@@ -23,6 +23,16 @@ private static readonly HashSet<string?> DateTimeDataTypes
  "datetimeoffset"
  };
 
+ private static readonly HashSet<Type> DateTimeClrTypes
+ = new()
+ {
+ typeof(TimeOnly),
+ typeof(DateOnly),
+ typeof(TimeSpan),
+ typeof(DateTime),
+ typeof(DateTimeOffset)
+ };
+
  private static readonly HashSet<ExpressionType> ArithmeticOperatorTypes
  = new()
  {
@@ -82,14 +92,32 @@ protected override Expression VisitBinary(BinaryExpression binaryExpression)
  }
  }
 
- return !(base.VisitBinary(binaryExpression) is SqlExpression visitedExpression)
- ? QueryCompilationContext.NotTranslatedExpression
- : visitedExpression is SqlBinaryExpression sqlBinary
- && ArithmeticOperatorTypes.Contains(sqlBinary.OperatorType)
- && (DateTimeDataTypes.Contains(GetProviderType(sqlBinary.Left))
- || DateTimeDataTypes.Contains(GetProviderType(sqlBinary.Right)))
- ? QueryCompilationContext.NotTranslatedExpression
- : visitedExpression;
+ var visitedExpression = base.VisitBinary(binaryExpression);
+
+ if (visitedExpression is SqlBinaryExpression sqlBinaryExpression
+ && ArithmeticOperatorTypes.Contains(sqlBinaryExpression.OperatorType))
+ {
+ var inferredProviderType = GetProviderType(sqlBinaryExpression.Left) ?? GetProviderType(sqlBinaryExpression.Right);
+ if (inferredProviderType != null)
+ {
+ if (DateTimeDataTypes.Contains(inferredProviderType))
+ {
+ return QueryCompilationContext.NotTranslatedExpression;
+ }
+ }
+ else
+ {
+ var leftType = sqlBinaryExpression.Left.Type;
+ var rightType = sqlBinaryExpression.Right.Type;
+ if (DateTimeClrTypes.Contains(leftType)
+ || DateTimeClrTypes.Contains(rightType))
+ {
+ return QueryCompilationContext.NotTranslatedExpression;
+ }
+ }
+ }
+
+ return visitedExpression;
  }
 
  /// <summary>
@@ -117,7 +145,7 @@ protected override Expression VisitUnary(UnaryExpression unaryExpression)
  isBinaryMaxDataType ? typeof(long) : typeof(int));
 
  return isBinaryMaxDataType
- ? (Expression)Dependencies.SqlExpressionFactory.Convert(dataLengthSqlFunction, typeof(int))
+ ? Dependencies.SqlExpressionFactory.Convert(dataLengthSqlFunction, typeof(int))
  : dataLengthSqlFunction;
  }
 

diff --git a/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/GearsOfWarQueryTestBase.cs
@@ -5362,6 +5362,17 @@ public virtual Task DateTimeOffset_Contains_Less_than_Greater_than(bool async)
  m => start <= m.Timeline.Date && m.Timeline < end && dates.Contains(m.Timeline)));
  }
 
+ [ConditionalTheory]
+ [MemberData(nameof(IsAsyncData))]
+ public virtual Task DateTimeOffsetNow_minus_timespan(bool async)
+ {
+ var timeSpan = new TimeSpan(1000);
+
+ return AssertQuery(
+ async,
+ ss => ss.Set<Mission>().Where(e => e.Timeline > DateTimeOffset.Now - timeSpan));
+ }
+
  [ConditionalTheory]
  [MemberData(nameof(IsAsyncData))]
  public virtual Task Navigation_inside_interpolated_string_expanded(bool async)

diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/GearsOfWarQuerySqlServerTest.cs
@@ -5738,6 +5738,9 @@ FROM [Missions] AS [m]
 WHERE @__start_0 <= CAST(CONVERT(date, [m].[Timeline]) AS datetimeoffset) AND [m].[Timeline] < @__end_1 AND [m].[Timeline] = '1902-01-02T10:00:00.1234567+01:30'");
  }
 
+ public override Task DateTimeOffsetNow_minus_timespan(bool async)
+ => AssertTranslationFailed(() => base.DateTimeOffsetNow_minus_timespan(async));
+
  public override async Task Navigation_inside_interpolated_string_expanded(bool async)
  {
  await base.Navigation_inside_interpolated_string_expanded(async);

diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TPCGearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TPCGearsOfWarQuerySqlServerTest.cs
@@ -8165,6 +8165,9 @@ FROM [Missions] AS [m]
 WHERE @__start_0 <= CAST(CONVERT(date, [m].[Timeline]) AS datetimeoffset) AND [m].[Timeline] < @__end_1 AND [m].[Timeline] = '1902-01-02T10:00:00.1234567+01:30'");
  }
 
+ public override Task DateTimeOffsetNow_minus_timespan(bool async)
+ => AssertTranslationFailed(() => base.DateTimeOffsetNow_minus_timespan(async));
+
  public override async Task Navigation_inside_interpolated_string_expanded(bool async)
  {
  await base.Navigation_inside_interpolated_string_expanded(async);

diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TPTGearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TPTGearsOfWarQuerySqlServerTest.cs
@@ -6796,6 +6796,9 @@ FROM [Missions] AS [m]
 WHERE @__start_0 <= CAST(CONVERT(date, [m].[Timeline]) AS datetimeoffset) AND [m].[Timeline] < @__end_1 AND [m].[Timeline] = '1902-01-02T10:00:00.1234567+01:30'");
  }
 
+ public override Task DateTimeOffsetNow_minus_timespan(bool async)
+ => AssertTranslationFailed(() => base.DateTimeOffsetNow_minus_timespan(async));
+
  public override async Task Navigation_inside_interpolated_string_expanded(bool async)
  {
  await base.Navigation_inside_interpolated_string_expanded(async);

diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalGearsOfWarQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalGearsOfWarQuerySqlServerTest.cs
@@ -5434,6 +5434,9 @@ public override async Task DateTimeOffset_Contains_Less_than_Greater_than(bool a
 WHERE @__start_0 <= CAST(CONVERT(date, [m].[Timeline]) AS datetimeoffset) AND [m].[Timeline] < @__end_1 AND [m].[Timeline] = '1902-01-02T10:00:00.1234567+01:30'");
  }
 
+ public override Task DateTimeOffsetNow_minus_timespan(bool async)
+ => AssertTranslationFailed(() => base.DateTimeOffsetNow_minus_timespan(async));
+
  public override async Task Conditional_with_conditions_evaluating_to_false_gets_optimized(bool async)
  {
  await base.Conditional_with_conditions_evaluating_to_false_gets_optimized(async);

diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/GearsOfWarQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/GearsOfWarQuerySqliteTest.cs
@@ -102,6 +102,9 @@ public override async Task DateTimeOffset_Contains_Less_than_Greater_than(bool a
  AssertSql();
  }
 
+ public override Task DateTimeOffsetNow_minus_timespan(bool async)
+ => AssertTranslationFailed(() => base.DateTimeOffsetNow_minus_timespan(async));
+
  public override async Task DateTimeOffset_Date_returns_datetime(bool async)
  {
  await AssertTranslationFailed(() => base.DateTimeOffset_Date_returns_datetime(async));

diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/TPCGearsOfWarQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/TPCGearsOfWarQuerySqliteTest.cs
@@ -50,6 +50,9 @@ public override Task Where_datetimeoffset_year_component(bool async)
  public override Task DateTimeOffset_Contains_Less_than_Greater_than(bool async)
  => AssertTranslationFailed(() => base.DateTimeOffset_Contains_Less_than_Greater_than(async));
 
+ public override Task DateTimeOffsetNow_minus_timespan(bool async)
+ => AssertTranslationFailed(() => base.DateTimeOffsetNow_minus_timespan(async));
+
  public override Task DateTimeOffset_Date_returns_datetime(bool async)
  => AssertTranslationFailed(() => base.DateTimeOffset_Date_returns_datetime(async));
 

diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/TPTGearsOfWarQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/TPTGearsOfWarQuerySqliteTest.cs
@@ -50,6 +50,9 @@ public override Task Where_datetimeoffset_year_component(bool async)
  public override Task DateTimeOffset_Contains_Less_than_Greater_than(bool async)
  => AssertTranslationFailed(() => base.DateTimeOffset_Contains_Less_than_Greater_than(async));
 
+ public override Task DateTimeOffsetNow_minus_timespan(bool async)
+ => AssertTranslationFailed(() => base.DateTimeOffsetNow_minus_timespan(async));
+
  public override Task DateTimeOffset_Date_returns_datetime(bool async)
  => AssertTranslationFailed(() => base.DateTimeOffset_Date_returns_datetime(async));