gopkg/pgx
2
0
Fork 0
Code Activity

Rename pgtype.None to pgtype.Finite

Browse Source
This commit is contained in:
Jack Christensen
2022-02-21 09:25:30 -06:00
parent 1f2f239d09
commit f3defbc150
8 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pgtype/builtin_wrappers.go
+3 -3
View File
@@ -368,7 +368,7 @@ func (w *timeWrapper) ScanDate(v Date) error {
} }
switch v.InfinityModifier { switch v.InfinityModifier {
case None: case Finite:
*w = timeWrapper(v.Time) *w = timeWrapper(v.Time)
return nil return nil
case Infinity: case Infinity:
@@ -390,7 +390,7 @@ func (w *timeWrapper) ScanTimestamp(v Timestamp) error {
} }
switch v.InfinityModifier { switch v.InfinityModifier {
case None: case Finite:
*w = timeWrapper(v.Time) *w = timeWrapper(v.Time)
return nil return nil
case Infinity: case Infinity:
@@ -412,7 +412,7 @@ func (w *timeWrapper) ScanTimestamptz(v Timestamptz) error {
} }
switch v.InfinityModifier { switch v.InfinityModifier {
case None: case Finite:
*w = timeWrapper(v.Time) *w = timeWrapper(v.Time)
return nil return nil
case Infinity: case Infinity:
pgtype/date.go
+5 -5
View File
@@ -62,7 +62,7 @@ func (src Date) Value() (driver.Value, error) {
return nil, nil return nil, nil
} }
if src.InfinityModifier != None { if src.InfinityModifier != Finite {
return src.InfinityModifier.String(), nil return src.InfinityModifier.String(), nil
} }
return src.Time, nil return src.Time, nil
@@ -76,7 +76,7 @@ func (src Date) MarshalJSON() ([]byte, error) {
var s string var s string
switch src.InfinityModifier { switch src.InfinityModifier {
case None: case Finite:
s = src.Time.Format("2006-01-02") s = src.Time.Format("2006-01-02")
case Infinity: case Infinity:
s = "infinity" s = "infinity"
@@ -155,7 +155,7 @@ func (encodePlanDateCodecBinary) Encode(value interface{}, buf []byte) (newBuf [
var daysSinceDateEpoch int32 var daysSinceDateEpoch int32
switch date.InfinityModifier { switch date.InfinityModifier {
case None: case Finite:
tUnix := time.Date(date.Time.Year(), date.Time.Month(), date.Time.Day(), 0, 0, 0, 0, time.UTC).Unix() tUnix := time.Date(date.Time.Year(), date.Time.Month(), date.Time.Day(), 0, 0, 0, 0, time.UTC).Unix()
dateEpoch := time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC).Unix() dateEpoch := time.Date(2000, 1, 1, 0, 0, 0, 0, time.UTC).Unix()
@@ -185,7 +185,7 @@ func (encodePlanDateCodecText) Encode(value interface{}, buf []byte) (newBuf []b
var s string var s string
switch date.InfinityModifier { switch date.InfinityModifier {
case None: case Finite:
s = date.Time.Format("2006-01-02") s = date.Time.Format("2006-01-02")
case Infinity: case Infinity:
s = "infinity" s = "infinity"
@@ -282,7 +282,7 @@ func (c DateCodec) DecodeValue(m *Map, oid uint32, format int16, src []byte) (in
if date.Valid { if date.Valid {
switch date.InfinityModifier { switch date.InfinityModifier {
case None: case Finite:
return date.Time, nil return date.Time, nil
case Infinity: case Infinity:
return "infinity", nil return "infinity", nil
pgtype/numeric_test.go
+1 -1
View File
@@ -42,7 +42,7 @@ func isExpectedEqNumeric(a interface{}) func(interface{}) bool {
} }
// If NaN or InfinityModifier are set then Int and Exp don't matter. // If NaN or InfinityModifier are set then Int and Exp don't matter.
if aa.NaN || aa.InfinityModifier != pgtype.None { if aa.NaN || aa.InfinityModifier != pgtype.Finite {
return true return true
} }
pgtype/pgtype.go
+3 -3
View File
@@ -109,14 +109,14 @@ type InfinityModifier int8
const ( const (
Infinity InfinityModifier = 1 Infinity InfinityModifier = 1
None InfinityModifier = 0 Finite InfinityModifier = 0
NegativeInfinity InfinityModifier = -Infinity NegativeInfinity InfinityModifier = -Infinity
) )
func (im InfinityModifier) String() string { func (im InfinityModifier) String() string {
switch im { switch im {
case None: case Finite:
return "none" return "finite"
case Infinity: case Infinity:
return "infinity" return "infinity"
case NegativeInfinity: case NegativeInfinity:
pgtype/timestamp.go
+5 -5
View File
@@ -59,7 +59,7 @@ func (ts Timestamp) Value() (driver.Value, error) {
return nil, nil return nil, nil
} }
if ts.InfinityModifier != None { if ts.InfinityModifier != Finite {
return ts.InfinityModifier.String(), nil return ts.InfinityModifier.String(), nil
} }
return ts.Time, nil return ts.Time, nil
@@ -104,7 +104,7 @@ func (encodePlanTimestampCodecBinary) Encode(value interface{}, buf []byte) (new
var microsecSinceY2K int64 var microsecSinceY2K int64
switch ts.InfinityModifier { switch ts.InfinityModifier {
case None: case Finite:
t := discardTimeZone(ts.Time) t := discardTimeZone(ts.Time)
microsecSinceUnixEpoch := t.Unix()*1000000 + int64(t.Nanosecond())/1000 microsecSinceUnixEpoch := t.Unix()*1000000 + int64(t.Nanosecond())/1000
microsecSinceY2K = microsecSinceUnixEpoch - microsecFromUnixEpochToY2K microsecSinceY2K = microsecSinceUnixEpoch - microsecFromUnixEpochToY2K
@@ -130,7 +130,7 @@ func (encodePlanTimestampCodecText) Encode(value interface{}, buf []byte) (newBu
var s string var s string
switch ts.InfinityModifier { switch ts.InfinityModifier {
case None: case Finite:
t := discardTimeZone(ts.Time) t := discardTimeZone(ts.Time)
s = t.Truncate(time.Microsecond).Format(pgTimestampFormat) s = t.Truncate(time.Microsecond).Format(pgTimestampFormat)
case Infinity: case Infinity:
@@ -241,7 +241,7 @@ func (c TimestampCodec) DecodeDatabaseSQLValue(m *Map, oid uint32, format int16,
return nil, err return nil, err
} }
if ts.InfinityModifier != None { if ts.InfinityModifier != Finite {
return ts.InfinityModifier.String(), nil return ts.InfinityModifier.String(), nil
} }
@@ -259,7 +259,7 @@ func (c TimestampCodec) DecodeValue(m *Map, oid uint32, format int16, src []byte
return nil, err return nil, err
} }
if ts.InfinityModifier != None { if ts.InfinityModifier != Finite {
return ts.InfinityModifier, nil return ts.InfinityModifier, nil
} }
pgtype/timestamptz.go
+6 -6
View File
@@ -68,7 +68,7 @@ func (tstz Timestamptz) Value() (driver.Value, error) {
return nil, nil return nil, nil
} }
if tstz.InfinityModifier != None { if tstz.InfinityModifier != Finite {
return tstz.InfinityModifier.String(), nil return tstz.InfinityModifier.String(), nil
} }
return tstz.Time, nil return tstz.Time, nil
@@ -82,7 +82,7 @@ func (tstz Timestamptz) MarshalJSON() ([]byte, error) {
var s string var s string
switch tstz.InfinityModifier { switch tstz.InfinityModifier {
case None: case Finite:
s = tstz.Time.Format(time.RFC3339Nano) s = tstz.Time.Format(time.RFC3339Nano)
case Infinity: case Infinity:
s = "infinity" s = "infinity"
@@ -162,7 +162,7 @@ func (encodePlanTimestamptzCodecBinary) Encode(value interface{}, buf []byte) (n
var microsecSinceY2K int64 var microsecSinceY2K int64
switch ts.InfinityModifier { switch ts.InfinityModifier {
case None: case Finite:
microsecSinceUnixEpoch := ts.Time.Unix()*1000000 + int64(ts.Time.Nanosecond())/1000 microsecSinceUnixEpoch := ts.Time.Unix()*1000000 + int64(ts.Time.Nanosecond())/1000
microsecSinceY2K = microsecSinceUnixEpoch - microsecFromUnixEpochToY2K microsecSinceY2K = microsecSinceUnixEpoch - microsecFromUnixEpochToY2K
case Infinity: case Infinity:
@@ -187,7 +187,7 @@ func (encodePlanTimestamptzCodecText) Encode(value interface{}, buf []byte) (new
var s string var s string
switch ts.InfinityModifier { switch ts.InfinityModifier {
case None: case Finite:
s = ts.Time.UTC().Truncate(time.Microsecond).Format(pgTimestamptzSecondFormat) s = ts.Time.UTC().Truncate(time.Microsecond).Format(pgTimestamptzSecondFormat)
case Infinity: case Infinity:
s = "infinity" s = "infinity"
@@ -298,7 +298,7 @@ func (c TimestamptzCodec) DecodeDatabaseSQLValue(m *Map, oid uint32, format int1
return nil, err return nil, err
} }
if tstz.InfinityModifier != None { if tstz.InfinityModifier != Finite {
return tstz.InfinityModifier.String(), nil return tstz.InfinityModifier.String(), nil
} }
@@ -316,7 +316,7 @@ func (c TimestamptzCodec) DecodeValue(m *Map, oid uint32, format int16, src []by
return nil, err return nil, err
} }
if tstz.InfinityModifier != None { if tstz.InfinityModifier != Finite {
return tstz.InfinityModifier, nil return tstz.InfinityModifier, nil
} }
pgtype/zeronull/timestamp.go
+1 -1
View File
@@ -19,7 +19,7 @@ func (ts *Timestamp) ScanTimestamp(v pgtype.Timestamp) error {
} }
switch v.InfinityModifier { switch v.InfinityModifier {
case pgtype.None: case pgtype.Finite:
*ts = Timestamp(v.Time) *ts = Timestamp(v.Time)
return nil return nil
case pgtype.Infinity: case pgtype.Infinity:
pgtype/zeronull/timestamptz.go
+1 -1
View File
@@ -19,7 +19,7 @@ func (ts *Timestamptz) ScanTimestamptz(v pgtype.Timestamptz) error {
} }
switch v.InfinityModifier { switch v.InfinityModifier {
case pgtype.None: case pgtype.Finite:
*ts = Timestamptz(v.Time) *ts = Timestamptz(v.Time)
return nil return nil
case pgtype.Infinity: case pgtype.Infinity: