Skip to content
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

Jump to bottom

export ParseArray #898

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

export ParseArray #898

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions array.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ func (a GenericArray) Scan(src interface{}) error {

func (a GenericArray) scanBytes(src []byte, dv reflect.Value) error {
dtype, assign, del := a.evaluateDestination(dv.Type().Elem())
dims, elems, err := parseArray(src, []byte(del))
dims, elems, err := ParseArray(src, []byte(del))
if err != nil {
return err
}
Expand Down Expand Up @@ -633,13 +633,13 @@ func appendValue(b []byte, v driver.Value) ([]byte, error) {
return append(b, encode(nil, v, 0)...), nil
}

// parseArray extracts the dimensions and elements of an array represented in
// ParseArray extracts the dimensions and elements of an array represented in
// text format. Only representations emitted by the backend are supported.
// Notably, whitespace around brackets and delimiters is significant, and NULL
// is case-sensitive.
//
// See http://www.postgresql.org/docs/current/static/arrays.html#ARRAYS-IO
func parseArray(src, del []byte) (dims []int, elems [][]byte, err error) {
func ParseArray(src, del []byte) (dims []int, elems [][]byte, err error) {
var depth, i int

if len(src) < 1 || src[0] != '{' {
Expand Down Expand Up @@ -745,7 +745,7 @@ Close:
}

func scanLinearArray(src, del []byte, typ string) (elems [][]byte, err error) {
dims, elems, err := parseArray(src, del)
dims, elems, err := ParseArray(src, del)
if err != nil {
return nil, err
}
Expand Down
4 changes: 2 additions & 2 deletions array_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func TestParseArray(t *testing.T) {
}},
{`{axyzb}`, `xyz`, []int{2}, [][]byte{{'a'}, {'b'}}},
} {
dims, elems, err := parseArray([]byte(tt.input), []byte(tt.delim))
dims, elems, err := ParseArray([]byte(tt.input), []byte(tt.delim))

if err != nil {
t.Fatalf("Expected no error for %q, got %q", tt.input, err)
Expand Down Expand Up @@ -77,7 +77,7 @@ func TestParseArrayError(t *testing.T) {
{`{""x}`, "unexpected 'x' at offset 3"},
{`{{a},{b,c}}`, "multidimensional arrays must have elements with matching dimensions"},
} {
_, _, err := parseArray([]byte(tt.input), []byte{','})
_, _, err := ParseArray([]byte(tt.input), []byte{','})

if err == nil {
t.Fatalf("Expected error for %q, got none", tt.input)
Expand Down