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

SQLite Query: Fix more DateOnly/TimeOnly cases #28918

Merged
merged 1 commit into from
Aug 30, 2022
Merged

SQLite Query: Fix more DateOnly/TimeOnly cases #28918

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
2 changes: 2 additions & 0 deletions src/EFCore.Sqlite.Core/Query/Internal/SqliteObjectToStringTranslator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public class SqliteObjectToStringTranslator : IMethodCallTranslator
typeof(byte),
typeof(byte[]),
typeof(char),
typeof(DateOnly),
typeof(DateTime),
typeof(DateTimeOffset),
typeof(decimal),
Expand All @@ -29,6 +30,7 @@ public class SqliteObjectToStringTranslator : IMethodCallTranslator
typeof(long),
typeof(sbyte),
typeof(short),
typeof(TimeOnly),
typeof(TimeSpan),
typeof(uint),
typeof(ushort)
Expand Down
21 changes: 18 additions & 3 deletions src/EFCore.Sqlite.Core/Query/Internal/SqliteSqlTranslatingExpressionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,18 @@ 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),
Expand All @@ -49,11 +56,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)
}
};
Expand Down Expand Up @@ -120,7 +134,8 @@ protected override Expression VisitUnary(UnaryExpression unaryExpression)
visitedExpression.Type);
}

if (operandType == typeof(TimeSpan))
if (operandType == typeof(TimeOnly)
|| operandType == typeof(TimeSpan))
{
return QueryCompilationContext.NotTranslatedExpression;
}
Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.Sqlite.FunctionalTests/Query/GearsOfWarQuerySqliteTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.Sqlite.FunctionalTests/Query/TPCGearsOfWarQuerySqliteTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion test/EFCore.Sqlite.FunctionalTests/Query/TPTGearsOfWarQuerySqliteTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down