From fb388c53c7b6b2923c2f1189562757aa4c9ad36c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= Date: Fri, 16 Jun 2023 08:40:15 +0800 Subject: [PATCH] =?UTF-8?q?enhance(types):=E6=97=A5=E6=9C=9F=E5=8C=BA?= =?UTF-8?q?=E9=97=B4=E8=8C=83=E5=9B=B4=E5=A2=9E=E5=8A=A0=E5=B8=B8=E7=94=A8?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E7=9A=84=E6=98=93=E7=94=A8=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- types/daterange.go | 10 ++++++---- types/datetimerange.go | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/types/daterange.go b/types/daterange.go index 5ac1089..ef46d3f 100644 --- a/types/daterange.go +++ b/types/daterange.go @@ -91,9 +91,10 @@ func (dr *DateRange) UnmarshalJSON(data []byte) error { return nil } -func (dr *DateRange) SetLower(lower Date, bound pgtype.BoundType) { +func (dr *DateRange) SetLower(lower Date, bound ...pgtype.BoundType) { + bound = append(bound, pgtype.Inclusive) dr.Range.Lower = lower - dr.Range.LowerType = bound + dr.Range.LowerType = bound[0] } func (dr *DateRange) SetLowerUnbounded() { @@ -101,9 +102,10 @@ func (dr *DateRange) SetLowerUnbounded() { dr.Range.LowerType = pgtype.Unbounded } -func (dr *DateRange) SetUpper(upper Date, bound pgtype.BoundType) { +func (dr *DateRange) SetUpper(upper Date, bound ...pgtype.BoundType) { + bound = append(bound, pgtype.Inclusive) dr.Range.Upper = upper - dr.Range.UpperType = bound + dr.Range.UpperType = bound[0] } func (dr *DateRange) SetUpperUnbounded() { diff --git a/types/datetimerange.go b/types/datetimerange.go index 419a035..5927d8d 100644 --- a/types/datetimerange.go +++ b/types/datetimerange.go @@ -91,9 +91,10 @@ func (dr *DateTimeRange) UnmarshalJSON(data []byte) error { return nil } -func (dr *DateTimeRange) SetLower(lower DateTime, bound pgtype.BoundType) { +func (dr *DateTimeRange) SetLower(lower DateTime, bound ...pgtype.BoundType) { + bound = append(bound, pgtype.Inclusive) dr.Range.Lower = lower - dr.Range.LowerType = bound + dr.Range.LowerType = bound[0] } func (dr *DateTimeRange) SetLowerUnbounded() { @@ -101,9 +102,10 @@ func (dr *DateTimeRange) SetLowerUnbounded() { dr.Range.LowerType = pgtype.Unbounded } -func (dr *DateTimeRange) SetUpper(upper DateTime, bound pgtype.BoundType) { +func (dr *DateTimeRange) SetUpper(upper DateTime, bound ...pgtype.BoundType) { + bound = append(bound, pgtype.Inclusive) dr.Range.Upper = upper - dr.Range.UpperType = bound + dr.Range.UpperType = bound[0] } func (dr *DateTimeRange) SetUpperUnbounded() {