Skip to content

fix: Regression - Broken mapping of numeric arrays in Postgres (#2231 & #2234) #2239

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
leandrommedeiros wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −3
Open

fix: Regression - Broken mapping of numeric arrays in Postgres (#2231 & #2234) #2239

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
8 changes: 6 additions & 2 deletions Dapper/SqlMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3851,13 +3851,17 @@ private static void LoadReaderValueOrBranchToDBNullLabel(ILGenerator il, int ind
{
TypeCode dataTypeCode = Type.GetTypeCode(colType), unboxTypeCode = Type.GetTypeCode(unboxType);
bool hasTypeHandler;
bool providerValueIsAssignable = unboxType.IsAssignableFrom(colType);
// note the TypeCode tests are only meaningful for distinct codes: TypeCode.Object
// matching TypeCode.Object says nothing (TimeSpan vs TimeOnly?, say), and a direct
// unbox there throws; such pairs belong to the flexible-convert path below. A column
// reported as plain *object* (sql_variant etc) keeps the direct unbox: the runtime
// box is the only truth available there
if ((hasTypeHandler = typeHandlers.ContainsKey(unboxType)) || colType == unboxType
|| colType == typeof(object) || unboxType == typeof(object)
if ((hasTypeHandler = typeHandlers.ContainsKey(unboxType))
|| colType == unboxType
|| providerValueIsAssignable
|| colType == typeof(object)
|| unboxType == typeof(object)
|| (dataTypeCode == unboxTypeCode && dataTypeCode != TypeCode.Object)
|| (dataTypeCode == Type.GetTypeCode(nullUnderlyingType) && dataTypeCode != TypeCode.Object)
|| colType == nullUnderlyingType)
Expand Down
25 changes: 24 additions & 1 deletion tests/Dapper.Tests/Providers/PostgresqlTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using System.Linq;
using Xunit;
Expand Down Expand Up @@ -68,6 +67,30 @@ private class DateReadings
public DateOnly AsDateOnly { get; set; }
public DateTime? AsNullableDateTime { get; set; }
}

private sealed record NumericArraysTable
{
public IReadOnlyCollection<long> Longs { get; set; } = [];
public IReadOnlyCollection<int> Ints { get; set; } = [];
public IReadOnlyCollection<short> Shorts { get; set; } = [];
}

[FactPostgresql]
public void TestPostgresqlBigintArrayMapsToReadOnlyCollection()
{
using var conn = GetOpenNpgsqlConnection();

var row = conn.QuerySingle<NumericArraysTable>(
@"SELECT
ARRAY[1001, 1002, 1003]::bigint[] AS ""Longs""
, ARRAY[2001, 2002, 2003]::int[] AS ""Ints""
, ARRAY[3001, 3002, 3003]::smallint[] AS ""Shorts""
;");

Assert.Equal(new [] { 1001L, 1002L, 1003L }, row.Longs.ToArray());
Assert.Equal(new [] { 2001, 2002, 2003 }, row.Ints.ToArray());
Assert.Equal(new short[] { 3001, 3002, 3003 }, row.Shorts.ToArray());
}
#endif

[FactPostgresql]
Expand Down