fix encoding date value #12

conn_test.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/stretchr/testify/suite"
 	"net/http"
+	"time"
 )
 
 var (
@@ -83,6 +84,14 @@ func (s *connSuite) TestExec() {
 			"",
 			[]interface{}{int64(3), Array([]int16{1, 2})},
 		},
+		{
+			"INSERT INTO data (d, t) VALUES (?, ?)",
+			"",
+			[]interface{}{
+				Date(time.Date(2016, 4, 4, 0, 0, 0, 0, time.Local)),
+				time.Date(2016, 4, 4, 0, 0, 0, 0, time.Local),
+			},
+		},
 	}
 	for _, tc := range testCases {
 		result, err := s.conn.Exec(tc.query, tc.args...)

encoder.go

@@ -72,7 +72,7 @@ func (e *textEncoder) Encode(value driver.Value) string {
 	case []byte:
 		return string(v)
 	case time.Time:
-		return quote(formatTime(v))
+		return formatTime(v)
 	}
 
 	vv := reflect.ValueOf(value)

encoder_test.go

@@ -29,13 +29,13 @@ func TestTextEncoder(t *testing.T) {
 		{float32(1), "1"},
 		{float64(1), "1"},
 		{dt, "'2011-03-06 06:20:00'"},
-		{d, "'2012-05-31'"},
+		{d, "'2012-05-31 00:00:00'"},
 		{"hello", "'hello'"},
 		{[]byte("hello"), "hello"},
 		{`\\'hello`, `'\\\\\'hello'`},
 		{[]byte(`\\'hello`), `\\'hello`},
 		{[]int32{1, 2}, "[1,2]"},
-		{&d, "'2012-05-31'"},
+		{&d, "'2012-05-31 00:00:00'"},
 	}
 
 	enc := new(textEncoder)

helpers.go

@@ -33,11 +33,11 @@ func unqoute(s string) string {
 }
 
 func formatTime(value time.Time) string {
-	h, m, s := value.Clock()
-	if (h + m + s + value.Nanosecond()) == 0 {
-		return value.Format(dateFormat)
-	}
-	return value.Format(timeFormat)
+	return quote(value.Format(timeFormat))
+}
+
+func formatDate(value time.Time) string {
+	return quote(value.Format(dateFormat))
 }
 
 func readResponse(response *http.Response) (result []byte, err error) {

types.go

@@ -11,9 +11,8 @@ func Array(v interface{}) driver.Valuer {
 }
 
 // Date returns date for t
-func Date(t time.Time) time.Time {
-	y, m, d := t.Date()
-	return time.Date(y, m, d, 0, 0, 0, 0, t.Location())
+func Date(t time.Time) driver.Valuer {
+	return date(t)
 }
 
 type array struct {
@@ -24,3 +23,10 @@ type array struct {
 func (a array) Value() (driver.Value, error) {
 	return []byte(textEncode.Encode(a.v)), nil
 }
+
+type date time.Time
+
+// Value implements driver.Valuer
+func (d date) Value() (driver.Value, error) {
+	return []byte(formatDate(time.Time(d))), nil
+}

types_test.go

@@ -31,7 +31,9 @@ func TestArray(t *testing.T) {
 }
 
 func TestDate(t *testing.T) {
-	dt := time.Date(2016, 4, 4, 11, 22, 33, 0, time.Local)
 	d := time.Date(2016, 4, 4, 0, 0, 0, 0, time.Local)
-	assert.Equal(t, d, Date(dt))
+	dv, err := Date(d).Value()
+	if assert.NoError(t, err) {
+		assert.Equal(t, []byte("'2016-04-04'"), dv)
+	}
 }