From 6f1318a3885efbba90ef67ab360b32e6f517f260 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 28 Jul 2021 20:53:23 +0800 Subject: [PATCH] Fix test --- dialects/mssql.go | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/dialects/mssql.go b/dialects/mssql.go index 092d7f93..3b935396 100644 --- a/dialects/mssql.go +++ b/dialects/mssql.go @@ -14,7 +14,6 @@ import ( "strings" "xorm.io/xorm/core" - "xorm.io/xorm/internal/convert" "xorm.io/xorm/schemas" ) @@ -713,35 +712,3 @@ func (p *odbcDriver) GenScanResult(colType string) (interface{}, error) { return &r, nil } } - -func (b *odbcDriver) Scan(ctx *ScanContext, rows *core.Rows, types []*sql.ColumnType, vv ...interface{}) error { - var scanResults = make([]interface{}, 0, len(types)) - var replaces = make([]bool, 0, len(types)) - var err error - for i, v := range vv { - var replaced bool - var scanResult interface{} - if types[i].DatabaseTypeName() == "NVARCHAR" { - scanResult = &sql.RawBytes{} - replaced = true - } else { - scanResult = v - } - - scanResults = append(scanResults, scanResult) - replaces = append(replaces, replaced) - } - - if err = rows.Scan(scanResults...); err != nil { - return err - } - - for i, replaced := range replaces { - if replaced { - if err = convert.Assign(vv[i], scanResults[i], ctx.DBLocation, ctx.UserLocation); err != nil { - return err - } - } - } - return nil -}