Skip to content

Fix per instance nullability converter resolver info code #6435

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
NinoFloris wants to merge 2 commits into
base: main
Choose a base branch
from
+121 −4
Open

Fix per instance nullability converter resolver info code #6435

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
45f49a2
Fix per instance nullability converter resolver info code
NinoFloris Feb 2, 2026
19553bc
Add timezone config
NinoFloris Feb 3, 2026
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: 1 addition & 1 deletion src/Npgsql/Internal/TypeInfoMapping.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ PgTypeInfo CreateComposedPerInstance(PgTypeInfo innerTypeInfo, PgTypeInfo nullab
(PgResolverTypeInfo)nullableInnerTypeInfo);

return new PgResolverTypeInfo(innerTypeInfo.Options, resolver,
innerTypeInfo.Options.GetCanonicalTypeId(new DataTypeName(dataTypeName))) { SupportsWriting = false };
innerTypeInfo.Options.GetCanonicalTypeId(new DataTypeName(dataTypeName)), unboxedType: typeof(Array)) { SupportsWriting = false };
}
}

Expand Down
103 changes: 103 additions & 0 deletions test/Npgsql.Tests/Types/ArrayTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,109 @@ public async Task Value_type_array_nullabilities(ArrayNullabilityMode mode)
}
}

[Test, Description("Checks that PG arrays containing nulls are returned as set via ValueTypeArrayMode.")]
[TestCase(ArrayNullabilityMode.Always)]
[TestCase(ArrayNullabilityMode.Never)]
[TestCase(ArrayNullabilityMode.PerInstance)]
public async Task Value_type_array_nullabilities_converter_resolver(ArrayNullabilityMode mode)
{
await using var dataSource = CreateDataSource(csb =>
{
csb.ArrayNullabilityMode = mode;
csb.Timezone = "Europe/Berlin";
});
await using var conn = await dataSource.OpenConnectionAsync();
await using var cmd = new NpgsqlCommand(
"""
SELECT onedim, twodim FROM (VALUES
('{"1998-04-12 15:26:38+02"}'::timestamptz[],'{{"1998-04-12 15:26:38+02"},{"1998-04-13 15:26:38+02"}}'::timestamptz[][]),
('{"1998-04-14 15:26:38+02", NULL}'::timestamptz[],'{{"1998-04-14 15:26:38+02", NULL},{"1998-04-15 15:26:38+02", "1998-04-16 15:26:38+02"}}'::timestamptz[][])) AS x(onedim,twodim)
""", conn);
await using var reader = await cmd.ExecuteReaderAsync();

switch (mode)
{
case ArrayNullabilityMode.Never:
reader.Read();
var value = reader.GetValue(0);
Assert.That(reader.GetFieldType(0), Is.EqualTo(typeof(Array)));
Assert.That(value.GetType(), Is.EqualTo(typeof(DateTime[])));
Assert.That(value, Is.EqualTo(new []{new DateTime(1998, 4, 12, 13, 26, 38, DateTimeKind.Utc)}));
value = reader.GetValue(1);
Assert.That(reader.GetFieldType(1), Is.EqualTo(typeof(Array)));
Assert.That(value.GetType(), Is.EqualTo(typeof(DateTime[,])));
Assert.That(value, Is.EqualTo(new DateTime?[,]
{
{new DateTime(1998, 4, 12, 13, 26, 38, DateTimeKind.Utc)},
{new DateTime(1998, 4, 13, 13, 26, 38, DateTimeKind.Utc)}
}));
reader.Read();
Assert.That(reader.GetFieldType(0), Is.EqualTo(typeof(Array)));
Assert.That(() => reader.GetValue(0), Throws.Exception.TypeOf<InvalidCastException>());
Assert.That(reader.GetFieldType(1), Is.EqualTo(typeof(Array)));
Assert.That(() => reader.GetValue(1), Throws.Exception.TypeOf<InvalidCastException>());
break;
case ArrayNullabilityMode.Always:
reader.Read();
value = reader.GetValue(0);
Assert.That(reader.GetFieldType(0), Is.EqualTo(typeof(Array)));
Assert.That(value.GetType(), Is.EqualTo(typeof(DateTime?[])));
Assert.That(value, Is.EqualTo(new DateTime?[]{new DateTime(1998, 4, 12, 13, 26, 38, DateTimeKind.Utc)}));
value = reader.GetValue(1);
Assert.That(reader.GetFieldType(1), Is.EqualTo(typeof(Array)));
Assert.That(value.GetType(), Is.EqualTo(typeof(DateTime?[,])));
Assert.That(value, Is.EqualTo(new DateTime?[,]
{
{new DateTime(1998, 4, 12, 13, 26, 38, DateTimeKind.Utc)},
{new DateTime(1998, 4, 13, 13, 26, 38, DateTimeKind.Utc)}
}));
reader.Read();
value = reader.GetValue(0);
Assert.That(reader.GetFieldType(0), Is.EqualTo(typeof(Array)));
Assert.That(value.GetType(), Is.EqualTo(typeof(DateTime?[])));
Assert.That(value, Is.EqualTo(new DateTime?[]{ new DateTime(1998, 4, 14, 13, 26, 38, DateTimeKind.Utc), null }));
value = reader.GetValue(1);
Assert.That(reader.GetFieldType(1), Is.EqualTo(typeof(Array)));
Assert.That(value.GetType(), Is.EqualTo(typeof(DateTime?[,])));
Assert.That(value, Is.EqualTo(new DateTime?[,]
{
{ new DateTime(1998, 4, 14, 13, 26, 38, DateTimeKind.Utc), null },
{ new DateTime(1998, 4, 15, 13, 26, 38, DateTimeKind.Utc), new DateTime(1998, 4, 16, 13, 26, 38, DateTimeKind.Utc) }
}));
break;
case ArrayNullabilityMode.PerInstance:
reader.Read();
value = reader.GetValue(0);
Assert.That(reader.GetFieldType(0), Is.EqualTo(typeof(Array)));
Assert.That(value.GetType(), Is.EqualTo(typeof(DateTime[])));
Assert.That(value, Is.EqualTo(new []{new DateTime(1998, 4, 12, 13, 26, 38, DateTimeKind.Utc)}));
value = reader.GetValue(1);
Assert.That(reader.GetFieldType(1), Is.EqualTo(typeof(Array)));
Assert.That(value.GetType(), Is.EqualTo(typeof(DateTime[,])));
Assert.That(value, Is.EqualTo(new [,]
{
{new DateTime(1998, 4, 12, 13, 26, 38, DateTimeKind.Utc)},
{new DateTime(1998, 4, 13, 13, 26, 38, DateTimeKind.Utc)}
}));
reader.Read();
value = reader.GetValue(0);
Assert.That(reader.GetFieldType(0), Is.EqualTo(typeof(Array)));
Assert.That(value.GetType(), Is.EqualTo(typeof(DateTime?[])));
Assert.That(value, Is.EqualTo(new DateTime?[]{ new DateTime(1998, 4, 14, 13, 26, 38, DateTimeKind.Utc), null }));
value = reader.GetValue(1);
Assert.That(reader.GetFieldType(1), Is.EqualTo(typeof(Array)));
Assert.That(value.GetType(), Is.EqualTo(typeof(DateTime?[,])));
Assert.That(value, Is.EqualTo(new DateTime?[,]
{
{ new DateTime(1998, 4, 14, 13, 26, 38, DateTimeKind.Utc), null },
{ new DateTime(1998, 4, 15, 13, 26, 38, DateTimeKind.Utc), new DateTime(1998, 4, 16, 13, 26, 38, DateTimeKind.Utc) }
}));
break;
default:
throw new ArgumentOutOfRangeException(nameof(mode), mode, null);
}
}

