From 27235499b69ad95c495cfacf3c38bbd543870006 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 6 Jul 2021 16:41:11 +0800 Subject: [PATCH] fix test --- dialects/sqlite3.go | 6 ------ session.go | 2 +- session_query.go | 8 ++++++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dialects/sqlite3.go b/dialects/sqlite3.go index a43cccaf..fb788fb9 100644 --- a/dialects/sqlite3.go +++ b/dialects/sqlite3.go @@ -582,9 +582,3 @@ func (p *sqlite3Driver) GenScanResult(colType string) (interface{}, error) { return &r, nil } } - -func (b *sqlite3Driver) Features() DriverFeatures { - return DriverFeatures{ - SupportNullable: false, - } -} diff --git a/session.go b/session.go index f080b276..b402f645 100644 --- a/session.go +++ b/session.go @@ -471,7 +471,7 @@ func (session *Session) row2Slice(rows *core.Rows, types []*sql.ColumnType, fiel return nil, err } - if err := session.engine.scan(rows, types, scanResults...); err != nil { + if err := session.engine.scan(rows, fields, types, scanResults...); err != nil { return nil, err } diff --git a/session_query.go b/session_query.go index 07997cdd..dbbd5eeb 100644 --- a/session_query.go +++ b/session_query.go @@ -47,11 +47,15 @@ func (session *Session) rows2Strings(rows *core.Rows) (resultsSlice []map[string return nil, err } for rows.Next() { - result, err := session.engine.row2mapStr(rows, types, fields) + result, err := session.engine.scanStringInterface(rows, types) if err != nil { return nil, err } - resultsSlice = append(resultsSlice, result) + var res = make(map[string]string) + for i, r := range result { + res[fields[i]] = r.(*sql.NullString).String + } + resultsSlice = append(resultsSlice, res) } return resultsSlice, nil