golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-05-24 09:31:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

entc/gen: avoid using Go keywords as variables on scan

Browse Source 
Summary: Pull Request resolved: https://github.com/facebookincubator/ent/pull/161

Reviewed By: alexsn

Differential Revision: D18483166

fbshipit-source-id: 7273d284232c1bf515cc84326904b580fb70a0e3
This commit is contained in:
Ariel Mashraki
2019-11-13 11:34:02 -08:00
committed by Facebook Github Bot
parent 84fd066e2c
commit 8093ec4127
24 changed files with 391 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
entc/integration/json/ent/user.go
View File

@@ -37,7 +37,7 @@ type User struct {
// FromRows scans the sql response data into User.
func (u *User) FromRows(rows *sql.Rows) error {
var vu struct {
var scanu struct {
ID int
URL []byte
Raw []byte
@@ -48,43 +48,43 @@ func (u *User) FromRows(rows *sql.Rows) error {
}
// the order here should be the same as in the `user.Columns`.
if err := rows.Scan(
&vu.ID,
&vu.URL,
&vu.Raw,
&vu.Dirs,
&vu.Ints,
&vu.Floats,
&vu.Strings,
&scanu.ID,
&scanu.URL,
&scanu.Raw,
&scanu.Dirs,
&scanu.Ints,
&scanu.Floats,
&scanu.Strings,
); err != nil {
return err
}
u.ID = vu.ID
if value := vu.URL; len(value) > 0 {
u.ID = scanu.ID
if value := scanu.URL; len(value) > 0 {
if err := json.Unmarshal(value, &u.URL); err != nil {
return fmt.Errorf("unmarshal field url: %v", err)
}
}
if value := vu.Raw; len(value) > 0 {
if value := scanu.Raw; len(value) > 0 {
if err := json.Unmarshal(value, &u.Raw); err != nil {
return fmt.Errorf("unmarshal field raw: %v", err)
}
}
if value := vu.Dirs; len(value) > 0 {
if value := scanu.Dirs; len(value) > 0 {
if err := json.Unmarshal(value, &u.Dirs); err != nil {
return fmt.Errorf("unmarshal field dirs: %v", err)
}
}
if value := vu.Ints; len(value) > 0 {
if value := scanu.Ints; len(value) > 0 {
if err := json.Unmarshal(value, &u.Ints); err != nil {
return fmt.Errorf("unmarshal field ints: %v", err)
}
}
if value := vu.Floats; len(value) > 0 {
if value := scanu.Floats; len(value) > 0 {
if err := json.Unmarshal(value, &u.Floats); err != nil {
return fmt.Errorf("unmarshal field floats: %v", err)
}
}
if value := vu.Strings; len(value) > 0 {
if value := scanu.Strings; len(value) > 0 {
if err := json.Unmarshal(value, &u.Strings); err != nil {
return fmt.Errorf("unmarshal field strings: %v", err)
}
@@ -137,11 +137,11 @@ type Users []*User
// FromRows scans the sql response data into Users.
func (u *Users) FromRows(rows *sql.Rows) error {
for rows.Next() {
vu := &User{}
if err := vu.FromRows(rows); err != nil {
scanu := &User{}
if err := scanu.FromRows(rows); err != nil {
return err
}
*u = append(*u, vu)
*u = append(*u, scanu)
}
return nil
}