Skip to content
This repository has been archived by the owner on Sep 7, 2021. It is now read-only.
This repository is currently being migrated. It's locked while the migration is in progress.

Commit

Permalink
remove unused_code (#1200)
Browse files Browse the repository at this point in the history
  • Loading branch information
lunny committed Jan 20, 2019
1 parent e6999cc commit e1f788f
Showing 1 changed file with 8 additions and 13 deletions.
21 changes: 8 additions & 13 deletions rows.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,8 @@ import (

// Rows rows wrapper a rows to
type Rows struct {
NoTypeCheck bool

session *Session
rows *core.Rows
fields []string
beanType reflect.Type
lastError error
}
Expand Down Expand Up @@ -57,13 +54,6 @@ func newRows(session *Session, bean interface{}) (*Rows, error) {
return nil, err
}

rows.fields, err = rows.rows.Columns()
if err != nil {
rows.lastError = err
rows.Close()
return nil, err
}

return rows, nil
}

Expand All @@ -90,21 +80,26 @@ func (rows *Rows) Scan(bean interface{}) error {
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)
}

if err := rows.session.statement.setRefBean(bean); err != nil {
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 {
return err
}

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 {
return err
}
Expand Down

0 comments on commit e1f788f

Please sign in to comment.