remove unused_code

This commit is contained in:
Lunny Xiao 2019-01-20 19:44:40 +08:00
parent e6999cce77
commit f82367b7a7
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
1 changed files with 8 additions and 13 deletions

21
rows.go
View File

@ -14,11 +14,8 @@ import (
// Rows rows wrapper a rows to // Rows rows wrapper a rows to
type Rows struct { type Rows struct {
NoTypeCheck bool
session *Session session *Session
rows *core.Rows rows *core.Rows
fields []string
beanType reflect.Type beanType reflect.Type
lastError error lastError error
} }
@ -57,13 +54,6 @@ func newRows(session *Session, bean interface{}) (*Rows, error) {
return nil, err return nil, err
} }
rows.fields, err = rows.rows.Columns()
if err != nil {
rows.lastError = err
rows.Close()
return nil, err
}
return rows, nil return rows, nil
} }
@ -90,7 +80,7 @@ func (rows *Rows) Scan(bean interface{}) error {
return rows.lastError return rows.lastError
} }
if !rows.NoTypeCheck && reflect.Indirect(reflect.ValueOf(bean)).Type() != rows.beanType { if reflect.Indirect(reflect.ValueOf(bean)).Type() != rows.beanType {
return fmt.Errorf("scan arg is incompatible type to [%v]", rows.beanType) return fmt.Errorf("scan arg is incompatible type to [%v]", rows.beanType)
} }
@ -98,13 +88,18 @@ func (rows *Rows) Scan(bean interface{}) error {
return err return err
} }
scanResults, err := rows.session.row2Slice(rows.rows, rows.fields, bean) fields, err := rows.rows.Columns()
if err != nil {
return err
}
scanResults, err := rows.session.row2Slice(rows.rows, fields, bean)
if err != nil { if err != nil {
return err return err
} }
dataStruct := rValue(bean) dataStruct := rValue(bean)
_, err = rows.session.slice2Bean(scanResults, rows.fields, bean, &dataStruct, rows.session.statement.RefTable) _, err = rows.session.slice2Bean(scanResults, fields, bean, &dataStruct, rows.session.statement.RefTable)
if err != nil { if err != nil {
return err return err
} }