returned Date type for proton date (#38)

timeplus-io · Jan 11, 2023 · 057ab1e · 057ab1e
1 parent 775922b
commit 057ab1e
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 10 deletions.
diff --git a/lib/column/column_gen.go b/lib/column/column_gen.go
diff --git a/lib/column/date.go b/lib/column/date.go
@@ -23,6 +23,7 @@ import (
 	"time"
 
 	"github.com/timeplus-io/proton-go-driver/v2/lib/binary"
+	"github.com/timeplus-io/proton-go-driver/v2/types"
 )
 
 var (
@@ -39,7 +40,7 @@ func (dt *Date) Type() Type {
 }
 
 func (col *Date) ScanType() reflect.Type {
-	return scanTypeTime
+	return scanTypeDate
 }
 
 func (dt *Date) Rows() int {
@@ -57,10 +58,10 @@ func (dt *Date) Row(i int, ptr bool) interface{} {
 func (dt *Date) ScanRow(dest interface{}, row int) error {
 	switch d := dest.(type) {
 	case *time.Time:
-		*d = dt.row(row)
+		*d = dt.row(row).Time
 	case **time.Time:
 		*d = new(time.Time)
-		**d = dt.row(row)
+		**d = dt.row(row).Time
 	default:
 		return &ColumnConverterError{
 			Op:   "ScanRow",
@@ -140,8 +141,8 @@ func (dt *Date) Encode(encoder *binary.Encoder) error {
 	return dt.values.Encode(encoder)
 }
 
-func (dt *Date) row(i int) time.Time {
-	return time.Unix(int64(dt.values[i])*secInDay, 0).UTC()
+func (dt *Date) row(i int) types.Date {
+	return types.Date{Time: time.Unix(int64(dt.values[i])*secInDay, 0).UTC()}
 }
 
 var _ Interface = (*Date)(nil)
diff --git a/lib/column/date32.go b/lib/column/date32.go
@@ -23,6 +23,7 @@ import (
 	"time"
 
 	"github.com/timeplus-io/proton-go-driver/v2/lib/binary"
+	"github.com/timeplus-io/proton-go-driver/v2/types"
 )
 
 var (
@@ -39,7 +40,7 @@ func (dt *Date32) Type() Type {
 }
 
 func (col *Date32) ScanType() reflect.Type {
-	return scanTypeTime
+	return scanTypeDate
 }
 
 func (dt *Date32) Rows() int {
@@ -57,10 +58,10 @@ func (dt *Date32) Row(i int, ptr bool) interface{} {
 func (dt *Date32) ScanRow(dest interface{}, row int) error {
 	switch d := dest.(type) {
 	case *time.Time:
-		*d = dt.row(row)
+		*d = dt.row(row).Time
 	case **time.Time:
 		*d = new(time.Time)
-		**d = dt.row(row)
+		**d = dt.row(row).Time
 	default:
 		return &ColumnConverterError{
 			Op:   "ScanRow",
@@ -140,8 +141,8 @@ func (dt *Date32) Encode(encoder *binary.Encoder) error {
 	return dt.values.Encode(encoder)
 }
 
-func (dt *Date32) row(i int) time.Time {
-	return time.Unix((int64(dt.values[i]) * secInDay), 0).UTC()
+func (dt *Date32) row(i int) types.Date {
+	return types.Date{Time: time.Unix((int64(dt.values[i]) * secInDay), 0).UTC()}
 }
 
 func timeToInt32(t time.Time) int32 {

diff --git a/types/date.go b/types/date.go
@@ -0,0 +1,14 @@
+package types
+
+import (
+	"fmt"
+	"time"
+)
+
+type Date struct {
+	time.Time
+}
+
+func (d Date) MarshalJSON() ([]byte, error) {
+	return []byte(fmt.Sprintf("\"%s\"", d.Format("2006-01-02"))), nil
+}
diff --git a/types/datetime.go b/types/datetime.go
@@ -0,0 +1,14 @@
+package types
+
+import (
+	"fmt"
+	"time"
+)
+
+type Datetime struct {
+	time.Time
+}
+
+func (dt Datetime) MarshalJSON() ([]byte, error) {
+	return []byte(fmt.Sprintf("\"%s\"", dt.Format("2006-01-02 15:04:05"))), nil
+}