Skip to content

Return NULL from DateInterval.Intersection for disjoint intervals #4121

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

Open
Ahmed7991 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Return NULL from DateInterval.Intersection for disjoint intervals #4121

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
10 changes: 9 additions & 1 deletion src/EFCore.PG.NodaTime/Query/Internal/NpgsqlNodaTimeMethodCallTranslatorPlugin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,15 @@ PgFunctionExpression IntervalPartOverBigInt(string datePart, SqlExpression param

if (method.DeclaringType == typeof(DateInterval) && method.Name == nameof(DateInterval.Intersection))
{
return _sqlExpressionFactory.MakePostgresBinary(PgExpressionType.RangeIntersect, instance!, arguments[0]);
// NodaTime returns null when the two intervals share no day, but PostgreSQL's * operator returns an empty range,
// which isn't NULL. Return NULL unless the ranges overlap.
return _sqlExpressionFactory.Case(
[
new CaseWhenClause(
_sqlExpressionFactory.Overlaps(instance!, arguments[0]),
_sqlExpressionFactory.MakePostgresBinary(PgExpressionType.RangeIntersect, instance!, arguments[0]))
],
elseResult: null);
}

if (method.DeclaringType == typeof(DateInterval) && method.Name == nameof(DateInterval.Union))
Expand Down
49 changes: 48 additions & 1 deletion test/EFCore.PG.FunctionalTests/Query/Translations/NodaTime/DateIntervalTranslationsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,54 @@ await AssertQuery(

SELECT n."Id", n."DateInterval", n."Duration", n."Instant", n."InstantRange", n."Interval", n."LocalDate", n."LocalDate2", n."LocalDateRange", n."LocalDateTime", n."LocalTime", n."Long", n."OffsetTime", n."Period", n."TimeZoneId", n."ZonedDateTime"
FROM "NodaTimeTypes" AS n
WHERE n."DateInterval" * @dateInterval = '[2018-04-22,2018-04-24]'::daterange
WHERE CASE
WHEN n."DateInterval" && @dateInterval THEN n."DateInterval" * @dateInterval
END = '[2018-04-22,2018-04-24]'::daterange
""");
}

[ConditionalTheory] // #4083
[MemberData(nameof(IsAsyncData))]
public async Task Intersection_with_disjoint_interval_is_null(bool async)
{
var dateInterval = new DateInterval(new LocalDate(2018, 5, 1), new LocalDate(2018, 5, 5));

await AssertQuery(
async,
ss => ss.Set<NodaTimeTypes>().Where(t => t.DateInterval.Intersection(dateInterval) == null));

AssertSql(
"""
@dateInterval='[2018-05-01, 2018-05-05]' (DbType = Object)

SELECT n."Id", n."DateInterval", n."Duration", n."Instant", n."InstantRange", n."Interval", n."LocalDate", n."LocalDate2", n."LocalDateRange", n."LocalDateTime", n."LocalTime", n."Long", n."OffsetTime", n."Period", n."TimeZoneId", n."ZonedDateTime"
FROM "NodaTimeTypes" AS n
WHERE CASE
WHEN n."DateInterval" && @dateInterval THEN n."DateInterval" * @dateInterval
END IS NULL
""");
}

[ConditionalTheory] // #4083
[MemberData(nameof(IsAsyncData))]
public async Task Intersection_with_disjoint_interval_not_null(bool async)
{
var dateInterval = new DateInterval(new LocalDate(2018, 5, 1), new LocalDate(2018, 5, 5));

await AssertQuery(
async,
ss => ss.Set<NodaTimeTypes>().Where(t => t.DateInterval.Intersection(dateInterval) != null),
assertEmpty: true);

AssertSql(
"""
@dateInterval='[2018-05-01, 2018-05-05]' (DbType = Object)

SELECT n."Id", n."DateInterval", n."Duration", n."Instant", n."InstantRange", n."Interval", n."LocalDate", n."LocalDate2", n."LocalDateRange", n."LocalDateTime", n."LocalTime", n."Long", n."OffsetTime", n."Period", n."TimeZoneId", n."ZonedDateTime"
FROM "NodaTimeTypes" AS n
WHERE CASE
WHEN n."DateInterval" && @dateInterval THEN n."DateInterval" * @dateInterval
END IS NOT NULL
""");
}

Expand Down