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: allow selecting specific fields (#1075)

Browse Source
This commit is contained in:
Ariel Mashraki
2020-12-23 17:35:39 +02:00
committed by GitHub
parent 0902673b40
commit da34571560
204 changed files with 3453 additions and 2891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
examples/start/ent/car.go
View File

@@ -55,50 +55,58 @@ func (e CarEdges) OwnerOrErr() (*User, error) {
}
// scanValues returns the types for scanning values from sql.Rows.
func (*Car) scanValues() []interface{} {
return []interface{}{
&sql.NullInt64{}, // id
&sql.NullString{}, // model
&sql.NullTime{}, // registered_at
}
}
// fkValues returns the types for scanning foreign-keys values from sql.Rows.
func (*Car) fkValues() []interface{} {
return []interface{}{
&sql.NullInt64{}, // user_cars
func (*Car) scanValues(columns []string) ([]interface{}, error) {
values := make([]interface{}, len(columns))
for i := range columns {
switch columns[i] {
case car.FieldID:
values[i] = &sql.NullInt64{}
case car.FieldModel:
values[i] = &sql.NullString{}
case car.FieldRegisteredAt:
values[i] = &sql.NullTime{}
case car.ForeignKeys[0]: // user_cars
values[i] = &sql.NullInt64{}
default:
return nil, fmt.Errorf("unexpected column %q for type Car", columns[i])
}
}
return values, nil
}
// assignValues assigns the values that were returned from sql.Rows (after scanning)
// to the Car fields.
func (c *Car) assignValues(values ...interface{}) error {
if m, n := len(values), len(car.Columns); m < n {
func (c *Car) assignValues(columns []string, values []interface{}) error {
if m, n := len(values), len(columns); m < n {
return fmt.Errorf("mismatch number of scan values: %d != %d", m, n)
}
value, ok := values[0].(*sql.NullInt64)
if !ok {
return fmt.Errorf("unexpected type %T for field id", value)
}
c.ID = int(value.Int64)
values = values[1:]
if value, ok := values[0].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field model", values[0])
} else if value.Valid {
c.Model = value.String
}
if value, ok := values[1].(*sql.NullTime); !ok {
return fmt.Errorf("unexpected type %T for field registered_at", values[1])
} else if value.Valid {
c.RegisteredAt = value.Time
}
values = values[2:]
if len(values) == len(car.ForeignKeys) {
if value, ok := values[0].(*sql.NullInt64); !ok {
return fmt.Errorf("unexpected type %T for edge-field user_cars", value)
} else if value.Valid {
c.user_cars = new(int)
*c.user_cars = int(value.Int64)
for i := range columns {
switch columns[i] {
case car.FieldID:
value, ok := values[i].(*sql.NullInt64)
if !ok {
return fmt.Errorf("unexpected type %T for field id", value)
}
c.ID = int(value.Int64)
case car.FieldModel:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field model", values[i])
} else if value.Valid {
c.Model = value.String
}
case car.FieldRegisteredAt:
if value, ok := values[i].(*sql.NullTime); !ok {
return fmt.Errorf("unexpected type %T for field registered_at", values[i])
} else if value.Valid {
c.RegisteredAt = value.Time
}
case car.ForeignKeys[0]:
if value, ok := values[i].(*sql.NullInt64); !ok {
return fmt.Errorf("unexpected type %T for edge-field user_cars", value)
} else if value.Valid {
c.user_cars = new(int)
*c.user_cars = int(value.Int64)
}
}
}
return nil

12
examples/start/ent/car_query.go
View File

@@ -351,22 +351,18 @@ func (cq *CarQuery) sqlAll(ctx context.Context) ([]*Car, error) {
if withFKs {
_spec.Node.Columns = append(_spec.Node.Columns, car.ForeignKeys...)
}
_spec.ScanValues = func() []interface{} {
_spec.ScanValues = func(columns []string) ([]interface{}, error) {
node := &Car{config: cq.config}
nodes = append(nodes, node)
values := node.scanValues()
if withFKs {
values = append(values, node.fkValues()...)
}
return values
return node.scanValues(columns)
}
_spec.Assign = func(values ...interface{}) error {
_spec.Assign = func(columns []string, values []interface{}) error {
if len(nodes) == 0 {
return fmt.Errorf("ent: Assign called without calling ScanValues")
}
node := nodes[len(nodes)-1]
node.Edges.loadedTypes = loadedTypes
return node.assignValues(values...)
return node.assignValues(columns, values)
}
if err := sqlgraph.QueryNodes(ctx, cq.driver, _spec); err != nil {
return nil, err

2
examples/start/ent/car_update.go
View File

@@ -370,7 +370,7 @@ func (cuo *CarUpdateOne) sqlSave(ctx context.Context) (_node *Car, err error) {
}
_node = &Car{config: cuo.config}
_spec.Assign = _node.assignValues
_spec.ScanValues = _node.scanValues()
_spec.ScanValues = _node.scanValues
if err = sqlgraph.UpdateNode(ctx, cuo.driver, _spec); err != nil {
if _, ok := err.(*sqlgraph.NotFoundError); ok {
err = &NotFoundError{car.Label}

45
examples/start/ent/group.go
View File

@@ -45,29 +45,42 @@ func (e GroupEdges) UsersOrErr() ([]*User, error) {
}
// scanValues returns the types for scanning values from sql.Rows.
func (*Group) scanValues() []interface{} {
return []interface{}{
&sql.NullInt64{}, // id
&sql.NullString{}, // name
func (*Group) scanValues(columns []string) ([]interface{}, error) {
values := make([]interface{}, len(columns))
for i := range columns {
switch columns[i] {
case group.FieldID:
values[i] = &sql.NullInt64{}
case group.FieldName:
values[i] = &sql.NullString{}
default:
return nil, fmt.Errorf("unexpected column %q for type Group", columns[i])
}
}
return values, nil
}
// assignValues assigns the values that were returned from sql.Rows (after scanning)
// to the Group fields.
func (gr *Group) assignValues(values ...interface{}) error {
if m, n := len(values), len(group.Columns); m < n {
func (gr *Group) assignValues(columns []string, values []interface{}) error {
if m, n := len(values), len(columns); m < n {
return fmt.Errorf("mismatch number of scan values: %d != %d", m, n)
}
value, ok := values[0].(*sql.NullInt64)
if !ok {
return fmt.Errorf("unexpected type %T for field id", value)
}
gr.ID = int(value.Int64)
values = values[1:]
if value, ok := values[0].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field name", values[0])
} else if value.Valid {
gr.Name = value.String
for i := range columns {
switch columns[i] {
case group.FieldID:
value, ok := values[i].(*sql.NullInt64)
if !ok {
return fmt.Errorf("unexpected type %T for field id", value)
}
gr.ID = int(value.Int64)
case group.FieldName:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field name", values[i])
} else if value.Valid {
gr.Name = value.String
}
}
}
return nil
}

9
examples/start/ent/group_query.go
View File

@@ -344,19 +344,18 @@ func (gq *GroupQuery) sqlAll(ctx context.Context) ([]*Group, error) {
gq.withUsers != nil,
}
)
_spec.ScanValues = func() []interface{} {
_spec.ScanValues = func(columns []string) ([]interface{}, error) {
node := &Group{config: gq.config}
nodes = append(nodes, node)
values := node.scanValues()
return values
return node.scanValues(columns)
}
_spec.Assign = func(values ...interface{}) error {
_spec.Assign = func(columns []string, values []interface{}) error {
if len(nodes) == 0 {
return fmt.Errorf("ent: Assign called without calling ScanValues")
}
node := nodes[len(nodes)-1]
node.Edges.loadedTypes = loadedTypes
return node.assignValues(values...)
return node.assignValues(columns, values)
}
if err := sqlgraph.QueryNodes(ctx, gq.driver, _spec); err != nil {
return nil, err

2
examples/start/ent/group_update.go
View File

@@ -435,7 +435,7 @@ func (guo *GroupUpdateOne) sqlSave(ctx context.Context) (_node *Group, err error
}
_node = &Group{config: guo.config}
_spec.Assign = _node.assignValues
_spec.ScanValues = _node.scanValues()
_spec.ScanValues = _node.scanValues
if err = sqlgraph.UpdateNode(ctx, guo.driver, _spec); err != nil {
if _, ok := err.(*sqlgraph.NotFoundError); ok {
err = &NotFoundError{group.Label}

57
examples/start/ent/user.go
View File

@@ -58,35 +58,48 @@ func (e UserEdges) GroupsOrErr() ([]*Group, error) {
}
// scanValues returns the types for scanning values from sql.Rows.
func (*User) scanValues() []interface{} {
return []interface{}{
&sql.NullInt64{}, // id
&sql.NullInt64{}, // age
&sql.NullString{}, // name
func (*User) scanValues(columns []string) ([]interface{}, error) {
values := make([]interface{}, len(columns))
for i := range columns {
switch columns[i] {
case user.FieldID, user.FieldAge:
values[i] = &sql.NullInt64{}
case user.FieldName:
values[i] = &sql.NullString{}
default:
return nil, fmt.Errorf("unexpected column %q for type User", columns[i])
}
}
return values, nil
}
// assignValues assigns the values that were returned from sql.Rows (after scanning)
// to the User fields.
func (u *User) assignValues(values ...interface{}) error {
if m, n := len(values), len(user.Columns); m < n {
func (u *User) assignValues(columns []string, values []interface{}) error {
if m, n := len(values), len(columns); m < n {
return fmt.Errorf("mismatch number of scan values: %d != %d", m, n)
}
value, ok := values[0].(*sql.NullInt64)
if !ok {
return fmt.Errorf("unexpected type %T for field id", value)
}
u.ID = int(value.Int64)
values = values[1:]
if value, ok := values[0].(*sql.NullInt64); !ok {
return fmt.Errorf("unexpected type %T for field age", values[0])
} else if value.Valid {
u.Age = int(value.Int64)
}
if value, ok := values[1].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field name", values[1])
} else if value.Valid {
u.Name = value.String
for i := range columns {
switch columns[i] {
case user.FieldID:
value, ok := values[i].(*sql.NullInt64)
if !ok {
return fmt.Errorf("unexpected type %T for field id", value)
}
u.ID = int(value.Int64)
case user.FieldAge:
if value, ok := values[i].(*sql.NullInt64); !ok {
return fmt.Errorf("unexpected type %T for field age", values[i])
} else if value.Valid {
u.Age = int(value.Int64)
}
case user.FieldName:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field name", values[i])
} else if value.Valid {
u.Name = value.String
}
}
}
return nil
}

9
examples/start/ent/user_query.go
View File

@@ -381,19 +381,18 @@ func (uq *UserQuery) sqlAll(ctx context.Context) ([]*User, error) {
uq.withGroups != nil,
}
)
_spec.ScanValues = func() []interface{} {
_spec.ScanValues = func(columns []string) ([]interface{}, error) {
node := &User{config: uq.config}
nodes = append(nodes, node)
values := node.scanValues()
return values
return node.scanValues(columns)
}
_spec.Assign = func(values ...interface{}) error {
_spec.Assign = func(columns []string, values []interface{}) error {
if len(nodes) == 0 {
return fmt.Errorf("ent: Assign called without calling ScanValues")
}
node := nodes[len(nodes)-1]
node.Edges.loadedTypes = loadedTypes
return node.assignValues(values...)
return node.assignValues(columns, values)
}
if err := sqlgraph.QueryNodes(ctx, uq.driver, _spec); err != nil {
return nil, err

2
examples/start/ent/user_update.go
View File

@@ -686,7 +686,7 @@ func (uuo *UserUpdateOne) sqlSave(ctx context.Context) (_node *User, err error)
}
_node = &User{config: uuo.config}
_spec.Assign = _node.assignValues
_spec.ScanValues = _node.scanValues()
_spec.ScanValues = _node.scanValues
if err = sqlgraph.UpdateNode(ctx, uuo.driver, _spec); err != nil {
if _, ok := err.(*sqlgraph.NotFoundError); ok {
err = &NotFoundError{user.Label}