updated deps; regen ent

ent/matchplayer_query.go

@@ -1,11 +1,10 @@
-// Code generated by entc, DO NOT EDIT.
+// Code generated by ent, DO NOT EDIT.
 
 package ent
 
 import (
 	"context"
 	"database/sql/driver"
-	"errors"
 	"fmt"
 	"math"
 
@@ -25,20 +24,19 @@ import (
 // MatchPlayerQuery is the builder for querying MatchPlayer entities.
 type MatchPlayerQuery struct {
 	config
-	limit      *int
-	offset     *int
-	unique     *bool
-	order      []OrderFunc
-	fields     []string
-	predicates []predicate.MatchPlayer
-	// eager-loading edges.
+	limit           *int
+	offset          *int
+	unique          *bool
+	order           []OrderFunc
+	fields          []string
+	predicates      []predicate.MatchPlayer
 	withMatches     *MatchQuery
 	withPlayers     *PlayerQuery
 	withWeaponStats *WeaponQuery
 	withRoundStats  *RoundStatsQuery
 	withSpray       *SprayQuery
 	withMessages    *MessagesQuery
-	modifiers       []func(s *sql.Selector)
+	modifiers       []func(*sql.Selector)
 	// intermediate query (i.e. traversal path).
 	sql  *sql.Selector
 	path func(context.Context) (*sql.Selector, error)
@@ -481,17 +479,18 @@ func (mpq *MatchPlayerQuery) WithMessages(opts ...func(*MessagesQuery)) *MatchPl
 //		GroupBy(matchplayer.FieldTeamID).
 //		Aggregate(ent.Count()).
 //		Scan(ctx, &v)
-//
 func (mpq *MatchPlayerQuery) GroupBy(field string, fields ...string) *MatchPlayerGroupBy {
-	group := &MatchPlayerGroupBy{config: mpq.config}
-	group.fields = append([]string{field}, fields...)
-	group.path = func(ctx context.Context) (prev *sql.Selector, err error) {
+	grbuild := &MatchPlayerGroupBy{config: mpq.config}
+	grbuild.fields = append([]string{field}, fields...)
+	grbuild.path = func(ctx context.Context) (prev *sql.Selector, err error) {
 		if err := mpq.prepareQuery(ctx); err != nil {
 			return nil, err
 		}
 		return mpq.sqlQuery(ctx), nil
 	}
-	return group
+	grbuild.label = matchplayer.Label
+	grbuild.flds, grbuild.scan = &grbuild.fields, grbuild.Scan
+	return grbuild
 }
 
 // Select allows the selection one or more fields/columns for the given query,
@@ -506,10 +505,12 @@ func (mpq *MatchPlayerQuery) GroupBy(field string, fields ...string) *MatchPlaye
 //	client.MatchPlayer.Query().
 //		Select(matchplayer.FieldTeamID).
 //		Scan(ctx, &v)
-//
 func (mpq *MatchPlayerQuery) Select(fields ...string) *MatchPlayerSelect {
 	mpq.fields = append(mpq.fields, fields...)
-	return &MatchPlayerSelect{MatchPlayerQuery: mpq}
+	selbuild := &MatchPlayerSelect{MatchPlayerQuery: mpq}
+	selbuild.label = matchplayer.Label
+	selbuild.flds, selbuild.scan = &mpq.fields, selbuild.Scan
+	return selbuild
 }
 
 func (mpq *MatchPlayerQuery) prepareQuery(ctx context.Context) error {
@@ -528,7 +529,7 @@ func (mpq *MatchPlayerQuery) prepareQuery(ctx context.Context) error {
 	return nil
 }
 
-func (mpq *MatchPlayerQuery) sqlAll(ctx context.Context) ([]*MatchPlayer, error) {
+func (mpq *MatchPlayerQuery) sqlAll(ctx context.Context, hooks ...queryHook) ([]*MatchPlayer, error) {
 	var (
 		nodes       = []*MatchPlayer{}
 		_spec       = mpq.querySpec()
@@ -542,197 +543,244 @@ func (mpq *MatchPlayerQuery) sqlAll(ctx context.Context) ([]*MatchPlayer, error)
 		}
 	)
 	_spec.ScanValues = func(columns []string) ([]interface{}, error) {
-		node := &MatchPlayer{config: mpq.config}
-		nodes = append(nodes, node)
-		return node.scanValues(columns)
+		return (*MatchPlayer).scanValues(nil, columns)
 	}
 	_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 := &MatchPlayer{config: mpq.config}
+		nodes = append(nodes, node)
 		node.Edges.loadedTypes = loadedTypes
 		return node.assignValues(columns, values)
 	}
 	if len(mpq.modifiers) > 0 {
 		_spec.Modifiers = mpq.modifiers
 	}
+	for i := range hooks {
+		hooks[i](ctx, _spec)
+	}
 	if err := sqlgraph.QueryNodes(ctx, mpq.driver, _spec); err != nil {
 		return nil, err
 	}
 	if len(nodes) == 0 {
 		return nodes, nil
 	}
-
 	if query := mpq.withMatches; query != nil {
-		ids := make([]uint64, 0, len(nodes))
-		nodeids := make(map[uint64][]*MatchPlayer)
-		for i := range nodes {
-			fk := nodes[i].MatchStats
-			if _, ok := nodeids[fk]; !ok {
-				ids = append(ids, fk)
-			}
-			nodeids[fk] = append(nodeids[fk], nodes[i])
-		}
-		query.Where(match.IDIn(ids...))
-		neighbors, err := query.All(ctx)
-		if err != nil {
+		if err := mpq.loadMatches(ctx, query, nodes, nil,
+			func(n *MatchPlayer, e *Match) { n.Edges.Matches = e }); err != nil {
 			return nil, err
 		}
-		for _, n := range neighbors {
-			nodes, ok := nodeids[n.ID]
-			if !ok {
-				return nil, fmt.Errorf(`unexpected foreign-key "match_stats" returned %v`, n.ID)
-			}
-			for i := range nodes {
-				nodes[i].Edges.Matches = n
-			}
-		}
 	}
-
 	if query := mpq.withPlayers; query != nil {
-		ids := make([]uint64, 0, len(nodes))
-		nodeids := make(map[uint64][]*MatchPlayer)
-		for i := range nodes {
-			fk := nodes[i].PlayerStats
-			if _, ok := nodeids[fk]; !ok {
-				ids = append(ids, fk)
-			}
-			nodeids[fk] = append(nodeids[fk], nodes[i])
-		}
-		query.Where(player.IDIn(ids...))
-		neighbors, err := query.All(ctx)
-		if err != nil {
+		if err := mpq.loadPlayers(ctx, query, nodes, nil,
+			func(n *MatchPlayer, e *Player) { n.Edges.Players = e }); err != nil {
 			return nil, err
 		}
-		for _, n := range neighbors {
-			nodes, ok := nodeids[n.ID]
-			if !ok {
-				return nil, fmt.Errorf(`unexpected foreign-key "player_stats" returned %v`, n.ID)
-			}
-			for i := range nodes {
-				nodes[i].Edges.Players = n
-			}
-		}
 	}
-
 	if query := mpq.withWeaponStats; query != nil {
-		fks := make([]driver.Value, 0, len(nodes))
-		nodeids := make(map[int]*MatchPlayer)
-		for i := range nodes {
-			fks = append(fks, nodes[i].ID)
-			nodeids[nodes[i].ID] = nodes[i]
-			nodes[i].Edges.WeaponStats = []*Weapon{}
-		}
-		query.withFKs = true
-		query.Where(predicate.Weapon(func(s *sql.Selector) {
-			s.Where(sql.InValues(matchplayer.WeaponStatsColumn, fks...))
-		}))
-		neighbors, err := query.All(ctx)
-		if err != nil {
+		if err := mpq.loadWeaponStats(ctx, query, nodes,
+			func(n *MatchPlayer) { n.Edges.WeaponStats = []*Weapon{} },
+			func(n *MatchPlayer, e *Weapon) { n.Edges.WeaponStats = append(n.Edges.WeaponStats, e) }); err != nil {
 			return nil, err
 		}
-		for _, n := range neighbors {
-			fk := n.match_player_weapon_stats
-			if fk == nil {
-				return nil, fmt.Errorf(`foreign-key "match_player_weapon_stats" is nil for node %v`, n.ID)
-			}
-			node, ok := nodeids[*fk]
-			if !ok {
-				return nil, fmt.Errorf(`unexpected foreign-key "match_player_weapon_stats" returned %v for node %v`, *fk, n.ID)
-			}
-			node.Edges.WeaponStats = append(node.Edges.WeaponStats, n)
-		}
 	}
-
 	if query := mpq.withRoundStats; query != nil {
-		fks := make([]driver.Value, 0, len(nodes))
-		nodeids := make(map[int]*MatchPlayer)
-		for i := range nodes {
-			fks = append(fks, nodes[i].ID)
-			nodeids[nodes[i].ID] = nodes[i]
-			nodes[i].Edges.RoundStats = []*RoundStats{}
-		}
-		query.withFKs = true
-		query.Where(predicate.RoundStats(func(s *sql.Selector) {
-			s.Where(sql.InValues(matchplayer.RoundStatsColumn, fks...))
-		}))
-		neighbors, err := query.All(ctx)
-		if err != nil {
+		if err := mpq.loadRoundStats(ctx, query, nodes,
+			func(n *MatchPlayer) { n.Edges.RoundStats = []*RoundStats{} },
+			func(n *MatchPlayer, e *RoundStats) { n.Edges.RoundStats = append(n.Edges.RoundStats, e) }); err != nil {
 			return nil, err
 		}
-		for _, n := range neighbors {
-			fk := n.match_player_round_stats
-			if fk == nil {
-				return nil, fmt.Errorf(`foreign-key "match_player_round_stats" is nil for node %v`, n.ID)
-			}
-			node, ok := nodeids[*fk]
-			if !ok {
-				return nil, fmt.Errorf(`unexpected foreign-key "match_player_round_stats" returned %v for node %v`, *fk, n.ID)
-			}
-			node.Edges.RoundStats = append(node.Edges.RoundStats, n)
-		}
 	}
-
 	if query := mpq.withSpray; query != nil {
-		fks := make([]driver.Value, 0, len(nodes))
-		nodeids := make(map[int]*MatchPlayer)
-		for i := range nodes {
-			fks = append(fks, nodes[i].ID)
-			nodeids[nodes[i].ID] = nodes[i]
-			nodes[i].Edges.Spray = []*Spray{}
-		}
-		query.withFKs = true
-		query.Where(predicate.Spray(func(s *sql.Selector) {
-			s.Where(sql.InValues(matchplayer.SprayColumn, fks...))
-		}))
-		neighbors, err := query.All(ctx)
-		if err != nil {
+		if err := mpq.loadSpray(ctx, query, nodes,
+			func(n *MatchPlayer) { n.Edges.Spray = []*Spray{} },
+			func(n *MatchPlayer, e *Spray) { n.Edges.Spray = append(n.Edges.Spray, e) }); err != nil {
 			return nil, err
 		}
-		for _, n := range neighbors {
-			fk := n.match_player_spray
-			if fk == nil {
-				return nil, fmt.Errorf(`foreign-key "match_player_spray" is nil for node %v`, n.ID)
-			}
-			node, ok := nodeids[*fk]
-			if !ok {
-				return nil, fmt.Errorf(`unexpected foreign-key "match_player_spray" returned %v for node %v`, *fk, n.ID)
-			}
-			node.Edges.Spray = append(node.Edges.Spray, n)
-		}
 	}
-
 	if query := mpq.withMessages; query != nil {
-		fks := make([]driver.Value, 0, len(nodes))
-		nodeids := make(map[int]*MatchPlayer)
-		for i := range nodes {
-			fks = append(fks, nodes[i].ID)
-			nodeids[nodes[i].ID] = nodes[i]
-			nodes[i].Edges.Messages = []*Messages{}
-		}
-		query.withFKs = true
-		query.Where(predicate.Messages(func(s *sql.Selector) {
-			s.Where(sql.InValues(matchplayer.MessagesColumn, fks...))
-		}))
-		neighbors, err := query.All(ctx)
-		if err != nil {
+		if err := mpq.loadMessages(ctx, query, nodes,
+			func(n *MatchPlayer) { n.Edges.Messages = []*Messages{} },
+			func(n *MatchPlayer, e *Messages) { n.Edges.Messages = append(n.Edges.Messages, e) }); err != nil {
 			return nil, err
 		}
-		for _, n := range neighbors {
-			fk := n.match_player_messages
-			if fk == nil {
-				return nil, fmt.Errorf(`foreign-key "match_player_messages" is nil for node %v`, n.ID)
-			}
-			node, ok := nodeids[*fk]
-			if !ok {
-				return nil, fmt.Errorf(`unexpected foreign-key "match_player_messages" returned %v for node %v`, *fk, n.ID)
-			}
-			node.Edges.Messages = append(node.Edges.Messages, n)
+	}
+	return nodes, nil
+}
+
+func (mpq *MatchPlayerQuery) loadMatches(ctx context.Context, query *MatchQuery, nodes []*MatchPlayer, init func(*MatchPlayer), assign func(*MatchPlayer, *Match)) error {
+	ids := make([]uint64, 0, len(nodes))
+	nodeids := make(map[uint64][]*MatchPlayer)
+	for i := range nodes {
+		fk := nodes[i].MatchStats
+		if _, ok := nodeids[fk]; !ok {
+			ids = append(ids, fk)
+		}
+		nodeids[fk] = append(nodeids[fk], nodes[i])
+	}
+	query.Where(match.IDIn(ids...))
+	neighbors, err := query.All(ctx)
+	if err != nil {
+		return err
+	}
+	for _, n := range neighbors {
+		nodes, ok := nodeids[n.ID]
+		if !ok {
+			return fmt.Errorf(`unexpected foreign-key "match_stats" returned %v`, n.ID)
+		}
+		for i := range nodes {
+			assign(nodes[i], n)
 		}
 	}
-
-	return nodes, nil
+	return nil
+}
+func (mpq *MatchPlayerQuery) loadPlayers(ctx context.Context, query *PlayerQuery, nodes []*MatchPlayer, init func(*MatchPlayer), assign func(*MatchPlayer, *Player)) error {
+	ids := make([]uint64, 0, len(nodes))
+	nodeids := make(map[uint64][]*MatchPlayer)
+	for i := range nodes {
+		fk := nodes[i].PlayerStats
+		if _, ok := nodeids[fk]; !ok {
+			ids = append(ids, fk)
+		}
+		nodeids[fk] = append(nodeids[fk], nodes[i])
+	}
+	query.Where(player.IDIn(ids...))
+	neighbors, err := query.All(ctx)
+	if err != nil {
+		return err
+	}
+	for _, n := range neighbors {
+		nodes, ok := nodeids[n.ID]
+		if !ok {
+			return fmt.Errorf(`unexpected foreign-key "player_stats" returned %v`, n.ID)
+		}
+		for i := range nodes {
+			assign(nodes[i], n)
+		}
+	}
+	return nil
+}
+func (mpq *MatchPlayerQuery) loadWeaponStats(ctx context.Context, query *WeaponQuery, nodes []*MatchPlayer, init func(*MatchPlayer), assign func(*MatchPlayer, *Weapon)) error {
+	fks := make([]driver.Value, 0, len(nodes))
+	nodeids := make(map[int]*MatchPlayer)
+	for i := range nodes {
+		fks = append(fks, nodes[i].ID)
+		nodeids[nodes[i].ID] = nodes[i]
+		if init != nil {
+			init(nodes[i])
+		}
+	}
+	query.withFKs = true
+	query.Where(predicate.Weapon(func(s *sql.Selector) {
+		s.Where(sql.InValues(matchplayer.WeaponStatsColumn, fks...))
+	}))
+	neighbors, err := query.All(ctx)
+	if err != nil {
+		return err
+	}
+	for _, n := range neighbors {
+		fk := n.match_player_weapon_stats
+		if fk == nil {
+			return fmt.Errorf(`foreign-key "match_player_weapon_stats" is nil for node %v`, n.ID)
+		}
+		node, ok := nodeids[*fk]
+		if !ok {
+			return fmt.Errorf(`unexpected foreign-key "match_player_weapon_stats" returned %v for node %v`, *fk, n.ID)
+		}
+		assign(node, n)
+	}
+	return nil
+}
+func (mpq *MatchPlayerQuery) loadRoundStats(ctx context.Context, query *RoundStatsQuery, nodes []*MatchPlayer, init func(*MatchPlayer), assign func(*MatchPlayer, *RoundStats)) error {
+	fks := make([]driver.Value, 0, len(nodes))
+	nodeids := make(map[int]*MatchPlayer)
+	for i := range nodes {
+		fks = append(fks, nodes[i].ID)
+		nodeids[nodes[i].ID] = nodes[i]
+		if init != nil {
+			init(nodes[i])
+		}
+	}
+	query.withFKs = true
+	query.Where(predicate.RoundStats(func(s *sql.Selector) {
+		s.Where(sql.InValues(matchplayer.RoundStatsColumn, fks...))
+	}))
+	neighbors, err := query.All(ctx)
+	if err != nil {
+		return err
+	}
+	for _, n := range neighbors {
+		fk := n.match_player_round_stats
+		if fk == nil {
+			return fmt.Errorf(`foreign-key "match_player_round_stats" is nil for node %v`, n.ID)
+		}
+		node, ok := nodeids[*fk]
+		if !ok {
+			return fmt.Errorf(`unexpected foreign-key "match_player_round_stats" returned %v for node %v`, *fk, n.ID)
+		}
+		assign(node, n)
+	}
+	return nil
+}
+func (mpq *MatchPlayerQuery) loadSpray(ctx context.Context, query *SprayQuery, nodes []*MatchPlayer, init func(*MatchPlayer), assign func(*MatchPlayer, *Spray)) error {
+	fks := make([]driver.Value, 0, len(nodes))
+	nodeids := make(map[int]*MatchPlayer)
+	for i := range nodes {
+		fks = append(fks, nodes[i].ID)
+		nodeids[nodes[i].ID] = nodes[i]
+		if init != nil {
+			init(nodes[i])
+		}
+	}
+	query.withFKs = true
+	query.Where(predicate.Spray(func(s *sql.Selector) {
+		s.Where(sql.InValues(matchplayer.SprayColumn, fks...))
+	}))
+	neighbors, err := query.All(ctx)
+	if err != nil {
+		return err
+	}
+	for _, n := range neighbors {
+		fk := n.match_player_spray
+		if fk == nil {
+			return fmt.Errorf(`foreign-key "match_player_spray" is nil for node %v`, n.ID)
+		}
+		node, ok := nodeids[*fk]
+		if !ok {
+			return fmt.Errorf(`unexpected foreign-key "match_player_spray" returned %v for node %v`, *fk, n.ID)
+		}
+		assign(node, n)
+	}
+	return nil
+}
+func (mpq *MatchPlayerQuery) loadMessages(ctx context.Context, query *MessagesQuery, nodes []*MatchPlayer, init func(*MatchPlayer), assign func(*MatchPlayer, *Messages)) error {
+	fks := make([]driver.Value, 0, len(nodes))
+	nodeids := make(map[int]*MatchPlayer)
+	for i := range nodes {
+		fks = append(fks, nodes[i].ID)
+		nodeids[nodes[i].ID] = nodes[i]
+		if init != nil {
+			init(nodes[i])
+		}
+	}
+	query.withFKs = true
+	query.Where(predicate.Messages(func(s *sql.Selector) {
+		s.Where(sql.InValues(matchplayer.MessagesColumn, fks...))
+	}))
+	neighbors, err := query.All(ctx)
+	if err != nil {
+		return err
+	}
+	for _, n := range neighbors {
+		fk := n.match_player_messages
+		if fk == nil {
+			return fmt.Errorf(`foreign-key "match_player_messages" is nil for node %v`, n.ID)
+		}
+		node, ok := nodeids[*fk]
+		if !ok {
+			return fmt.Errorf(`unexpected foreign-key "match_player_messages" returned %v for node %v`, *fk, n.ID)
+		}
+		assign(node, n)
+	}
+	return nil
 }
 
 func (mpq *MatchPlayerQuery) sqlCount(ctx context.Context) (int, error) {
@@ -847,6 +895,7 @@ func (mpq *MatchPlayerQuery) Modify(modifiers ...func(s *sql.Selector)) *MatchPl
 // MatchPlayerGroupBy is the group-by builder for MatchPlayer entities.
 type MatchPlayerGroupBy struct {
 	config
+	selector
 	fields []string
 	fns    []AggregateFunc
 	// intermediate query (i.e. traversal path).
@@ -870,209 +919,6 @@ func (mpgb *MatchPlayerGroupBy) Scan(ctx context.Context, v interface{}) error {
 	return mpgb.sqlScan(ctx, v)
 }
 
-// ScanX is like Scan, but panics if an error occurs.
-func (mpgb *MatchPlayerGroupBy) ScanX(ctx context.Context, v interface{}) {
-	if err := mpgb.Scan(ctx, v); err != nil {
-		panic(err)
-	}
-}
-
-// Strings returns list of strings from group-by.
-// It is only allowed when executing a group-by query with one field.
-func (mpgb *MatchPlayerGroupBy) Strings(ctx context.Context) ([]string, error) {
-	if len(mpgb.fields) > 1 {
-		return nil, errors.New("ent: MatchPlayerGroupBy.Strings is not achievable when grouping more than 1 field")
-	}
-	var v []string
-	if err := mpgb.Scan(ctx, &v); err != nil {
-		return nil, err
-	}
-	return v, nil
-}
-
-// StringsX is like Strings, but panics if an error occurs.
-func (mpgb *MatchPlayerGroupBy) StringsX(ctx context.Context) []string {
-	v, err := mpgb.Strings(ctx)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
-
-// String returns a single string from a group-by query.
-// It is only allowed when executing a group-by query with one field.
-func (mpgb *MatchPlayerGroupBy) String(ctx context.Context) (_ string, err error) {
-	var v []string
-	if v, err = mpgb.Strings(ctx); err != nil {
-		return
-	}
-	switch len(v) {
-	case 1:
-		return v[0], nil
-	case 0:
-		err = &NotFoundError{matchplayer.Label}
-	default:
-		err = fmt.Errorf("ent: MatchPlayerGroupBy.Strings returned %d results when one was expected", len(v))
-	}
-	return
-}
-
-// StringX is like String, but panics if an error occurs.
-func (mpgb *MatchPlayerGroupBy) StringX(ctx context.Context) string {
-	v, err := mpgb.String(ctx)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
-
-// Ints returns list of ints from group-by.
-// It is only allowed when executing a group-by query with one field.
-func (mpgb *MatchPlayerGroupBy) Ints(ctx context.Context) ([]int, error) {
-	if len(mpgb.fields) > 1 {
-		return nil, errors.New("ent: MatchPlayerGroupBy.Ints is not achievable when grouping more than 1 field")
-	}
-	var v []int
-	if err := mpgb.Scan(ctx, &v); err != nil {
-		return nil, err
-	}
-	return v, nil
-}
-
-// IntsX is like Ints, but panics if an error occurs.
-func (mpgb *MatchPlayerGroupBy) IntsX(ctx context.Context) []int {
-	v, err := mpgb.Ints(ctx)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
-
-// Int returns a single int from a group-by query.
-// It is only allowed when executing a group-by query with one field.
-func (mpgb *MatchPlayerGroupBy) Int(ctx context.Context) (_ int, err error) {
-	var v []int
-	if v, err = mpgb.Ints(ctx); err != nil {
-		return
-	}
-	switch len(v) {
-	case 1:
-		return v[0], nil
-	case 0:
-		err = &NotFoundError{matchplayer.Label}
-	default:
-		err = fmt.Errorf("ent: MatchPlayerGroupBy.Ints returned %d results when one was expected", len(v))
-	}
-	return
-}
-
-// IntX is like Int, but panics if an error occurs.
-func (mpgb *MatchPlayerGroupBy) IntX(ctx context.Context) int {
-	v, err := mpgb.Int(ctx)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
-
-// Float64s returns list of float64s from group-by.
-// It is only allowed when executing a group-by query with one field.
-func (mpgb *MatchPlayerGroupBy) Float64s(ctx context.Context) ([]float64, error) {
-	if len(mpgb.fields) > 1 {
-		return nil, errors.New("ent: MatchPlayerGroupBy.Float64s is not achievable when grouping more than 1 field")
-	}
-	var v []float64
-	if err := mpgb.Scan(ctx, &v); err != nil {
-		return nil, err
-	}
-	return v, nil
-}
-
-// Float64sX is like Float64s, but panics if an error occurs.
-func (mpgb *MatchPlayerGroupBy) Float64sX(ctx context.Context) []float64 {
-	v, err := mpgb.Float64s(ctx)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
-
-// Float64 returns a single float64 from a group-by query.
-// It is only allowed when executing a group-by query with one field.
-func (mpgb *MatchPlayerGroupBy) Float64(ctx context.Context) (_ float64, err error) {
-	var v []float64
-	if v, err = mpgb.Float64s(ctx); err != nil {
-		return
-	}
-	switch len(v) {
-	case 1:
-		return v[0], nil
-	case 0:
-		err = &NotFoundError{matchplayer.Label}
-	default:
-		err = fmt.Errorf("ent: MatchPlayerGroupBy.Float64s returned %d results when one was expected", len(v))
-	}
-	return
-}
-
-// Float64X is like Float64, but panics if an error occurs.
-func (mpgb *MatchPlayerGroupBy) Float64X(ctx context.Context) float64 {
-	v, err := mpgb.Float64(ctx)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
-
-// Bools returns list of bools from group-by.
-// It is only allowed when executing a group-by query with one field.
-func (mpgb *MatchPlayerGroupBy) Bools(ctx context.Context) ([]bool, error) {
-	if len(mpgb.fields) > 1 {
-		return nil, errors.New("ent: MatchPlayerGroupBy.Bools is not achievable when grouping more than 1 field")
-	}
-	var v []bool
-	if err := mpgb.Scan(ctx, &v); err != nil {
-		return nil, err
-	}
-	return v, nil
-}
-
-// BoolsX is like Bools, but panics if an error occurs.
-func (mpgb *MatchPlayerGroupBy) BoolsX(ctx context.Context) []bool {
-	v, err := mpgb.Bools(ctx)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
-
-// Bool returns a single bool from a group-by query.
-// It is only allowed when executing a group-by query with one field.
-func (mpgb *MatchPlayerGroupBy) Bool(ctx context.Context) (_ bool, err error) {
-	var v []bool
-	if v, err = mpgb.Bools(ctx); err != nil {
-		return
-	}
-	switch len(v) {
-	case 1:
-		return v[0], nil
-	case 0:
-		err = &NotFoundError{matchplayer.Label}
-	default:
-		err = fmt.Errorf("ent: MatchPlayerGroupBy.Bools returned %d results when one was expected", len(v))
-	}
-	return
-}
-
-// BoolX is like Bool, but panics if an error occurs.
-func (mpgb *MatchPlayerGroupBy) BoolX(ctx context.Context) bool {
-	v, err := mpgb.Bool(ctx)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
-
 func (mpgb *MatchPlayerGroupBy) sqlScan(ctx context.Context, v interface{}) error {
 	for _, f := range mpgb.fields {
 		if !matchplayer.ValidColumn(f) {
@@ -1114,6 +960,7 @@ func (mpgb *MatchPlayerGroupBy) sqlQuery() *sql.Selector {
 // MatchPlayerSelect is the builder for selecting fields of MatchPlayer entities.
 type MatchPlayerSelect struct {
 	*MatchPlayerQuery
+	selector
 	// intermediate query (i.e. traversal path).
 	sql *sql.Selector
 }
@@ -1127,201 +974,6 @@ func (mps *MatchPlayerSelect) Scan(ctx context.Context, v interface{}) error {
 	return mps.sqlScan(ctx, v)
 }
 
-// ScanX is like Scan, but panics if an error occurs.
-func (mps *MatchPlayerSelect) ScanX(ctx context.Context, v interface{}) {
-	if err := mps.Scan(ctx, v); err != nil {
-		panic(err)
-	}
-}
-
-// Strings returns list of strings from a selector. It is only allowed when selecting one field.
-func (mps *MatchPlayerSelect) Strings(ctx context.Context) ([]string, error) {
-	if len(mps.fields) > 1 {
-		return nil, errors.New("ent: MatchPlayerSelect.Strings is not achievable when selecting more than 1 field")
-	}
-	var v []string
-	if err := mps.Scan(ctx, &v); err != nil {
-		return nil, err
-	}
-	return v, nil
-}
-
-// StringsX is like Strings, but panics if an error occurs.
-func (mps *MatchPlayerSelect) StringsX(ctx context.Context) []string {
-	v, err := mps.Strings(ctx)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
-
-// String returns a single string from a selector. It is only allowed when selecting one field.
-func (mps *MatchPlayerSelect) String(ctx context.Context) (_ string, err error) {
-	var v []string
-	if v, err = mps.Strings(ctx); err != nil {
-		return
-	}
-	switch len(v) {
-	case 1:
-		return v[0], nil
-	case 0:
-		err = &NotFoundError{matchplayer.Label}
-	default:
-		err = fmt.Errorf("ent: MatchPlayerSelect.Strings returned %d results when one was expected", len(v))
-	}
-	return
-}
-
-// StringX is like String, but panics if an error occurs.
-func (mps *MatchPlayerSelect) StringX(ctx context.Context) string {
-	v, err := mps.String(ctx)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
-
-// Ints returns list of ints from a selector. It is only allowed when selecting one field.
-func (mps *MatchPlayerSelect) Ints(ctx context.Context) ([]int, error) {
-	if len(mps.fields) > 1 {
-		return nil, errors.New("ent: MatchPlayerSelect.Ints is not achievable when selecting more than 1 field")
-	}
-	var v []int
-	if err := mps.Scan(ctx, &v); err != nil {
-		return nil, err
-	}
-	return v, nil
-}
-
-// IntsX is like Ints, but panics if an error occurs.
-func (mps *MatchPlayerSelect) IntsX(ctx context.Context) []int {
-	v, err := mps.Ints(ctx)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
-
-// Int returns a single int from a selector. It is only allowed when selecting one field.
-func (mps *MatchPlayerSelect) Int(ctx context.Context) (_ int, err error) {
-	var v []int
-	if v, err = mps.Ints(ctx); err != nil {
-		return
-	}
-	switch len(v) {
-	case 1:
-		return v[0], nil
-	case 0:
-		err = &NotFoundError{matchplayer.Label}
-	default:
-		err = fmt.Errorf("ent: MatchPlayerSelect.Ints returned %d results when one was expected", len(v))
-	}
-	return
-}
-
-// IntX is like Int, but panics if an error occurs.
-func (mps *MatchPlayerSelect) IntX(ctx context.Context) int {
-	v, err := mps.Int(ctx)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
-
-// Float64s returns list of float64s from a selector. It is only allowed when selecting one field.
-func (mps *MatchPlayerSelect) Float64s(ctx context.Context) ([]float64, error) {
-	if len(mps.fields) > 1 {
-		return nil, errors.New("ent: MatchPlayerSelect.Float64s is not achievable when selecting more than 1 field")
-	}
-	var v []float64
-	if err := mps.Scan(ctx, &v); err != nil {
-		return nil, err
-	}
-	return v, nil
-}
-
-// Float64sX is like Float64s, but panics if an error occurs.
-func (mps *MatchPlayerSelect) Float64sX(ctx context.Context) []float64 {
-	v, err := mps.Float64s(ctx)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
-
-// Float64 returns a single float64 from a selector. It is only allowed when selecting one field.
-func (mps *MatchPlayerSelect) Float64(ctx context.Context) (_ float64, err error) {
-	var v []float64
-	if v, err = mps.Float64s(ctx); err != nil {
-		return
-	}
-	switch len(v) {
-	case 1:
-		return v[0], nil
-	case 0:
-		err = &NotFoundError{matchplayer.Label}
-	default:
-		err = fmt.Errorf("ent: MatchPlayerSelect.Float64s returned %d results when one was expected", len(v))
-	}
-	return
-}
-
-// Float64X is like Float64, but panics if an error occurs.
-func (mps *MatchPlayerSelect) Float64X(ctx context.Context) float64 {
-	v, err := mps.Float64(ctx)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
-
-// Bools returns list of bools from a selector. It is only allowed when selecting one field.
-func (mps *MatchPlayerSelect) Bools(ctx context.Context) ([]bool, error) {
-	if len(mps.fields) > 1 {
-		return nil, errors.New("ent: MatchPlayerSelect.Bools is not achievable when selecting more than 1 field")
-	}
-	var v []bool
-	if err := mps.Scan(ctx, &v); err != nil {
-		return nil, err
-	}
-	return v, nil
-}
-
-// BoolsX is like Bools, but panics if an error occurs.
-func (mps *MatchPlayerSelect) BoolsX(ctx context.Context) []bool {
-	v, err := mps.Bools(ctx)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
-
-// Bool returns a single bool from a selector. It is only allowed when selecting one field.
-func (mps *MatchPlayerSelect) Bool(ctx context.Context) (_ bool, err error) {
-	var v []bool
-	if v, err = mps.Bools(ctx); err != nil {
-		return
-	}
-	switch len(v) {
-	case 1:
-		return v[0], nil
-	case 0:
-		err = &NotFoundError{matchplayer.Label}
-	default:
-		err = fmt.Errorf("ent: MatchPlayerSelect.Bools returned %d results when one was expected", len(v))
-	}
-	return
-}
-
-// BoolX is like Bool, but panics if an error occurs.
-func (mps *MatchPlayerSelect) BoolX(ctx context.Context) bool {
-	v, err := mps.Bool(ctx)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
-
 func (mps *MatchPlayerSelect) sqlScan(ctx context.Context, v interface{}) error {
 	rows := &sql.Rows{}
 	query, args := mps.sql.Query()