// Note that PG normalizes empty multidimensional arrays to single-dimensional, e.g. ARRAY[[], []]::integer[] returns {}.
[Test]
public async Task Write_empty_multidimensional_array()
Expand Down
20 changes: 17 additions & 3 deletions test/Npgsql.Tests/Types/DateTimeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,15 +454,29 @@ public void NpgsqlParameterNpgsqlDbType_is_value_dependent_timestamp_or_timestam

[Test]
public async Task Array_of_nullable_timestamptz()
=> await AssertType(
{
await using var datasource = CreateDataSource(csb =>
{
csb.ArrayNullabilityMode = ArrayNullabilityMode.PerInstance;
csb.Timezone = "Europe/Berlin";
});
await AssertType(datasource,
new DateTime?[]
{
new DateTime(1998, 4, 12, 13, 26, 38, DateTimeKind.Utc),
null
},
@"{""1998-04-12 15:26:38+02"",NULL}",
"timestamp with time zone[]",
isDefault: false);
"timestamp with time zone[]");

await AssertType(datasource,
new DateTime?[]
{
new DateTime(1998, 4, 12, 13, 26, 38, DateTimeKind.Utc),
},
@"{""1998-04-12 15:26:38+02""}",
"timestamp with time zone[]", isDefaultForReading: false); // we write DateTime?[], but will read DateTime[] from GetValue
}

#endregion

Expand Down