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: remove FromRows decoding

Browse Source
This commit is contained in:
Ariel Mashraki
2019-12-24 10:29:40 +02:00
parent 99510a458d
commit e5c5aec9b5
26 changed files with 2 additions and 971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
entc/integration/migrate/entv1/user.go
View File

@@ -35,42 +35,6 @@ type User struct {
State user.State `json:"state,omitempty"`
}
// FromRows scans the sql response data into User.
func (u *User) FromRows(rows *sql.Rows) error {
var scanu struct {
ID int
Age sql.NullInt64
Name sql.NullString
Nickname sql.NullString
Address sql.NullString
Renamed sql.NullString
Blob []byte
State sql.NullString
}
// the order here should be the same as in the `user.Columns`.
if err := rows.Scan(
&scanu.ID,
&scanu.Age,
&scanu.Name,
&scanu.Nickname,
&scanu.Address,
&scanu.Renamed,
&scanu.Blob,
&scanu.State,
); err != nil {
return err
}
u.ID = scanu.ID
u.Age = int32(scanu.Age.Int64)
u.Name = scanu.Name.String
u.Nickname = scanu.Nickname.String
u.Address = scanu.Address.String
u.Renamed = scanu.Renamed.String
u.Blob = scanu.Blob
u.State = user.State(scanu.State.String)
return nil
}
// scanValues returns the types for scanning values from sql.Rows.
func (*User) scanValues() []interface{} {
return []interface{}{
@@ -179,18 +143,6 @@ func (u *User) String() string {
// Users is a parsable slice of User.
type Users []*User
// FromRows scans the sql response data into Users.
func (u *Users) FromRows(rows *sql.Rows) error {
for rows.Next() {
scanu := &User{}
if err := scanu.FromRows(rows); err != nil {
return err
}
*u = append(*u, scanu)
}
return nil
}
func (u Users) config(cfg config) {
for _i := range u {
u[_i].config = cfg

27
entc/integration/migrate/entv2/group.go
View File

@@ -21,21 +21,6 @@ type Group struct {
ID int `json:"id,omitempty"`
}
// FromRows scans the sql response data into Group.
func (gr *Group) FromRows(rows *sql.Rows) error {
var scangr struct {
ID int
}
// the order here should be the same as in the `group.Columns`.
if err := rows.Scan(
&scangr.ID,
); err != nil {
return err
}
gr.ID = scangr.ID
return nil
}
// scanValues returns the types for scanning values from sql.Rows.
func (*Group) scanValues() []interface{} {
return []interface{}{
@@ -88,18 +73,6 @@ func (gr *Group) String() string {
// Groups is a parsable slice of Group.
type Groups []*Group
// FromRows scans the sql response data into Groups.
func (gr *Groups) FromRows(rows *sql.Rows) error {
for rows.Next() {
scangr := &Group{}
if err := scangr.FromRows(rows); err != nil {
return err
}
*gr = append(*gr, scangr)
}
return nil
}
func (gr Groups) config(cfg config) {
for _i := range gr {
gr[_i].config = cfg

27
entc/integration/migrate/entv2/pet.go
View File

@@ -21,21 +21,6 @@ type Pet struct {
ID int `json:"id,omitempty"`
}
// FromRows scans the sql response data into Pet.
func (pe *Pet) FromRows(rows *sql.Rows) error {
var scanpe struct {
ID int
}
// the order here should be the same as in the `pet.Columns`.
if err := rows.Scan(
&scanpe.ID,
); err != nil {
return err
}
pe.ID = scanpe.ID
return nil
}
// scanValues returns the types for scanning values from sql.Rows.
func (*Pet) scanValues() []interface{} {
return []interface{}{
@@ -88,18 +73,6 @@ func (pe *Pet) String() string {
// Pets is a parsable slice of Pet.
type Pets []*Pet
// FromRows scans the sql response data into Pets.
func (pe *Pets) FromRows(rows *sql.Rows) error {
for rows.Next() {
scanpe := &Pet{}
if err := scanpe.FromRows(rows); err != nil {
return err
}
*pe = append(*pe, scanpe)
}
return nil
}
func (pe Pets) config(cfg config) {
for _i := range pe {
pe[_i].config = cfg

54
entc/integration/migrate/entv2/user.go
View File

@@ -39,48 +39,6 @@ type User struct {
State user.State `json:"state,omitempty"`
}
// FromRows scans the sql response data into User.
func (u *User) FromRows(rows *sql.Rows) error {
var scanu struct {
ID int
Age sql.NullInt64
Name sql.NullString
Nickname sql.NullString
Phone sql.NullString
Buffer []byte
Title sql.NullString
NewName sql.NullString
Blob []byte
State sql.NullString
}
// the order here should be the same as in the `user.Columns`.
if err := rows.Scan(
&scanu.ID,
&scanu.Age,
&scanu.Name,
&scanu.Nickname,
&scanu.Phone,
&scanu.Buffer,
&scanu.Title,
&scanu.NewName,
&scanu.Blob,
&scanu.State,
); err != nil {
return err
}
u.ID = scanu.ID
u.Age = int(scanu.Age.Int64)
u.Name = scanu.Name.String
u.Nickname = scanu.Nickname.String
u.Phone = scanu.Phone.String
u.Buffer = scanu.Buffer
u.Title = scanu.Title.String
u.NewName = scanu.NewName.String
u.Blob = scanu.Blob
u.State = user.State(scanu.State.String)
return nil
}
// scanValues returns the types for scanning values from sql.Rows.
func (*User) scanValues() []interface{} {
return []interface{}{
@@ -205,18 +163,6 @@ func (u *User) String() string {
// Users is a parsable slice of User.
type Users []*User
// FromRows scans the sql response data into Users.
func (u *Users) FromRows(rows *sql.Rows) error {
for rows.Next() {
scanu := &User{}
if err := scanu.FromRows(rows); err != nil {
return err
}
*u = append(*u, scanu)
}
return nil
}
func (u Users) config(cfg config) {
for _i := range u {
u[_i].config = cfg