gopkg/pgx
2
0
Fork 0
Code Activity

Expose EnumType directly instead of behind interface

Browse Source
This commit is contained in:
Jack Christensen
2020-05-12 10:41:50 -05:00
parent 9cdd928cb8
commit e92ee69901
2 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
enum_type.go
+16 -23
View File
@@ -4,14 +4,7 @@ import errors "golang.org/x/xerrors"
// EnumType represents a enum type. While it implements Value, this is only in service of its type conversion duties // EnumType represents a enum type. While it implements Value, this is only in service of its type conversion duties
// when registered as a data type in a ConnType. It should not be used directly as a Value. // when registered as a data type in a ConnType. It should not be used directly as a Value.
type EnumType interface { type EnumType struct {
TypeValue
// Members returns possible members of this enumeration. The returned slice must not be modified.
Members() []string
}
type enumType struct {
value string value string
status Status status Status
@@ -21,8 +14,8 @@ type enumType struct {
} }
// NewEnumType initializes a new EnumType. It retains a read-only reference to members. members must not be changed. // NewEnumType initializes a new EnumType. It retains a read-only reference to members. members must not be changed.
func NewEnumType(typeName string, members []string) EnumType { func NewEnumType(typeName string, members []string) *EnumType {
et := &enumType{typeName: typeName, members: members} et := &EnumType{typeName: typeName, members: members}
et.membersMap = make(map[string]string, len(members)) et.membersMap = make(map[string]string, len(members))
for _, m := range members { for _, m := range members {
et.membersMap[m] = m et.membersMap[m] = m
@@ -30,8 +23,8 @@ func NewEnumType(typeName string, members []string) EnumType {
return et return et
} }
func (et *enumType) NewTypeValue() Value { func (et *EnumType) NewTypeValue() Value {
return &enumType{ return &EnumType{
value: et.value, value: et.value,
status: et.status, status: et.status,
@@ -41,17 +34,17 @@ func (et *enumType) NewTypeValue() Value {
} }
} }
func (et *enumType) TypeName() string { func (et *EnumType) TypeName() string {
return et.typeName return et.typeName
} }
func (et *enumType) Members() []string { func (et *EnumType) Members() []string {
return et.members return et.members
} }
// Set assigns src to dst. Set purposely does not check that src is a member. This allows continued error free // Set assigns src to dst. Set purposely does not check that src is a member. This allows continued error free
// operation in the event the PostgreSQL enum type is modified during a connection. // operation in the event the PostgreSQL enum type is modified during a connection.
func (dst *enumType) Set(src interface{}) error { func (dst *EnumType) Set(src interface{}) error {
if src == nil { if src == nil {
dst.status = Null dst.status = Null
return nil return nil
@@ -92,7 +85,7 @@ func (dst *enumType) Set(src interface{}) error {
return nil return nil
} }
func (dst enumType) Get() interface{} { func (dst EnumType) Get() interface{} {
switch dst.status { switch dst.status {
case Present: case Present:
return dst.value return dst.value
@@ -103,7 +96,7 @@ func (dst enumType) Get() interface{} {
} }
} }
func (src *enumType) AssignTo(dst interface{}) error { func (src *EnumType) AssignTo(dst interface{}) error {
switch src.status { switch src.status {
case Present: case Present:
switch v := dst.(type) { switch v := dst.(type) {
@@ -127,11 +120,11 @@ func (src *enumType) AssignTo(dst interface{}) error {
return errors.Errorf("cannot decode %#v into %T", src, dst) return errors.Errorf("cannot decode %#v into %T", src, dst)
} }
func (enumType) PreferredResultFormat() int16 { func (EnumType) PreferredResultFormat() int16 {
return TextFormatCode return TextFormatCode
} }
func (dst *enumType) DecodeText(ci *ConnInfo, src []byte) error { func (dst *EnumType) DecodeText(ci *ConnInfo, src []byte) error {
if src == nil { if src == nil {
dst.status = Null dst.status = Null
return nil return nil
@@ -151,15 +144,15 @@ func (dst *enumType) DecodeText(ci *ConnInfo, src []byte) error {
return nil return nil
} }
func (dst *enumType) DecodeBinary(ci *ConnInfo, src []byte) error { func (dst *EnumType) DecodeBinary(ci *ConnInfo, src []byte) error {
return dst.DecodeText(ci, src) return dst.DecodeText(ci, src)
} }
func (enumType) PreferredParamFormat() int16 { func (EnumType) PreferredParamFormat() int16 {
return TextFormatCode return TextFormatCode
} }
func (src enumType) EncodeText(ci *ConnInfo, buf []byte) ([]byte, error) { func (src EnumType) EncodeText(ci *ConnInfo, buf []byte) ([]byte, error) {
switch src.status { switch src.status {
case Null: case Null:
return nil, nil return nil, nil
@@ -170,6 +163,6 @@ func (src enumType) EncodeText(ci *ConnInfo, buf []byte) ([]byte, error) {
return append(buf, src.value...), nil return append(buf, src.value...), nil
} }
func (src enumType) EncodeBinary(ci *ConnInfo, buf []byte) ([]byte, error) { func (src EnumType) EncodeBinary(ci *ConnInfo, buf []byte) ([]byte, error) {
return src.EncodeText(ci, buf) return src.EncodeText(ci, buf)
} }
enum_type_test.go
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
func setupEnum(t *testing.T, conn *pgx.Conn) pgtype.EnumType { func setupEnum(t *testing.T, conn *pgx.Conn) *pgtype.EnumType {
_, err := conn.Exec(context.Background(), "drop type if exists pgtype_enum_color;") _, err := conn.Exec(context.Background(), "drop type if exists pgtype_enum_color;")
require.NoError(t, err) require.NoError(t, err)