SQLite Query: Fix more DateOnly/TimeOnly cases

Fixes dotnet#28051
bricelam · Aug 29, 2022 · 33a2be7 · 33a2be7
1 parent 1117c14
commit 33a2be7
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/src/EFCore.Sqlite.Core/Query/Internal/SqliteObjectToStringTranslator.cs b/src/EFCore.Sqlite.Core/Query/Internal/SqliteObjectToStringTranslator.cs
@@ -19,6 +19,7 @@ public class SqliteObjectToStringTranslator : IMethodCallTranslator
         typeof(byte),
         typeof(byte[]),
         typeof(char),
+        typeof(DateOnly),
         typeof(DateTime),
         typeof(DateTimeOffset),
         typeof(decimal),
@@ -29,6 +30,7 @@ public class SqliteObjectToStringTranslator : IMethodCallTranslator
         typeof(long),
         typeof(sbyte),
         typeof(short),
+        typeof(TimeOnly),
         typeof(TimeSpan),
         typeof(uint),
         typeof(ushort)

diff --git a/src/EFCore.Sqlite.Core/Query/Internal/SqliteSqlTranslatingExpressionVisitor.cs b/src/EFCore.Sqlite.Core/Query/Internal/SqliteSqlTranslatingExpressionVisitor.cs
@@ -19,11 +19,17 @@ private static readonly IReadOnlyDictionary<ExpressionType, IReadOnlyCollection<
         {
             [ExpressionType.Add] = new HashSet<Type>
             {
+                typeof(DateOnly),
                 typeof(DateTime),
                 typeof(DateTimeOffset),
+                typeof(TimeOnly),
                 typeof(TimeSpan)
             },
-            [ExpressionType.Divide] = new HashSet<Type> { typeof(TimeSpan), typeof(ulong) },
+            [ExpressionType.Divide] = new HashSet<Type>
+            {
+                typeof(TimeOnly),
+                typeof(TimeSpan),
+                typeof(ulong) },
             [ExpressionType.GreaterThan] = new HashSet<Type>
             {
                 typeof(DateTimeOffset),
@@ -49,11 +55,18 @@ private static readonly IReadOnlyDictionary<ExpressionType, IReadOnlyCollection<
                 typeof(ulong)
             },
             [ExpressionType.Modulo] = new HashSet<Type> { typeof(ulong) },
-            [ExpressionType.Multiply] = new HashSet<Type> { typeof(TimeSpan), typeof(ulong) },
+            [ExpressionType.Multiply] = new HashSet<Type>
+            {
+                typeof(TimeOnly),
+                typeof(TimeSpan),
+                typeof(ulong)
+            },
             [ExpressionType.Subtract] = new HashSet<Type>
             {
+                typeof(DateOnly),
                 typeof(DateTime),
                 typeof(DateTimeOffset),
+                typeof(TimeOnly),
                 typeof(TimeSpan)
             }
         };
@@ -120,7 +133,8 @@ protected override Expression VisitUnary(UnaryExpression unaryExpression)
                     visitedExpression.Type);
             }
 
-            if (operandType == typeof(TimeSpan))
+            if (operandType == typeof(TimeOnly)
+                || operandType == typeof(TimeSpan))
             {
                 return QueryCompilationContext.NotTranslatedExpression;
             }

diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/GearsOfWarQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/GearsOfWarQuerySqliteTest.cs
@@ -646,7 +646,7 @@ public override async Task Where_TimeOnly_IsBetween(bool async)
     public override async Task Where_TimeOnly_subtract_TimeOnly(bool async)
     {
         // TimeSpan. Issue #18844.
-        await Assert.ThrowsAsync<InvalidCastException>(() => base.Where_TimeOnly_subtract_TimeOnly(async));
+        await AssertTranslationFailed(() => base.Where_TimeOnly_subtract_TimeOnly(async));
 
         AssertSql();
     }

diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/TPCGearsOfWarQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/TPCGearsOfWarQuerySqliteTest.cs
@@ -368,7 +368,7 @@ public override Task Where_TimeOnly_IsBetween(bool async)
 
     public override Task Where_TimeOnly_subtract_TimeOnly(bool async)
         // TimeSpan. Issue #18844.
-        => Assert.ThrowsAsync<InvalidCastException>(() => base.Where_TimeOnly_subtract_TimeOnly(async));
+        => AssertTranslationFailed(() => base.Where_TimeOnly_subtract_TimeOnly(async));
 
     private void AssertSql(params string[] expected)
         => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);

diff --git a/test/EFCore.Sqlite.FunctionalTests/Query/TPTGearsOfWarQuerySqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/Query/TPTGearsOfWarQuerySqliteTest.cs
@@ -368,7 +368,7 @@ public override Task Where_TimeOnly_IsBetween(bool async)
 
     public override Task Where_TimeOnly_subtract_TimeOnly(bool async)
         // TimeSpan. Issue #18844.
-        => Assert.ThrowsAsync<InvalidCastException>(() => base.Where_TimeOnly_subtract_TimeOnly(async));
+        => AssertTranslationFailed(() => base.Where_TimeOnly_subtract_TimeOnly(async));
 
     private void AssertSql(params string[] expected)
         => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);