Replace Status with Valid to conform to database/sql style
https://github.com/jackc/pgx/issues/1060
This commit is contained in:
+86
-86
@@ -14,41 +14,41 @@ func TestInt4ArrayTranscode(t *testing.T) {
|
||||
&pgtype.Int4Array{
|
||||
Elements: nil,
|
||||
Dimensions: nil,
|
||||
Status: pgtype.Present,
|
||||
Valid: true,
|
||||
},
|
||||
&pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{
|
||||
{Int: 1, Status: pgtype.Present},
|
||||
{Status: pgtype.Null},
|
||||
{Int: 1, Valid: true},
|
||||
{},
|
||||
},
|
||||
Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}},
|
||||
Status: pgtype.Present,
|
||||
Valid: true,
|
||||
},
|
||||
&pgtype.Int4Array{Status: pgtype.Null},
|
||||
&pgtype.Int4Array{},
|
||||
&pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{
|
||||
{Int: 1, Status: pgtype.Present},
|
||||
{Int: 2, Status: pgtype.Present},
|
||||
{Int: 3, Status: pgtype.Present},
|
||||
{Int: 4, Status: pgtype.Present},
|
||||
{Status: pgtype.Null},
|
||||
{Int: 6, Status: pgtype.Present},
|
||||
{Int: 1, Valid: true},
|
||||
{Int: 2, Valid: true},
|
||||
{Int: 3, Valid: true},
|
||||
{Int: 4, Valid: true},
|
||||
{},
|
||||
{Int: 6, Valid: true},
|
||||
},
|
||||
Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}},
|
||||
Status: pgtype.Present,
|
||||
Valid: true,
|
||||
},
|
||||
&pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{
|
||||
{Int: 1, Status: pgtype.Present},
|
||||
{Int: 2, Status: pgtype.Present},
|
||||
{Int: 3, Status: pgtype.Present},
|
||||
{Int: 4, Status: pgtype.Present},
|
||||
{Int: 1, Valid: true},
|
||||
{Int: 2, Valid: true},
|
||||
{Int: 3, Valid: true},
|
||||
{Int: 4, Valid: true},
|
||||
},
|
||||
Dimensions: []pgtype.ArrayDimension{
|
||||
{Length: 2, LowerBound: 4},
|
||||
{Length: 2, LowerBound: 2},
|
||||
},
|
||||
Status: pgtype.Present,
|
||||
Valid: true,
|
||||
},
|
||||
})
|
||||
}
|
||||
@@ -62,30 +62,30 @@ func TestInt4ArraySet(t *testing.T) {
|
||||
{
|
||||
source: []int64{1},
|
||||
result: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{{Int: 1, Status: pgtype.Present}},
|
||||
Elements: []pgtype.Int4{{Int: 1, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}},
|
||||
Status: pgtype.Present},
|
||||
Valid: true},
|
||||
},
|
||||
{
|
||||
source: []int32{1},
|
||||
result: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{{Int: 1, Status: pgtype.Present}},
|
||||
Elements: []pgtype.Int4{{Int: 1, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}},
|
||||
Status: pgtype.Present},
|
||||
Valid: true},
|
||||
},
|
||||
{
|
||||
source: []int16{1},
|
||||
result: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{{Int: 1, Status: pgtype.Present}},
|
||||
Elements: []pgtype.Int4{{Int: 1, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}},
|
||||
Status: pgtype.Present},
|
||||
Valid: true},
|
||||
},
|
||||
{
|
||||
source: []int{1},
|
||||
result: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{{Int: 1, Status: pgtype.Present}},
|
||||
Elements: []pgtype.Int4{{Int: 1, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}},
|
||||
Status: pgtype.Present},
|
||||
Valid: true},
|
||||
},
|
||||
{
|
||||
source: []int{1, math.MaxInt32 + 1, 2},
|
||||
@@ -94,75 +94,75 @@ func TestInt4ArraySet(t *testing.T) {
|
||||
{
|
||||
source: []uint64{1},
|
||||
result: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{{Int: 1, Status: pgtype.Present}},
|
||||
Elements: []pgtype.Int4{{Int: 1, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}},
|
||||
Status: pgtype.Present},
|
||||
Valid: true},
|
||||
},
|
||||
{
|
||||
source: []uint32{1},
|
||||
result: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{{Int: 1, Status: pgtype.Present}},
|
||||
Elements: []pgtype.Int4{{Int: 1, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}},
|
||||
Status: pgtype.Present},
|
||||
Valid: true},
|
||||
},
|
||||
{
|
||||
source: []uint16{1},
|
||||
result: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{{Int: 1, Status: pgtype.Present}},
|
||||
Elements: []pgtype.Int4{{Int: 1, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}},
|
||||
Status: pgtype.Present},
|
||||
Valid: true},
|
||||
},
|
||||
{
|
||||
source: (([]int32)(nil)),
|
||||
result: pgtype.Int4Array{Status: pgtype.Null},
|
||||
result: pgtype.Int4Array{},
|
||||
},
|
||||
{
|
||||
source: [][]int32{{1}, {2}},
|
||||
result: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{{Int: 1, Status: pgtype.Present}, {Int: 2, Status: pgtype.Present}},
|
||||
Elements: []pgtype.Int4{{Int: 1, Valid: true}, {Int: 2, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 2}, {LowerBound: 1, Length: 1}},
|
||||
Status: pgtype.Present},
|
||||
Valid: true},
|
||||
},
|
||||
{
|
||||
source: [][][][]int32{{{{1, 2, 3}}}, {{{4, 5, 6}}}},
|
||||
result: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{
|
||||
{Int: 1, Status: pgtype.Present},
|
||||
{Int: 2, Status: pgtype.Present},
|
||||
{Int: 3, Status: pgtype.Present},
|
||||
{Int: 4, Status: pgtype.Present},
|
||||
{Int: 5, Status: pgtype.Present},
|
||||
{Int: 6, Status: pgtype.Present}},
|
||||
{Int: 1, Valid: true},
|
||||
{Int: 2, Valid: true},
|
||||
{Int: 3, Valid: true},
|
||||
{Int: 4, Valid: true},
|
||||
{Int: 5, Valid: true},
|
||||
{Int: 6, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{
|
||||
{LowerBound: 1, Length: 2},
|
||||
{LowerBound: 1, Length: 1},
|
||||
{LowerBound: 1, Length: 1},
|
||||
{LowerBound: 1, Length: 3}},
|
||||
Status: pgtype.Present},
|
||||
Valid: true},
|
||||
},
|
||||
{
|
||||
source: [2][1]int32{{1}, {2}},
|
||||
result: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{{Int: 1, Status: pgtype.Present}, {Int: 2, Status: pgtype.Present}},
|
||||
Elements: []pgtype.Int4{{Int: 1, Valid: true}, {Int: 2, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 2}, {LowerBound: 1, Length: 1}},
|
||||
Status: pgtype.Present},
|
||||
Valid: true},
|
||||
},
|
||||
{
|
||||
source: [2][1][1][3]int32{{{{1, 2, 3}}}, {{{4, 5, 6}}}},
|
||||
result: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{
|
||||
{Int: 1, Status: pgtype.Present},
|
||||
{Int: 2, Status: pgtype.Present},
|
||||
{Int: 3, Status: pgtype.Present},
|
||||
{Int: 4, Status: pgtype.Present},
|
||||
{Int: 5, Status: pgtype.Present},
|
||||
{Int: 6, Status: pgtype.Present}},
|
||||
{Int: 1, Valid: true},
|
||||
{Int: 2, Valid: true},
|
||||
{Int: 3, Valid: true},
|
||||
{Int: 4, Valid: true},
|
||||
{Int: 5, Valid: true},
|
||||
{Int: 6, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{
|
||||
{LowerBound: 1, Length: 2},
|
||||
{LowerBound: 1, Length: 1},
|
||||
{LowerBound: 1, Length: 1},
|
||||
{LowerBound: 1, Length: 3}},
|
||||
Status: pgtype.Present},
|
||||
Valid: true},
|
||||
},
|
||||
}
|
||||
|
||||
@@ -203,90 +203,90 @@ func TestInt4ArrayAssignTo(t *testing.T) {
|
||||
}{
|
||||
{
|
||||
src: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{{Int: 1, Status: pgtype.Present}},
|
||||
Elements: []pgtype.Int4{{Int: 1, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}},
|
||||
Status: pgtype.Present,
|
||||
Valid: true,
|
||||
},
|
||||
dst: &int32Slice,
|
||||
expected: []int32{1},
|
||||
},
|
||||
{
|
||||
src: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{{Int: 1, Status: pgtype.Present}},
|
||||
Elements: []pgtype.Int4{{Int: 1, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}},
|
||||
Status: pgtype.Present,
|
||||
Valid: true,
|
||||
},
|
||||
dst: &uint32Slice,
|
||||
expected: []uint32{1},
|
||||
},
|
||||
{
|
||||
src: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{{Int: 1, Status: pgtype.Present}},
|
||||
Elements: []pgtype.Int4{{Int: 1, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}},
|
||||
Status: pgtype.Present,
|
||||
Valid: true,
|
||||
},
|
||||
dst: &namedInt32Slice,
|
||||
expected: _int32Slice{1},
|
||||
},
|
||||
{
|
||||
src: pgtype.Int4Array{Status: pgtype.Null},
|
||||
src: pgtype.Int4Array{},
|
||||
dst: &int32Slice,
|
||||
expected: (([]int32)(nil)),
|
||||
},
|
||||
{
|
||||
src: pgtype.Int4Array{Status: pgtype.Present},
|
||||
src: pgtype.Int4Array{Valid: true},
|
||||
dst: &int32Slice,
|
||||
expected: []int32{},
|
||||
},
|
||||
{
|
||||
src: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{{Int: 1, Status: pgtype.Present}, {Int: 2, Status: pgtype.Present}},
|
||||
Elements: []pgtype.Int4{{Int: 1, Valid: true}, {Int: 2, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 2}, {LowerBound: 1, Length: 1}},
|
||||
Status: pgtype.Present},
|
||||
Valid: true},
|
||||
expected: [][]int32{{1}, {2}},
|
||||
dst: &int32SliceDim2,
|
||||
},
|
||||
{
|
||||
src: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{
|
||||
{Int: 1, Status: pgtype.Present},
|
||||
{Int: 2, Status: pgtype.Present},
|
||||
{Int: 3, Status: pgtype.Present},
|
||||
{Int: 4, Status: pgtype.Present},
|
||||
{Int: 5, Status: pgtype.Present},
|
||||
{Int: 6, Status: pgtype.Present}},
|
||||
{Int: 1, Valid: true},
|
||||
{Int: 2, Valid: true},
|
||||
{Int: 3, Valid: true},
|
||||
{Int: 4, Valid: true},
|
||||
{Int: 5, Valid: true},
|
||||
{Int: 6, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{
|
||||
{LowerBound: 1, Length: 2},
|
||||
{LowerBound: 1, Length: 1},
|
||||
{LowerBound: 1, Length: 1},
|
||||
{LowerBound: 1, Length: 3}},
|
||||
Status: pgtype.Present},
|
||||
Valid: true},
|
||||
expected: [][][][]int32{{{{1, 2, 3}}}, {{{4, 5, 6}}}},
|
||||
dst: &int32SliceDim4,
|
||||
},
|
||||
{
|
||||
src: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{{Int: 1, Status: pgtype.Present}, {Int: 2, Status: pgtype.Present}},
|
||||
Elements: []pgtype.Int4{{Int: 1, Valid: true}, {Int: 2, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 2}, {LowerBound: 1, Length: 1}},
|
||||
Status: pgtype.Present},
|
||||
Valid: true},
|
||||
expected: [2][1]int32{{1}, {2}},
|
||||
dst: &int32ArrayDim2,
|
||||
},
|
||||
{
|
||||
src: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{
|
||||
{Int: 1, Status: pgtype.Present},
|
||||
{Int: 2, Status: pgtype.Present},
|
||||
{Int: 3, Status: pgtype.Present},
|
||||
{Int: 4, Status: pgtype.Present},
|
||||
{Int: 5, Status: pgtype.Present},
|
||||
{Int: 6, Status: pgtype.Present}},
|
||||
{Int: 1, Valid: true},
|
||||
{Int: 2, Valid: true},
|
||||
{Int: 3, Valid: true},
|
||||
{Int: 4, Valid: true},
|
||||
{Int: 5, Valid: true},
|
||||
{Int: 6, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{
|
||||
{LowerBound: 1, Length: 2},
|
||||
{LowerBound: 1, Length: 1},
|
||||
{LowerBound: 1, Length: 1},
|
||||
{LowerBound: 1, Length: 3}},
|
||||
Status: pgtype.Present},
|
||||
Valid: true},
|
||||
expected: [2][1][1][3]int32{{{{1, 2, 3}}}, {{{4, 5, 6}}}},
|
||||
dst: &int32ArrayDim4,
|
||||
},
|
||||
@@ -309,39 +309,39 @@ func TestInt4ArrayAssignTo(t *testing.T) {
|
||||
}{
|
||||
{
|
||||
src: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{{Status: pgtype.Null}},
|
||||
Elements: []pgtype.Int4{{}},
|
||||
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}},
|
||||
Status: pgtype.Present,
|
||||
Valid: true,
|
||||
},
|
||||
dst: &int32Slice,
|
||||
},
|
||||
{
|
||||
src: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{{Int: -1, Status: pgtype.Present}},
|
||||
Elements: []pgtype.Int4{{Int: -1, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}},
|
||||
Status: pgtype.Present,
|
||||
Valid: true,
|
||||
},
|
||||
dst: &uint32Slice,
|
||||
},
|
||||
{
|
||||
src: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{{Int: 1, Status: pgtype.Present}, {Int: 2, Status: pgtype.Present}},
|
||||
Elements: []pgtype.Int4{{Int: 1, Valid: true}, {Int: 2, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}, {LowerBound: 1, Length: 2}},
|
||||
Status: pgtype.Present},
|
||||
Valid: true},
|
||||
dst: &int32ArrayDim2,
|
||||
},
|
||||
{
|
||||
src: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{{Int: 1, Status: pgtype.Present}, {Int: 2, Status: pgtype.Present}},
|
||||
Elements: []pgtype.Int4{{Int: 1, Valid: true}, {Int: 2, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}, {LowerBound: 1, Length: 2}},
|
||||
Status: pgtype.Present},
|
||||
Valid: true},
|
||||
dst: &int32Slice,
|
||||
},
|
||||
{
|
||||
src: pgtype.Int4Array{
|
||||
Elements: []pgtype.Int4{{Int: 1, Status: pgtype.Present}, {Int: 2, Status: pgtype.Present}},
|
||||
Elements: []pgtype.Int4{{Int: 1, Valid: true}, {Int: 2, Valid: true}},
|
||||
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 2}, {LowerBound: 1, Length: 1}},
|
||||
Status: pgtype.Present},
|
||||
Valid: true},
|
||||
dst: &int32ArrayDim4,
|
||||
},
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user