Sitelet https://github.com/npgsql/npgsql/pull/6270/files
Skip to content

Fix inclusive infinity upper bound interval conversion #6270

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

Merged
NinoFloris merged 2 commits into from
Oct 29, 2025
Merged

Fix inclusive infinity upper bound interval conversion #6270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e802599
Fix inclusive infinity upper bound interval conversion
NinoFloris Oct 27, 2025
d4da04f
Flow infinity conversion flag
NinoFloris Oct 27, 2025
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
9 changes: 7 additions & 2 deletions src/Npgsql.NodaTime/Internal/IntervalConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Npgsql.NodaTime.Internal;

public class IntervalConverter(PgConverter<NpgsqlRange<Instant>> rangeConverter) : PgStreamingConverter<Interval>
sealed class IntervalConverter(PgConverter<NpgsqlRange<Instant>> rangeConverter, bool dateTimeInfinityConversions) : PgStreamingConverter<Interval>
{
public override Interval Read(PgReader reader)
=> Read(async: false, reader, CancellationToken.None).GetAwaiter().GetResult();
Expand All @@ -27,7 +27,12 @@ async ValueTask<Interval> Read(bool async, PgReader reader, CancellationToken ca
: range.LowerBoundIsInclusive
? range.LowerBound
: range.LowerBound + Duration.Epsilon;
Instant? end = range.UpperBoundInfinite
// For ranges with element types with infinity values (datetime, date etc.) an
// inclusive lower/upper bound causes their -/+ infinity (respectively) to fall within the range.
// If those values are returned for such a range postgres will not mark the affected bound as infinite accordingly.
// This is documented in https://www.postgresql.org/docs/current/rangetypes.html#RANGETYPES-INFINITE
// As NodaTime uses an exclusive upper bound we must consider this case as being another form of infinity (null).
Instant? end = range.UpperBoundInfinite || (dateTimeInfinityConversions && range.UpperBoundIsInclusive && range.UpperBound == Instant.MaxValue)
? null
: range.UpperBoundIsInclusive
? range.UpperBound + Duration.Epsilon
Expand Down
4 changes: 2 additions & 2 deletions src/Npgsql.NodaTime/Internal/NodaTimeTypeInfoResolverFactory.Multirange.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings)
mappings.AddType<Interval[]>(TimestampTzMultirangeDataTypeName,
static (options, mapping, _) =>
mapping.CreateInfo(options, CreateArrayMultirangeConverter(new IntervalConverter(
CreateRangeConverter(new InstantConverter(options.EnableDateTimeInfinityConversions), options)), options)),
CreateRangeConverter(new InstantConverter(options.EnableDateTimeInfinityConversions), options), options.EnableDateTimeInfinityConversions), options)),
isDefault: true);
mappings.AddType<List<Interval>>(TimestampTzMultirangeDataTypeName,
static (options, mapping, _) =>
mapping.CreateInfo(options, CreateListMultirangeConverter(new IntervalConverter(
CreateRangeConverter(new InstantConverter(options.EnableDateTimeInfinityConversions), options)), options)));
CreateRangeConverter(new InstantConverter(options.EnableDateTimeInfinityConversions), options), options.EnableDateTimeInfinityConversions), options)));
mappings.AddType<NpgsqlRange<Instant>[]>(TimestampTzMultirangeDataTypeName,
static (options, mapping, _) =>
mapping.CreateInfo(options,
Expand Down
2 changes: 1 addition & 1 deletion src/Npgsql.NodaTime/Internal/NodaTimeTypeInfoResolverFactory.Range.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static TypeInfoMappingCollection AddMappings(TypeInfoMappingCollection mappings)
static (options, mapping, _) =>
mapping.CreateInfo(options,
new IntervalConverter(
CreateRangeConverter(new InstantConverter(options.EnableDateTimeInfinityConversions), options))),
CreateRangeConverter(new InstantConverter(options.EnableDateTimeInfinityConversions), options), options.EnableDateTimeInfinityConversions)),
isDefault: true);
mappings.AddStructType<NpgsqlRange<Instant>>(TimestampTzRangeDataTypeName,
static (options, mapping, _) => mapping.CreateInfo(options,
Expand Down
20 changes: 20 additions & 0 deletions test/Npgsql.PluginTests/NodaTimeInfinityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,26 @@ public async Task Interval_convert_infinity()
}
}

[Test]
public async Task Inclusive_End_Range_Infinity_read()
{
await using var conn = await OpenConnectionAsync();
await using var cmd = new NpgsqlCommand(
"SELECT tstzrange('-infinity', 'infinity','[]') as val", conn);

await using var reader = await cmd.ExecuteReaderAsync();
await reader.ReadAsync();

if (Statics.DisableDateTimeInfinityConversions)
{
Assert.That(() => reader[0], Throws.Exception.TypeOf<InvalidCastException>());
}
else
{
Assert.That(reader[0], Is.EqualTo(new Interval(Instant.MinValue, null)));
}
}

protected override NpgsqlDataSource DataSource { get; }

public NodaTimeInfinityTests(bool disableDateTimeInfinityConversions)
Expand Down