golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-04-29 22:20:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

dialect/sql/sqlgraph: consistent scan names

Browse Source
This commit is contained in:
Ariel Mashraki
2019-12-22 20:12:00 +02:00
parent 6f9dade32c
commit c09028f58b
28 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dialect/sql/sqlgraph/graph.go
View File

@@ -369,8 +369,8 @@ type (
Fields FieldMut
Predicate func(*sql.Selector)
ScanTypes []interface{}
Assign func(...interface{}) error
ScanValues []interface{}
Assign func(...interface{}) error
}
)
@@ -672,10 +672,10 @@ func (u *updater) scan(rows *sql.Rows) error {
if !rows.Next() {
return fmt.Errorf("record with id %v not found in table %s", u.Node.ID.Value, u.Node.Table)
}
if err := rows.Scan(u.ScanTypes...); err != nil {
if err := rows.Scan(u.ScanValues...); err != nil {
return fmt.Errorf("failed scanning rows: %v", err)
}
return u.Assign(u.ScanTypes...)
return u.Assign(u.ScanValues...)
}
type creator struct {

2
dialect/sql/sqlgraph/graph_test.go
View File

@@ -964,7 +964,7 @@ func TestUpdateNode(t *testing.T) {
tt.prepare(mock)
usr := &user{}
tt.spec.Assign = usr.assign
tt.spec.ScanTypes = usr.values()
tt.spec.ScanValues = usr.values()
err = UpdateNode(context.Background(), sql.OpenDB("", db), tt.spec)
require.Equal(t, tt.wantErr, err != nil, err)
require.Equal(t, tt.wantUser, usr)