2
0

Make array helpers private

This commit is contained in:
Jack Christensen
2022-04-16 14:21:40 -05:00
parent 1c90746cf5
commit cc7de81d3b
5 changed files with 40 additions and 41 deletions
+25 -27
View File
@@ -1,79 +1,77 @@
package pgtype_test
package pgtype
import (
"reflect"
"testing"
"github.com/jackc/pgx/v5/pgtype"
)
func TestParseUntypedTextArray(t *testing.T) {
tests := []struct {
source string
result pgtype.UntypedTextArray
result untypedTextArray
}{
{
source: "{}",
result: pgtype.UntypedTextArray{
result: untypedTextArray{
Elements: []string{},
Quoted: []bool{},
Dimensions: []pgtype.ArrayDimension{},
Dimensions: []ArrayDimension{},
},
},
{
source: "{1}",
result: pgtype.UntypedTextArray{
result: untypedTextArray{
Elements: []string{"1"},
Quoted: []bool{false},
Dimensions: []pgtype.ArrayDimension{{Length: 1, LowerBound: 1}},
Dimensions: []ArrayDimension{{Length: 1, LowerBound: 1}},
},
},
{
source: "{a,b}",
result: pgtype.UntypedTextArray{
result: untypedTextArray{
Elements: []string{"a", "b"},
Quoted: []bool{false, false},
Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}},
Dimensions: []ArrayDimension{{Length: 2, LowerBound: 1}},
},
},
{
source: `{"NULL"}`,
result: pgtype.UntypedTextArray{
result: untypedTextArray{
Elements: []string{"NULL"},
Quoted: []bool{true},
Dimensions: []pgtype.ArrayDimension{{Length: 1, LowerBound: 1}},
Dimensions: []ArrayDimension{{Length: 1, LowerBound: 1}},
},
},
{
source: `{""}`,
result: pgtype.UntypedTextArray{
result: untypedTextArray{
Elements: []string{""},
Quoted: []bool{true},
Dimensions: []pgtype.ArrayDimension{{Length: 1, LowerBound: 1}},
Dimensions: []ArrayDimension{{Length: 1, LowerBound: 1}},
},
},
{
source: `{"He said, \"Hello.\""}`,
result: pgtype.UntypedTextArray{
result: untypedTextArray{
Elements: []string{`He said, "Hello."`},
Quoted: []bool{true},
Dimensions: []pgtype.ArrayDimension{{Length: 1, LowerBound: 1}},
Dimensions: []ArrayDimension{{Length: 1, LowerBound: 1}},
},
},
{
source: "{{a,b},{c,d},{e,f}}",
result: pgtype.UntypedTextArray{
result: untypedTextArray{
Elements: []string{"a", "b", "c", "d", "e", "f"},
Quoted: []bool{false, false, false, false, false, false},
Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}},
Dimensions: []ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}},
},
},
{
source: "{{{a,b},{c,d},{e,f}},{{a,b},{c,d},{e,f}}}",
result: pgtype.UntypedTextArray{
result: untypedTextArray{
Elements: []string{"a", "b", "c", "d", "e", "f", "a", "b", "c", "d", "e", "f"},
Quoted: []bool{false, false, false, false, false, false, false, false, false, false, false, false},
Dimensions: []pgtype.ArrayDimension{
Dimensions: []ArrayDimension{
{Length: 2, LowerBound: 1},
{Length: 3, LowerBound: 1},
{Length: 2, LowerBound: 1},
@@ -82,18 +80,18 @@ func TestParseUntypedTextArray(t *testing.T) {
},
{
source: "[4:4]={1}",
result: pgtype.UntypedTextArray{
result: untypedTextArray{
Elements: []string{"1"},
Quoted: []bool{false},
Dimensions: []pgtype.ArrayDimension{{Length: 1, LowerBound: 4}},
Dimensions: []ArrayDimension{{Length: 1, LowerBound: 4}},
},
},
{
source: "[4:5][2:3]={{a,b},{c,d}}",
result: pgtype.UntypedTextArray{
result: untypedTextArray{
Elements: []string{"a", "b", "c", "d"},
Quoted: []bool{false, false, false, false},
Dimensions: []pgtype.ArrayDimension{
Dimensions: []ArrayDimension{
{Length: 2, LowerBound: 4},
{Length: 2, LowerBound: 2},
},
@@ -101,16 +99,16 @@ func TestParseUntypedTextArray(t *testing.T) {
},
{
source: "[-4:-2]={1,2,3}",
result: pgtype.UntypedTextArray{
result: untypedTextArray{
Elements: []string{"1", "2", "3"},
Quoted: []bool{false, false, false},
Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: -4}},
Dimensions: []ArrayDimension{{Length: 3, LowerBound: -4}},
},
},
}
for i, tt := range tests {
r, err := pgtype.ParseUntypedTextArray(tt.source)
r, err := parseUntypedTextArray(tt.source)
if err != nil {
t.Errorf("%d: %v", i, err)
continue