From 5017cabec61433ce8393fb8c3b78a9d482c1f295 Mon Sep 17 00:00:00 2001
From: WhiteBatman <xiaolipeng.icewater@gmail.com>
Date: Sat, 23 Sep 2017 20:50:11 +0800
Subject: [PATCH] time bug fix

---
 engine.go | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/engine.go b/engine.go
index 4539f7aa..f4459cf1 100644
--- a/engine.go
+++ b/engine.go
@@ -1545,17 +1545,10 @@ func (engine *Engine) formatTime(sqlTypeName string, t time.Time) (v interface{}
 	case core.Date:
 		v = t.Format("2006-01-02")
 	case core.DateTime, core.TimeStamp:
-<<<<<<< HEAD
-		v = t.Format("2006-01-02 15:04:05")
-=======
-		if engine.dialect.DBType() == "ql" {
-			v = t
-		} else if engine.dialect.DBType() == "sqlite3" {
-			v = t.UTC().Format("2006-01-02 15:04:05")
-		} else {
-			v = t.Format("2006-01-02 15:04:05.999")
+		v = t.Format("2006-01-02 15:04:05.999")
+		if engine.dialect.DBType() == "sqlite3" {
+			v = t.UTC().Format("2006-01-02 15:04:05.999")
 		}
->>>>>>> 8c9ffa956bec4149aa6f6961ab1afe93ff93b2eb
 	case core.TimeStampz:
 		if engine.dialect.DBType() == core.MSSQL {
 			v = t.Format("2006-01-02T15:04:05.9999999Z07:00")