From 7e70597283772f90846f128c358233e72054a83c Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sat, 17 Jul 2021 17:51:59 +0800
Subject: [PATCH] Fix test

---
 convert/time.go                  |  2 +-
 dialects/mysql.go                | 47 --------------------------------
 integrations/session_get_test.go |  2 +-
 scan.go                          |  6 ++--
 4 files changed, 5 insertions(+), 52 deletions(-)

diff --git a/convert/time.go b/convert/time.go
index 696b301c..a9936b75 100644
--- a/convert/time.go
+++ b/convert/time.go
@@ -19,7 +19,7 @@ func String2Time(s string, originalLocation *time.Location, convertedLocation *t
 		dt = dt.In(convertedLocation)
 		return &dt, nil
 	} else if len(s) == 20 && s[10] == 'T' && s[19] == 'Z' {
-		dt, err := time.ParseInLocation(time.RFC3339, s, originalLocation)
+		dt, err := time.ParseInLocation("2006-01-02T15:04:05", s[:19], originalLocation)
 		if err != nil {
 			return nil, err
 		}
diff --git a/dialects/mysql.go b/dialects/mysql.go
index db45cd62..9312c071 100644
--- a/dialects/mysql.go
+++ b/dialects/mysql.go
@@ -15,7 +15,6 @@ import (
 	"strings"
 	"time"
 
-	"xorm.io/xorm/convert"
 	"xorm.io/xorm/core"
 	"xorm.io/xorm/schemas"
 )
@@ -733,52 +732,6 @@ func (p *mysqlDriver) GenScanResult(colType string) (interface{}, error) {
 	}
 }
 
-func (p *mysqlDriver) Scan(ctx *ScanContext, rows *core.Rows, types []*sql.ColumnType, scanResults ...interface{}) error {
-	var v2 = make([]interface{}, 0, len(scanResults))
-	var turnBackIdxes = make([]int, 0, 5)
-	for i, vv := range scanResults {
-		switch vv.(type) {
-		case *time.Time:
-			v2 = append(v2, &sql.NullString{})
-			turnBackIdxes = append(turnBackIdxes, i)
-		case *sql.NullTime:
-			v2 = append(v2, &sql.NullString{})
-			turnBackIdxes = append(turnBackIdxes, i)
-		default:
-			v2 = append(v2, scanResults[i])
-		}
-	}
-	if err := rows.Scan(v2...); err != nil {
-		return err
-	}
-	for _, i := range turnBackIdxes {
-		switch t := scanResults[i].(type) {
-		case *time.Time:
-			var s = *(v2[i].(*sql.NullString))
-			if !s.Valid {
-				break
-			}
-			dt, err := convert.String2Time(s.String, ctx.DBLocation, ctx.UserLocation)
-			if err != nil {
-				return err
-			}
-			*t = *dt
-		case *sql.NullTime:
-			var s = *(v2[i].(*sql.NullString))
-			if !s.Valid {
-				break
-			}
-			dt, err := convert.String2Time(s.String, ctx.DBLocation, ctx.UserLocation)
-			if err != nil {
-				return err
-			}
-			t.Time = *dt
-			t.Valid = true
-		}
-	}
-	return nil
-}
-
 type mymysqlDriver struct {
 	mysqlDriver
 }
diff --git a/integrations/session_get_test.go b/integrations/session_get_test.go
index ca894d59..b1dffe14 100644
--- a/integrations/session_get_test.go
+++ b/integrations/session_get_test.go
@@ -914,7 +914,7 @@ func TestGetTime(t *testing.T) {
 	assertSync(t, new(GetTimeStruct))
 
 	var gts = GetTimeStruct{
-		CreateTime: time.Now(),
+		CreateTime: time.Now().In(testEngine.GetTZLocation()),
 	}
 	_, err := testEngine.Insert(&gts)
 	assert.NoError(t, err)
diff --git a/scan.go b/scan.go
index 2fedd415..3896d459 100644
--- a/scan.go
+++ b/scan.go
@@ -200,14 +200,14 @@ func (engine *Engine) scan(rows *core.Rows, fields []string, types []*sql.Column
 		var replaced bool
 		var scanResult interface{}
 		switch t := v.(type) {
+		case *big.Float, *time.Time, *sql.NullTime:
+			scanResult = &sql.NullString{}
+			replaced = true
 		case sql.Scanner:
 			scanResult = t
 		case convert.Conversion:
 			scanResult = &sql.RawBytes{}
 			replaced = true
-		case *big.Float:
-			scanResult = &sql.NullString{}
-			replaced = true
 		default:
 			var useNullable = true
 			if engine.driver.Features().SupportNullable {