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

Use Go casing convention for ACLItem

v3-ann
Jack Christensen 2017-06-03 11:58:40 -05:00
parent 6688466123
commit 24fb04edb5
6 changed files with 94 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pgtype/aclitem.go
View File

@ -5,7 +5,7 @@ import (
"fmt"
)
// Aclitem is used for PostgreSQL's aclitem data type. A sample aclitem
// ACLItem is used for PostgreSQL's aclitem data type. A sample aclitem
// might look like this:
//
// postgres=arwdDxt/postgres
@ -17,32 +17,32 @@ import (
//
// postgres=arwdDxt/"role with spaces"
//
type Aclitem struct {
type ACLItem struct {
String string
Status Status
}
func (dst *Aclitem) Set(src interface{}) error {
func (dst *ACLItem) Set(src interface{}) error {
switch value := src.(type) {
case string:
*dst = Aclitem{String: value, Status: Present}
*dst = ACLItem{String: value, Status: Present}
case *string:
if value == nil {
*dst = Aclitem{Status: Null}
*dst = ACLItem{Status: Null}
} else {
*dst = Aclitem{String: *value, Status: Present}
*dst = ACLItem{String: *value, Status: Present}
}
default:
if originalSrc, ok := underlyingStringType(src); ok {
return dst.Set(originalSrc)
}
return fmt.Errorf("cannot convert %v to Aclitem", value)
return fmt.Errorf("cannot convert %v to ACLItem", value)
}
return nil
}
func (dst *Aclitem) Get() interface{} {
func (dst *ACLItem) Get() interface{} {
switch dst.Status {
case Present:
return dst.String
@ -53,7 +53,7 @@ func (dst *Aclitem) Get() interface{} {
}
}
func (src *Aclitem) AssignTo(dst interface{}) error {
func (src *ACLItem) AssignTo(dst interface{}) error {
switch src.Status {
case Present:
switch v := dst.(type) {
@ -72,17 +72,17 @@ func (src *Aclitem) AssignTo(dst interface{}) error {
return fmt.Errorf("cannot decode %v into %T", src, dst)
}
func (dst *Aclitem) DecodeText(ci *ConnInfo, src []byte) error {
func (dst *ACLItem) DecodeText(ci *ConnInfo, src []byte) error {
if src == nil {
*dst = Aclitem{Status: Null}
*dst = ACLItem{Status: Null}
return nil
}
*dst = Aclitem{String: string(src), Status: Present}
*dst = ACLItem{String: string(src), Status: Present}
return nil
}
func (src *Aclitem) EncodeText(ci *ConnInfo, buf []byte) ([]byte, error) {
func (src *ACLItem) EncodeText(ci *ConnInfo, buf []byte) ([]byte, error) {
switch src.Status {
case Null:
return nil, nil
@ -94,9 +94,9 @@ func (src *Aclitem) EncodeText(ci *ConnInfo, buf []byte) ([]byte, error) {
}
// Scan implements the database/sql Scanner interface.
func (dst *Aclitem) Scan(src interface{}) error {
func (dst *ACLItem) Scan(src interface{}) error {
if src == nil {
*dst = Aclitem{Status: Null}
*dst = ACLItem{Status: Null}
return nil
}
@ -113,7 +113,7 @@ func (dst *Aclitem) Scan(src interface{}) error {
}
// Value implements the database/sql/driver Valuer interface.
func (src *Aclitem) Value() (driver.Value, error) {
func (src *ACLItem) Value() (driver.Value, error) {
switch src.Status {
case Present:
return src.String, nil

38
pgtype/aclitem_array.go
View File

@ -5,28 +5,28 @@ import (
"fmt"
)
type AclitemArray struct {
Elements []Aclitem
type ACLItemArray struct {
Elements []ACLItem
Dimensions []ArrayDimension
Status Status
}
func (dst *AclitemArray) Set(src interface{}) error {
func (dst *ACLItemArray) Set(src interface{}) error {
switch value := src.(type) {
case []string:
if value == nil {
*dst = AclitemArray{Status: Null}
*dst = ACLItemArray{Status: Null}
} else if len(value) == 0 {
*dst = AclitemArray{Status: Present}
*dst = ACLItemArray{Status: Present}
} else {
elements := make([]Aclitem, len(value))
elements := make([]ACLItem, len(value))
for i := range value {
if err := elements[i].Set(value[i]); err != nil {
return err
}
}
*dst = AclitemArray{
*dst = ACLItemArray{
Elements: elements,
Dimensions: []ArrayDimension{{Length: int32(len(elements)), LowerBound: 1}},
Status: Present,
@ -37,13 +37,13 @@ func (dst *AclitemArray) Set(src interface{}) error {
if originalSrc, ok := underlyingSliceType(src); ok {
return dst.Set(originalSrc)
}
return fmt.Errorf("cannot convert %v to Aclitem", value)
return fmt.Errorf("cannot convert %v to ACLItem", value)
}
return nil
}
func (dst *AclitemArray) Get() interface{} {
func (dst *ACLItemArray) Get() interface{} {
switch dst.Status {
case Present:
return dst
@ -54,7 +54,7 @@ func (dst *AclitemArray) Get() interface{} {
}
}
func (src *AclitemArray) AssignTo(dst interface{}) error {
func (src *ACLItemArray) AssignTo(dst interface{}) error {
switch src.Status {
case Present:
switch v := dst.(type) {
@ -80,9 +80,9 @@ func (src *AclitemArray) AssignTo(dst interface{}) error {
return fmt.Errorf("cannot decode %v into %T", src, dst)
}
func (dst *AclitemArray) DecodeText(ci *ConnInfo, src []byte) error {
func (dst *ACLItemArray) DecodeText(ci *ConnInfo, src []byte) error {
if src == nil {
*dst = AclitemArray{Status: Null}
*dst = ACLItemArray{Status: Null}
return nil
}
@ -91,13 +91,13 @@ func (dst *AclitemArray) DecodeText(ci *ConnInfo, src []byte) error {
return err
}
var elements []Aclitem
var elements []ACLItem
if len(uta.Elements) > 0 {
elements = make([]Aclitem, len(uta.Elements))
elements = make([]ACLItem, len(uta.Elements))
for i, s := range uta.Elements {
var elem Aclitem
var elem ACLItem
var elemSrc []byte
if s != "NULL" {
elemSrc = []byte(s)
@ -111,12 +111,12 @@ func (dst *AclitemArray) DecodeText(ci *ConnInfo, src []byte) error {
}
}
*dst = AclitemArray{Elements: elements, Dimensions: uta.Dimensions, Status: Present}
*dst = ACLItemArray{Elements: elements, Dimensions: uta.Dimensions, Status: Present}
return nil
}
func (src *AclitemArray) EncodeText(ci *ConnInfo, buf []byte) ([]byte, error) {
func (src *ACLItemArray) EncodeText(ci *ConnInfo, buf []byte) ([]byte, error) {
switch src.Status {
case Null:
return nil, nil
@ -174,7 +174,7 @@ func (src *AclitemArray) EncodeText(ci *ConnInfo, buf []byte) ([]byte, error) {
}
// Scan implements the database/sql Scanner interface.
func (dst *AclitemArray) Scan(src interface{}) error {
func (dst *ACLItemArray) Scan(src interface{}) error {
if src == nil {
return dst.DecodeText(nil, nil)
}
@ -192,7 +192,7 @@ func (dst *AclitemArray) Scan(src interface{}) error {
}
// Value implements the database/sql/driver Valuer interface.
func (src *AclitemArray) Value() (driver.Value, error) {
func (src *ACLItemArray) Value() (driver.Value, error) {
buf, err := src.EncodeText(nil, nil)
if err != nil {
return nil, err

74
pgtype/aclitem_array_test.go
View File

@ -8,40 +8,40 @@ import (
"github.com/jackc/pgx/pgtype/testutil"
)
func TestAclitemArrayTranscode(t *testing.T) {
func TestACLItemArrayTranscode(t *testing.T) {
testutil.TestSuccessfulTranscode(t, "aclitem[]", []interface{}{
&pgtype.AclitemArray{
&pgtype.ACLItemArray{
Elements: nil,
Dimensions: nil,
Status: pgtype.Present,
},
&pgtype.AclitemArray{
Elements: []pgtype.Aclitem{
pgtype.Aclitem{String: "=r/postgres", Status: pgtype.Present},
pgtype.Aclitem{Status: pgtype.Null},
&pgtype.ACLItemArray{
Elements: []pgtype.ACLItem{
pgtype.ACLItem{String: "=r/postgres", Status: pgtype.Present},
pgtype.ACLItem{Status: pgtype.Null},
},
Dimensions: []pgtype.ArrayDimension{{Length: 2, LowerBound: 1}},
Status: pgtype.Present,
},
&pgtype.AclitemArray{Status: pgtype.Null},
&pgtype.AclitemArray{
Elements: []pgtype.Aclitem{
pgtype.Aclitem{String: "=r/postgres", Status: pgtype.Present},
pgtype.Aclitem{String: "postgres=arwdDxt/postgres", Status: pgtype.Present},
pgtype.Aclitem{String: `postgres=arwdDxt/" tricky, ' } "" \ test user "`, Status: pgtype.Present},
pgtype.Aclitem{String: "=r/postgres", Status: pgtype.Present},
pgtype.Aclitem{Status: pgtype.Null},
pgtype.Aclitem{String: "=r/postgres", Status: pgtype.Present},
&pgtype.ACLItemArray{Status: pgtype.Null},
&pgtype.ACLItemArray{
Elements: []pgtype.ACLItem{
pgtype.ACLItem{String: "=r/postgres", Status: pgtype.Present},
pgtype.ACLItem{String: "postgres=arwdDxt/postgres", Status: pgtype.Present},
pgtype.ACLItem{String: `postgres=arwdDxt/" tricky, ' } "" \ test user "`, Status: pgtype.Present},
pgtype.ACLItem{String: "=r/postgres", Status: pgtype.Present},
pgtype.ACLItem{Status: pgtype.Null},
pgtype.ACLItem{String: "=r/postgres", Status: pgtype.Present},
},
Dimensions: []pgtype.ArrayDimension{{Length: 3, LowerBound: 1}, {Length: 2, LowerBound: 1}},
Status: pgtype.Present,
},
&pgtype.AclitemArray{
Elements: []pgtype.Aclitem{
pgtype.Aclitem{String: "=r/postgres", Status: pgtype.Present},
pgtype.Aclitem{String: "postgres=arwdDxt/postgres", Status: pgtype.Present},
pgtype.Aclitem{String: "=r/postgres", Status: pgtype.Present},
pgtype.Aclitem{String: "postgres=arwdDxt/postgres", Status: pgtype.Present},
&pgtype.ACLItemArray{
Elements: []pgtype.ACLItem{
pgtype.ACLItem{String: "=r/postgres", Status: pgtype.Present},
pgtype.ACLItem{String: "postgres=arwdDxt/postgres", Status: pgtype.Present},
pgtype.ACLItem{String: "=r/postgres", Status: pgtype.Present},
pgtype.ACLItem{String: "postgres=arwdDxt/postgres", Status: pgtype.Present},
},
Dimensions: []pgtype.ArrayDimension{
{Length: 2, LowerBound: 4},
@ -52,26 +52,26 @@ func TestAclitemArrayTranscode(t *testing.T) {
})
}
func TestAclitemArraySet(t *testing.T) {
func TestACLItemArraySet(t *testing.T) {
successfulTests := []struct {
source interface{}
result pgtype.AclitemArray
result pgtype.ACLItemArray
}{
{
source: []string{"=r/postgres"},
result: pgtype.AclitemArray{
Elements: []pgtype.Aclitem{{String: "=r/postgres", Status: pgtype.Present}},
result: pgtype.ACLItemArray{
Elements: []pgtype.ACLItem{{String: "=r/postgres", Status: pgtype.Present}},
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}},
Status: pgtype.Present},
},
{
source: (([]string)(nil)),
result: pgtype.AclitemArray{Status: pgtype.Null},
result: pgtype.ACLItemArray{Status: pgtype.Null},
},
}
for i, tt := range successfulTests {
var r pgtype.AclitemArray
var r pgtype.ACLItemArray
err := r.Set(tt.source)
if err != nil {
t.Errorf("%d: %v", i, err)
@ -83,19 +83,19 @@ func TestAclitemArraySet(t *testing.T) {
}
}
func TestAclitemArrayAssignTo(t *testing.T) {
func TestACLItemArrayAssignTo(t *testing.T) {
var stringSlice []string
type _stringSlice []string
var namedStringSlice _stringSlice
simpleTests := []struct {
src pgtype.AclitemArray
src pgtype.ACLItemArray
dst interface{}
expected interface{}
}{
{
src: pgtype.AclitemArray{
Elements: []pgtype.Aclitem{{String: "=r/postgres", Status: pgtype.Present}},
src: pgtype.ACLItemArray{
Elements: []pgtype.ACLItem{{String: "=r/postgres", Status: pgtype.Present}},
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}},
Status: pgtype.Present,
},
@ -103,8 +103,8 @@ func TestAclitemArrayAssignTo(t *testing.T) {
expected: []string{"=r/postgres"},
},
{
src: pgtype.AclitemArray{
Elements: []pgtype.Aclitem{{String: "=r/postgres", Status: pgtype.Present}},
src: pgtype.ACLItemArray{
Elements: []pgtype.ACLItem{{String: "=r/postgres", Status: pgtype.Present}},
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}},
Status: pgtype.Present,
},
@ -112,7 +112,7 @@ func TestAclitemArrayAssignTo(t *testing.T) {
expected: _stringSlice{"=r/postgres"},
},
{
src: pgtype.AclitemArray{Status: pgtype.Null},
src: pgtype.ACLItemArray{Status: pgtype.Null},
dst: &stringSlice,
expected: (([]string)(nil)),
},
@ -130,12 +130,12 @@ func TestAclitemArrayAssignTo(t *testing.T) {
}
errorTests := []struct {
src pgtype.AclitemArray
src pgtype.ACLItemArray
dst interface{}
}{
{
src: pgtype.AclitemArray{
Elements: []pgtype.Aclitem{{Status: pgtype.Null}},
src: pgtype.ACLItemArray{
Elements: []pgtype.ACLItem{{Status: pgtype.Null}},
Dimensions: []pgtype.ArrayDimension{{LowerBound: 1, Length: 1}},
Status: pgtype.Present,
},

34
pgtype/aclitem_test.go
View File

@ -8,25 +8,25 @@ import (
"github.com/jackc/pgx/pgtype/testutil"
)
func TestAclitemTranscode(t *testing.T) {
func TestACLItemTranscode(t *testing.T) {
testutil.TestSuccessfulTranscode(t, "aclitem", []interface{}{
&pgtype.Aclitem{String: "postgres=arwdDxt/postgres", Status: pgtype.Present},
&pgtype.Aclitem{String: `postgres=arwdDxt/" tricky, ' } "" \ test user "`, Status: pgtype.Present},
&pgtype.Aclitem{Status: pgtype.Null},
&pgtype.ACLItem{String: "postgres=arwdDxt/postgres", Status: pgtype.Present},
&pgtype.ACLItem{String: `postgres=arwdDxt/" tricky, ' } "" \ test user "`, Status: pgtype.Present},
&pgtype.ACLItem{Status: pgtype.Null},
})
}
func TestAclitemSet(t *testing.T) {
func TestACLItemSet(t *testing.T) {
successfulTests := []struct {
source interface{}
result pgtype.Aclitem
result pgtype.ACLItem
}{
{source: "postgres=arwdDxt/postgres", result: pgtype.Aclitem{String: "postgres=arwdDxt/postgres", Status: pgtype.Present}},
{source: (*string)(nil), result: pgtype.Aclitem{Status: pgtype.Null}},
{source: "postgres=arwdDxt/postgres", result: pgtype.ACLItem{String: "postgres=arwdDxt/postgres", Status: pgtype.Present}},
{source: (*string)(nil), result: pgtype.ACLItem{Status: pgtype.Null}},
}
for i, tt := range successfulTests {
var d pgtype.Aclitem
var d pgtype.ACLItem
err := d.Set(tt.source)
if err != nil {
t.Errorf("%d: %v", i, err)
@ -38,17 +38,17 @@ func TestAclitemSet(t *testing.T) {
}
}
func TestAclitemAssignTo(t *testing.T) {
func TestACLItemAssignTo(t *testing.T) {
var s string
var ps *string
simpleTests := []struct {
src pgtype.Aclitem
src pgtype.ACLItem
dst interface{}
expected interface{}
}{
{src: pgtype.Aclitem{String: "postgres=arwdDxt/postgres", Status: pgtype.Present}, dst: &s, expected: "postgres=arwdDxt/postgres"},
{src: pgtype.Aclitem{Status: pgtype.Null}, dst: &ps, expected: ((*string)(nil))},
{src: pgtype.ACLItem{String: "postgres=arwdDxt/postgres", Status: pgtype.Present}, dst: &s, expected: "postgres=arwdDxt/postgres"},
{src: pgtype.ACLItem{Status: pgtype.Null}, dst: &ps, expected: ((*string)(nil))},
}
for i, tt := range simpleTests {
@ -63,11 +63,11 @@ func TestAclitemAssignTo(t *testing.T) {
}
pointerAllocTests := []struct {
src pgtype.Aclitem
src pgtype.ACLItem
dst interface{}
expected interface{}
}{
{src: pgtype.Aclitem{String: "postgres=arwdDxt/postgres", Status: pgtype.Present}, dst: &ps, expected: "postgres=arwdDxt/postgres"},
{src: pgtype.ACLItem{String: "postgres=arwdDxt/postgres", Status: pgtype.Present}, dst: &ps, expected: "postgres=arwdDxt/postgres"},
}
for i, tt := range pointerAllocTests {
@ -82,10 +82,10 @@ func TestAclitemAssignTo(t *testing.T) {
}
errorTests := []struct {
src pgtype.Aclitem
src pgtype.ACLItem
dst interface{}
}{
{src: pgtype.Aclitem{Status: pgtype.Null}, dst: &s},
{src: pgtype.ACLItem{Status: pgtype.Null}, dst: &s},
}
for i, tt := range errorTests {

8
pgtype/pgtype.go
View File

@ -35,8 +35,8 @@ const (
Int8ArrayOID = 1016
Float4ArrayOID = 1021
Float8ArrayOID = 1022
AclitemOID = 1033
AclitemArrayOID = 1034
ACLItemOID = 1033
ACLItemArrayOID = 1034
InetArrayOID = 1041
VarcharOID = 1043
DateOID = 1082
@ -206,7 +206,7 @@ var nameValues map[string]Value
func init() {
nameValues = map[string]Value{
"_aclitem": &AclitemArray{},
"_aclitem": &ACLItemArray{},
"_bool": &BoolArray{},
"_bytea": &ByteaArray{},
"_cidr": &CidrArray{},
@ -222,7 +222,7 @@ func init() {
"_timestamp": &TimestampArray{},
"_timestamptz": &TimestamptzArray{},
"_varchar": &VarcharArray{},
"aclitem": &Aclitem{},
"aclitem": &ACLItem{},
"bool": &Bool{},
"box": &Box{},
"bytea": &Bytea{},

2
pgtype/typed_array_gen.sh
View File

@ -12,7 +12,7 @@ erb pgtype_array_type=CidrArray pgtype_element_type=Cidr go_array_types=[]*net.I
erb pgtype_array_type=TextArray pgtype_element_type=Text go_array_types=[]string element_type_name=text text_null='"NULL"' binary_format=true typed_array.go.erb > text_array.go
erb pgtype_array_type=VarcharArray pgtype_element_type=Varchar go_array_types=[]string element_type_name=varchar text_null='"NULL"' binary_format=true typed_array.go.erb > varchar_array.go
erb pgtype_array_type=ByteaArray pgtype_element_type=Bytea go_array_types=[][]byte element_type_name=bytea text_null=NULL binary_format=true typed_array.go.erb > bytea_array.go
erb pgtype_array_type=AclitemArray pgtype_element_type=Aclitem go_array_types=[]string element_type_name=aclitem text_null=NULL binary_format=false typed_array.go.erb > aclitem_array.go
erb pgtype_array_type=ACLItemArray pgtype_element_type=ACLItem go_array_types=[]string element_type_name=aclitem text_null=NULL binary_format=false typed_array.go.erb > aclitem_array.go
erb pgtype_array_type=HstoreArray pgtype_element_type=Hstore go_array_types=[]map[string]string element_type_name=hstore text_null=NULL binary_format=true typed_array.go.erb > hstore_array.go
erb pgtype_array_type=NumericArray pgtype_element_type=Numeric go_array_types=[]float32,[]float64 element_type_name=numeric text_null=NULL binary_format=true typed_array.go.erb > numeric_array.go
goimports -w *_array.go