GOMODULES
/
pgx
mirror of https://github.com/jackc/pgx.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ResultReader.Read() to handle nil values 

The ResultReader.Read() method was erroneously converting nil values
to []byte{}.

https://github.com/jackc/pgx/issues/1987
pull/2010/head
Jack Christensen 2024-05-09 17:12:32 -05:00
parent e4f72071f8
commit 48ae1f4b2c
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pgconn/pgconn.go
View File

@ -1515,8 +1515,10 @@ func (rr *ResultReader) Read() *Result {
values := rr.Values()
row := make([][]byte, len(values))
for i := range row {
row[i] = make([]byte, len(values[i]))
copy(row[i], values[i])
if values[i] != nil {
row[i] = make([]byte, len(values[i]))
copy(row[i], values[i])
}
}
br.Rows = append(br.Rows, row)
}

18
pgconn/pgconn_test.go
View File

@ -1176,6 +1176,24 @@ func TestResultReaderValuesHaveSameCapacityAsLength(t *testing.T) {
ensureConnValid(t, pgConn)
}
// https://github.com/jackc/pgx/issues/1987
func TestResultReaderReadNil(t *testing.T) {
t.Parallel()
ctx, cancel := context.WithTimeout(context.Background(), 120*time.Second)
defer cancel()
pgConn, err := pgconn.Connect(ctx, os.Getenv("PGX_TEST_DATABASE"))
require.NoError(t, err)
defer closeConn(t, pgConn)
result := pgConn.ExecParams(ctx, "select null::text", nil, nil, nil, nil).Read()
require.NoError(t, result.Err)
require.Nil(t, result.Rows[0][0])
ensureConnValid(t, pgConn)
}
func TestConnExecPrepared(t *testing.T) {
t.Parallel()