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

Standardize scanner and valuer for int types

query-exec-mode
Jack Christensen 2022-01-08 21:41:08 -06:00
parent dc05bd9fee
commit 8aaf235595
2 changed files with 66 additions and 42 deletions

76
pgtype/int.go
View File

@ -13,7 +13,11 @@ import (
) )
type Int64Scanner interface { type Int64Scanner interface {
ScanInt64(v int64, valid bool) error ScanInt64(Int8) error
}
type Int64Valuer interface {
Int64Value() (Int8, error)
} }
type Int2 struct { type Int2 struct {
@ -22,23 +26,27 @@ type Int2 struct {
} }
// ScanInt64 implements the Int64Scanner interface. // ScanInt64 implements the Int64Scanner interface.
func (dst *Int2) ScanInt64(n int64, valid bool) error { func (dst *Int2) ScanInt64(n Int8) error {
if !valid { if !n.Valid {
*dst = Int2{} *dst = Int2{}
return nil return nil
} }
if n < math.MinInt16 { if n.Int < math.MinInt16 {
return fmt.Errorf("%d is greater than maximum value for Int2", n) return fmt.Errorf("%d is greater than maximum value for Int2", n.Int)
} }
if n > math.MaxInt16 { if n.Int > math.MaxInt16 {
return fmt.Errorf("%d is greater than maximum value for Int2", n) return fmt.Errorf("%d is greater than maximum value for Int2", n.Int)
} }
*dst = Int2{Int: int16(n), Valid: true} *dst = Int2{Int: int16(n.Int), Valid: true}
return nil return nil
} }
func (n Int2) Int64Value() (Int8, error) {
return Int8{Int: int64(n.Int), Valid: n.Valid}, nil
}
// Scan implements the database/sql Scanner interface. // Scan implements the database/sql Scanner interface.
func (dst *Int2) Scan(src interface{}) error { func (dst *Int2) Scan(src interface{}) error {
if src == nil { if src == nil {
@ -511,7 +519,7 @@ func (scanPlanBinaryInt2ToInt64Scanner) Scan(ci *ConnInfo, oid uint32, formatCod
} }
if src == nil { if src == nil {
return s.ScanInt64(0, false) return s.ScanInt64(Int8{})
} }
if len(src) != 2 { if len(src) != 2 {
@ -520,7 +528,7 @@ func (scanPlanBinaryInt2ToInt64Scanner) Scan(ci *ConnInfo, oid uint32, formatCod
n := int64(binary.BigEndian.Uint16(src)) n := int64(binary.BigEndian.Uint16(src))
return s.ScanInt64(n, true) return s.ScanInt64(Int8{Int: n, Valid: true})
} }
type Int4 struct { type Int4 struct {
@ -529,23 +537,27 @@ type Int4 struct {
} }
// ScanInt64 implements the Int64Scanner interface. // ScanInt64 implements the Int64Scanner interface.
func (dst *Int4) ScanInt64(n int64, valid bool) error { func (dst *Int4) ScanInt64(n Int8) error {
if !valid { if !n.Valid {
*dst = Int4{} *dst = Int4{}
return nil return nil
} }
if n < math.MinInt32 { if n.Int < math.MinInt32 {
return fmt.Errorf("%d is greater than maximum value for Int4", n) return fmt.Errorf("%d is greater than maximum value for Int4", n.Int)
} }
if n > math.MaxInt32 { if n.Int > math.MaxInt32 {
return fmt.Errorf("%d is greater than maximum value for Int4", n) return fmt.Errorf("%d is greater than maximum value for Int4", n.Int)
} }
*dst = Int4{Int: int32(n), Valid: true} *dst = Int4{Int: int32(n.Int), Valid: true}
return nil return nil
} }
func (n Int4) Int64Value() (Int8, error) {
return Int8{Int: int64(n.Int), Valid: n.Valid}, nil
}
// Scan implements the database/sql Scanner interface. // Scan implements the database/sql Scanner interface.
func (dst *Int4) Scan(src interface{}) error { func (dst *Int4) Scan(src interface{}) error {
if src == nil { if src == nil {
@ -1029,7 +1041,7 @@ func (scanPlanBinaryInt4ToInt64Scanner) Scan(ci *ConnInfo, oid uint32, formatCod
} }
if src == nil { if src == nil {
return s.ScanInt64(0, false) return s.ScanInt64(Int8{})
} }
if len(src) != 4 { if len(src) != 4 {
@ -1038,7 +1050,7 @@ func (scanPlanBinaryInt4ToInt64Scanner) Scan(ci *ConnInfo, oid uint32, formatCod
n := int64(binary.BigEndian.Uint32(src)) n := int64(binary.BigEndian.Uint32(src))
return s.ScanInt64(n, true) return s.ScanInt64(Int8{Int: n, Valid: true})
} }
type Int8 struct { type Int8 struct {
@ -1047,23 +1059,27 @@ type Int8 struct {
} }
// ScanInt64 implements the Int64Scanner interface. // ScanInt64 implements the Int64Scanner interface.
func (dst *Int8) ScanInt64(n int64, valid bool) error { func (dst *Int8) ScanInt64(n Int8) error {
if !valid { if !n.Valid {
*dst = Int8{} *dst = Int8{}
return nil return nil
} }
if n < math.MinInt64 { if n.Int < math.MinInt64 {
return fmt.Errorf("%d is greater than maximum value for Int8", n) return fmt.Errorf("%d is greater than maximum value for Int8", n.Int)
} }
if n > math.MaxInt64 { if n.Int > math.MaxInt64 {
return fmt.Errorf("%d is greater than maximum value for Int8", n) return fmt.Errorf("%d is greater than maximum value for Int8", n.Int)
} }
*dst = Int8{Int: int64(n), Valid: true} *dst = Int8{Int: int64(n.Int), Valid: true}
return nil return nil
} }
func (n Int8) Int64Value() (Int8, error) {
return Int8{Int: int64(n.Int), Valid: n.Valid}, nil
}
// Scan implements the database/sql Scanner interface. // Scan implements the database/sql Scanner interface.
func (dst *Int8) Scan(src interface{}) error { func (dst *Int8) Scan(src interface{}) error {
if src == nil { if src == nil {
@ -1569,7 +1585,7 @@ func (scanPlanBinaryInt8ToInt64Scanner) Scan(ci *ConnInfo, oid uint32, formatCod
} }
if src == nil { if src == nil {
return s.ScanInt64(0, false) return s.ScanInt64(Int8{})
} }
if len(src) != 8 { if len(src) != 8 {
@ -1578,7 +1594,7 @@ func (scanPlanBinaryInt8ToInt64Scanner) Scan(ci *ConnInfo, oid uint32, formatCod
n := int64(binary.BigEndian.Uint64(src)) n := int64(binary.BigEndian.Uint64(src))
return s.ScanInt64(n, true) return s.ScanInt64(Int8{Int: n, Valid: true})
} }
type scanPlanTextAnyToInt8 struct{} type scanPlanTextAnyToInt8 struct{}
@ -1800,7 +1816,7 @@ func (scanPlanTextAnyToInt64Scanner) Scan(ci *ConnInfo, oid uint32, formatCode i
} }
if src == nil { if src == nil {
return s.ScanInt64(0, false) return s.ScanInt64(Int8{})
} }
n, err := strconv.ParseInt(string(src), 10, 64) n, err := strconv.ParseInt(string(src), 10, 64)
@ -1808,7 +1824,7 @@ func (scanPlanTextAnyToInt64Scanner) Scan(ci *ConnInfo, oid uint32, formatCode i
return err return err
} }
err = s.ScanInt64(n, true) err = s.ScanInt64(Int8{Int: n, Valid: true})
if err != nil { if err != nil {
return err return err
} }

32
pgtype/int.go.erb
View File

@ -11,7 +11,11 @@ import (
) )
type Int64Scanner interface { type Int64Scanner interface {
ScanInt64(v int64, valid bool) error ScanInt64(Int8) error
}
type Int64Valuer interface {
Int64Value() (Int8, error)
} }
@ -23,23 +27,27 @@ type Int<%= pg_byte_size %> struct {
} }
// ScanInt64 implements the Int64Scanner interface. // ScanInt64 implements the Int64Scanner interface.
func (dst *Int<%= pg_byte_size %>) ScanInt64(n int64, valid bool) error { func (dst *Int<%= pg_byte_size %>) ScanInt64(n Int8) error {
if !valid { if !n.Valid {
*dst = Int<%= pg_byte_size %>{} *dst = Int<%= pg_byte_size %>{}
return nil return nil
} }
if n < math.MinInt<%= pg_bit_size %> { if n.Int < math.MinInt<%= pg_bit_size %> {
return fmt.Errorf("%d is greater than maximum value for Int<%= pg_byte_size %>", n) return fmt.Errorf("%d is greater than maximum value for Int<%= pg_byte_size %>", n.Int)
} }
if n > math.MaxInt<%= pg_bit_size %> { if n.Int > math.MaxInt<%= pg_bit_size %> {
return fmt.Errorf("%d is greater than maximum value for Int<%= pg_byte_size %>", n) return fmt.Errorf("%d is greater than maximum value for Int<%= pg_byte_size %>", n.Int)
} }
*dst = Int<%= pg_byte_size %>{Int: int<%= pg_bit_size %>(n), Valid: true} *dst = Int<%= pg_byte_size %>{Int: int<%= pg_bit_size %>(n.Int), Valid: true}
return nil return nil
} }
func (n Int<%= pg_byte_size %>) Int64Value() (Int8, error) {
return Int8{Int: int64(n.Int), Valid: n.Valid}, nil
}
// Scan implements the database/sql Scanner interface. // Scan implements the database/sql Scanner interface.
func (dst *Int<%= pg_byte_size %>) Scan(src interface{}) error { func (dst *Int<%= pg_byte_size %>) Scan(src interface{}) error {
if src == nil { if src == nil {
@ -397,7 +405,7 @@ func (scanPlanBinaryInt<%= pg_byte_size %>ToInt64Scanner) Scan(ci *ConnInfo, oid
} }
if src == nil { if src == nil {
return s.ScanInt64(0, false) return s.ScanInt64(Int8{})
} }
if len(src) != <%= pg_byte_size %> { if len(src) != <%= pg_byte_size %> {
@ -407,7 +415,7 @@ func (scanPlanBinaryInt<%= pg_byte_size %>ToInt64Scanner) Scan(ci *ConnInfo, oid
n := int64(binary.BigEndian.Uint<%= pg_bit_size %>(src)) n := int64(binary.BigEndian.Uint<%= pg_bit_size %>(src))
return s.ScanInt64(n, true) return s.ScanInt64(Int8{Int: n, Valid: true})
} }
<% end %> <% end %>
@ -471,7 +479,7 @@ func (scanPlanTextAnyToInt64Scanner) Scan(ci *ConnInfo, oid uint32, formatCode i
} }
if src == nil { if src == nil {
return s.ScanInt64(0, false) return s.ScanInt64(Int8{})
} }
n, err := strconv.ParseInt(string(src), 10, 64) n, err := strconv.ParseInt(string(src), 10, 64)
@ -479,7 +487,7 @@ func (scanPlanTextAnyToInt64Scanner) Scan(ci *ConnInfo, oid uint32, formatCode i
return err return err
} }
err = s.ScanInt64(n, true) err = s.ScanInt64(Int8{Int: n, Valid: true})
if err != nil { if err != nil {
return err return err
} }