ramsql: format dates correctly

driver/stmt.go

@@ -6,6 +6,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/proullon/ramsql/engine/log"
 )
@@ -178,16 +179,26 @@ func replaceArguments(query string, args []driver.Value) string {
 	return replacedQuery
 }
 
+const mysqlFormat = `2006-01-02 15:04:05.999999`
+
 func replaceArgumentsODBC(query string, args []driver.Value) string {
 	var finalQuery string
 
 	queryParts := strings.Split(query, "?")
 	finalQuery = queryParts[0]
 	for i := range args {
-		arg := fmt.Sprintf("%v", args[i])
-		_, ok := args[i].(string)
-		if ok && !strings.HasSuffix(query, "'") {
-			arg = "$$" + arg + "$$"
+		var arg string
+		switch v := args[i].(type) {
+		case time.Time:
+			arg = v.Format(mysqlFormat)
+		case string:
+			if !strings.HasSuffix(query, "'") {
+				arg = "$$" + v + "$$"
+			} else {
+				arg = v
+			}
+		default:
+			arg = fmt.Sprintf("%v", args[i])
 		}
 		finalQuery += arg
 		finalQuery += queryParts[i+1]

engine/parser/date.go

@@ -13,9 +13,16 @@ const DateShortFormat = "2006-Jan-02"
 
 const DateNumberFormat = "2006-01-02"
 
+const DataMysqlFormat = `2006-01-02 15:04:05.999999`
+
 // ParseDate intends to parse all SQL date format
 func ParseDate(data string) (*time.Time, error) {
-	t, err := time.Parse(DateLongFormat, data)
+	t, err := time.Parse(DataMysqlFormat, data)
+	if err == nil {
+		return &t, nil
+	}
+
+	t, err = time.Parse(DateLongFormat, data)
 	if err == nil {
 		return &t, nil
 	}