From c402e176051b9d6df32f3a8cb78cb7e97ac819fd Mon Sep 17 00:00:00 2001
From: wenzi1 <liyz23@qq.com>
Date: Wed, 14 Aug 2019 22:44:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mssql=E4=B8=AD=E7=9A=84dateti?=
 =?UTF-8?q?me=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 database/gdb/gdb_structure.go               | 5 +++++
 database/gdb/gdb_unit_z_mssql_model_test.go | 7 +++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/database/gdb/gdb_structure.go b/database/gdb/gdb_structure.go
index 3c3bffc85..d09d94412 100644
--- a/database/gdb/gdb_structure.go
+++ b/database/gdb/gdb_structure.go
@@ -8,6 +8,7 @@ package gdb
 
 import (
 	"fmt"
+	"github.com/gogf/gf/os/gtime"
 	"strings"
 
 	"github.com/gogf/gf/encoding/gbinary"
@@ -55,6 +56,10 @@ func (bs *dbBase) convertValue(fieldValue []byte, fieldType string) interface{}
 	case "bool":
 		return gconv.Bool(fieldValue)
 
+	case "datetime":
+		t, _ := gtime.StrToTime(string(fieldValue))
+		return t.String()
+
 	default:
 		// 自动识别类型, 以便默认支持更多数据库类型
 		switch {
diff --git a/database/gdb/gdb_unit_z_mssql_model_test.go b/database/gdb/gdb_unit_z_mssql_model_test.go
index 748bcf0ca..efb1387cf 100644
--- a/database/gdb/gdb_unit_z_mssql_model_test.go
+++ b/database/gdb/gdb_unit_z_mssql_model_test.go
@@ -565,7 +565,7 @@ func Test_Model_Scan_Mssql(t *testing.T) {
 			Passport   string
 			Password   string
 			NickName   string
-			CreateTime gtime.Time
+			CreateTime string
 		}
 		user := new(User)
 		err := msdb.Table(table).Where("id=1").Scan(user)
@@ -573,7 +573,7 @@ func Test_Model_Scan_Mssql(t *testing.T) {
 			gtest.Fatal(err)
 		}
 		gtest.Assert(user.NickName, "T1")
-		gtest.Assert(user.CreateTime.String(), "2018-10-10 00:01:10")
+		gtest.Assert(user.CreateTime, "2018-10-10 00:01:10")
 	})
 	gtest.Case(t, func() {
 		type User struct {
@@ -890,8 +890,7 @@ func Test_Model_Limit_Mssql(t *testing.T) {
 		gtest.Assert(len(result), 3)
 		gtest.Assert(result[0]["ID"].Int(), 1)
 		gtest.Assert(result[0]["NICKNAME"].String(), "T1")
-		gtest.Assert(result[0]["CREATE_TIME"].GTime().String(), "2018-10-10 00:01:10")
-		//gtest.Assert(result[0]["CREATE_TIME"].GTime("Y-m-d H:i:s").String(), "2018-10-10 00:01:10")
+		gtest.Assert(result[0]["CREATE_TIME"].String(), "2018-10-10 00:01:10")
 
 		gtest.Assert(result[1]["ID"].Int(), 2)
 		gtest.Assert(result[1]["NICKNAME"].String(), "T2")