updated deps; minor fixed; ent regen

ent/dbpackage_query.go

@@ -1,10 +1,9 @@
-// Code generated by entc, DO NOT EDIT.
+// Code generated by ent, DO NOT EDIT.
 
 package ent
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"math"
 
@@ -24,7 +23,7 @@ type DbPackageQuery struct {
 	order      []OrderFunc
 	fields     []string
 	predicates []predicate.DbPackage
-	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)
@@ -263,17 +262,18 @@ func (dpq *DbPackageQuery) Clone() *DbPackageQuery {
 //		GroupBy(dbpackage.FieldPkgbase).
 //		Aggregate(ent.Count()).
 //		Scan(ctx, &v)
-//
 func (dpq *DbPackageQuery) GroupBy(field string, fields ...string) *DbPackageGroupBy {
-	group := &DbPackageGroupBy{config: dpq.config}
-	group.fields = append([]string{field}, fields...)
-	group.path = func(ctx context.Context) (prev *sql.Selector, err error) {
+	grbuild := &DbPackageGroupBy{config: dpq.config}
+	grbuild.fields = append([]string{field}, fields...)
+	grbuild.path = func(ctx context.Context) (prev *sql.Selector, err error) {
 		if err := dpq.prepareQuery(ctx); err != nil {
 			return nil, err
 		}
 		return dpq.sqlQuery(ctx), nil
 	}
-	return group
+	grbuild.label = dbpackage.Label
+	grbuild.flds, grbuild.scan = &grbuild.fields, grbuild.Scan
+	return grbuild
 }
 
 // Select allows the selection one or more fields/columns for the given query,
@@ -288,10 +288,12 @@ func (dpq *DbPackageQuery) GroupBy(field string, fields ...string) *DbPackageGro
 //	client.DbPackage.Query().
 //		Select(dbpackage.FieldPkgbase).
 //		Scan(ctx, &v)
-//
 func (dpq *DbPackageQuery) Select(fields ...string) *DbPackageSelect {
 	dpq.fields = append(dpq.fields, fields...)
-	return &DbPackageSelect{DbPackageQuery: dpq}
+	selbuild := &DbPackageSelect{DbPackageQuery: dpq}
+	selbuild.label = dbpackage.Label
+	selbuild.flds, selbuild.scan = &dpq.fields, selbuild.Scan
+	return selbuild
 }
 
 func (dpq *DbPackageQuery) prepareQuery(ctx context.Context) error {
@@ -310,26 +312,25 @@ func (dpq *DbPackageQuery) prepareQuery(ctx context.Context) error {
 	return nil
 }
 
-func (dpq *DbPackageQuery) sqlAll(ctx context.Context) ([]*DbPackage, error) {
+func (dpq *DbPackageQuery) sqlAll(ctx context.Context, hooks ...queryHook) ([]*DbPackage, error) {
 	var (
 		nodes = []*DbPackage{}
 		_spec = dpq.querySpec()
 	)
 	_spec.ScanValues = func(columns []string) ([]interface{}, error) {
-		node := &DbPackage{config: dpq.config}
-		nodes = append(nodes, node)
-		return node.scanValues(columns)
+		return (*DbPackage).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 := &DbPackage{config: dpq.config}
+		nodes = append(nodes, node)
 		return node.assignValues(columns, values)
 	}
 	if len(dpq.modifiers) > 0 {
 		_spec.Modifiers = dpq.modifiers
 	}
+	for i := range hooks {
+		hooks[i](ctx, _spec)
+	}
 	if err := sqlgraph.QueryNodes(ctx, dpq.driver, _spec); err != nil {
 		return nil, err
 	}
@@ -451,6 +452,7 @@ func (dpq *DbPackageQuery) Modify(modifiers ...func(s *sql.Selector)) *DbPackage
 // DbPackageGroupBy is the group-by builder for DbPackage entities.
 type DbPackageGroupBy struct {
 	config
+	selector
 	fields []string
 	fns    []AggregateFunc
 	// intermediate query (i.e. traversal path).
@@ -474,209 +476,6 @@ func (dpgb *DbPackageGroupBy) Scan(ctx context.Context, v interface{}) error {
 	return dpgb.sqlScan(ctx, v)
 }
 
-// ScanX is like Scan, but panics if an error occurs.
-func (dpgb *DbPackageGroupBy) ScanX(ctx context.Context, v interface{}) {
-	if err := dpgb.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 (dpgb *DbPackageGroupBy) Strings(ctx context.Context) ([]string, error) {
-	if len(dpgb.fields) > 1 {
-		return nil, errors.New("ent: DbPackageGroupBy.Strings is not achievable when grouping more than 1 field")
-	}
-	var v []string
-	if err := dpgb.Scan(ctx, &v); err != nil {
-		return nil, err
-	}
-	return v, nil
-}
-
-// StringsX is like Strings, but panics if an error occurs.
-func (dpgb *DbPackageGroupBy) StringsX(ctx context.Context) []string {
-	v, err := dpgb.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 (dpgb *DbPackageGroupBy) String(ctx context.Context) (_ string, err error) {
-	var v []string
-	if v, err = dpgb.Strings(ctx); err != nil {
-		return
-	}
-	switch len(v) {
-	case 1:
-		return v[0], nil
-	case 0:
-		err = &NotFoundError{dbpackage.Label}
-	default:
-		err = fmt.Errorf("ent: DbPackageGroupBy.Strings returned %d results when one was expected", len(v))
-	}
-	return
-}
-
-// StringX is like String, but panics if an error occurs.
-func (dpgb *DbPackageGroupBy) StringX(ctx context.Context) string {
-	v, err := dpgb.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 (dpgb *DbPackageGroupBy) Ints(ctx context.Context) ([]int, error) {
-	if len(dpgb.fields) > 1 {
-		return nil, errors.New("ent: DbPackageGroupBy.Ints is not achievable when grouping more than 1 field")
-	}
-	var v []int
-	if err := dpgb.Scan(ctx, &v); err != nil {
-		return nil, err
-	}
-	return v, nil
-}
-
-// IntsX is like Ints, but panics if an error occurs.
-func (dpgb *DbPackageGroupBy) IntsX(ctx context.Context) []int {
-	v, err := dpgb.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 (dpgb *DbPackageGroupBy) Int(ctx context.Context) (_ int, err error) {
-	var v []int
-	if v, err = dpgb.Ints(ctx); err != nil {
-		return
-	}
-	switch len(v) {
-	case 1:
-		return v[0], nil
-	case 0:
-		err = &NotFoundError{dbpackage.Label}
-	default:
-		err = fmt.Errorf("ent: DbPackageGroupBy.Ints returned %d results when one was expected", len(v))
-	}
-	return
-}
-
-// IntX is like Int, but panics if an error occurs.
-func (dpgb *DbPackageGroupBy) IntX(ctx context.Context) int {
-	v, err := dpgb.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 (dpgb *DbPackageGroupBy) Float64s(ctx context.Context) ([]float64, error) {
-	if len(dpgb.fields) > 1 {
-		return nil, errors.New("ent: DbPackageGroupBy.Float64s is not achievable when grouping more than 1 field")
-	}
-	var v []float64
-	if err := dpgb.Scan(ctx, &v); err != nil {
-		return nil, err
-	}
-	return v, nil
-}
-
-// Float64sX is like Float64s, but panics if an error occurs.
-func (dpgb *DbPackageGroupBy) Float64sX(ctx context.Context) []float64 {
-	v, err := dpgb.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 (dpgb *DbPackageGroupBy) Float64(ctx context.Context) (_ float64, err error) {
-	var v []float64
-	if v, err = dpgb.Float64s(ctx); err != nil {
-		return
-	}
-	switch len(v) {
-	case 1:
-		return v[0], nil
-	case 0:
-		err = &NotFoundError{dbpackage.Label}
-	default:
-		err = fmt.Errorf("ent: DbPackageGroupBy.Float64s returned %d results when one was expected", len(v))
-	}
-	return
-}
-
-// Float64X is like Float64, but panics if an error occurs.
-func (dpgb *DbPackageGroupBy) Float64X(ctx context.Context) float64 {
-	v, err := dpgb.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 (dpgb *DbPackageGroupBy) Bools(ctx context.Context) ([]bool, error) {
-	if len(dpgb.fields) > 1 {
-		return nil, errors.New("ent: DbPackageGroupBy.Bools is not achievable when grouping more than 1 field")
-	}
-	var v []bool
-	if err := dpgb.Scan(ctx, &v); err != nil {
-		return nil, err
-	}
-	return v, nil
-}
-
-// BoolsX is like Bools, but panics if an error occurs.
-func (dpgb *DbPackageGroupBy) BoolsX(ctx context.Context) []bool {
-	v, err := dpgb.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 (dpgb *DbPackageGroupBy) Bool(ctx context.Context) (_ bool, err error) {
-	var v []bool
-	if v, err = dpgb.Bools(ctx); err != nil {
-		return
-	}
-	switch len(v) {
-	case 1:
-		return v[0], nil
-	case 0:
-		err = &NotFoundError{dbpackage.Label}
-	default:
-		err = fmt.Errorf("ent: DbPackageGroupBy.Bools returned %d results when one was expected", len(v))
-	}
-	return
-}
-
-// BoolX is like Bool, but panics if an error occurs.
-func (dpgb *DbPackageGroupBy) BoolX(ctx context.Context) bool {
-	v, err := dpgb.Bool(ctx)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
-
 func (dpgb *DbPackageGroupBy) sqlScan(ctx context.Context, v interface{}) error {
 	for _, f := range dpgb.fields {
 		if !dbpackage.ValidColumn(f) {
@@ -718,6 +517,7 @@ func (dpgb *DbPackageGroupBy) sqlQuery() *sql.Selector {
 // DbPackageSelect is the builder for selecting fields of DbPackage entities.
 type DbPackageSelect struct {
 	*DbPackageQuery
+	selector
 	// intermediate query (i.e. traversal path).
 	sql *sql.Selector
 }
@@ -731,201 +531,6 @@ func (dps *DbPackageSelect) Scan(ctx context.Context, v interface{}) error {
 	return dps.sqlScan(ctx, v)
 }
 
-// ScanX is like Scan, but panics if an error occurs.
-func (dps *DbPackageSelect) ScanX(ctx context.Context, v interface{}) {
-	if err := dps.Scan(ctx, v); err != nil {
-		panic(err)
-	}
-}
-
-// Strings returns list of strings from a selector. It is only allowed when selecting one field.
-func (dps *DbPackageSelect) Strings(ctx context.Context) ([]string, error) {
-	if len(dps.fields) > 1 {
-		return nil, errors.New("ent: DbPackageSelect.Strings is not achievable when selecting more than 1 field")
-	}
-	var v []string
-	if err := dps.Scan(ctx, &v); err != nil {
-		return nil, err
-	}
-	return v, nil
-}
-
-// StringsX is like Strings, but panics if an error occurs.
-func (dps *DbPackageSelect) StringsX(ctx context.Context) []string {
-	v, err := dps.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 (dps *DbPackageSelect) String(ctx context.Context) (_ string, err error) {
-	var v []string
-	if v, err = dps.Strings(ctx); err != nil {
-		return
-	}
-	switch len(v) {
-	case 1:
-		return v[0], nil
-	case 0:
-		err = &NotFoundError{dbpackage.Label}
-	default:
-		err = fmt.Errorf("ent: DbPackageSelect.Strings returned %d results when one was expected", len(v))
-	}
-	return
-}
-
-// StringX is like String, but panics if an error occurs.
-func (dps *DbPackageSelect) StringX(ctx context.Context) string {
-	v, err := dps.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 (dps *DbPackageSelect) Ints(ctx context.Context) ([]int, error) {
-	if len(dps.fields) > 1 {
-		return nil, errors.New("ent: DbPackageSelect.Ints is not achievable when selecting more than 1 field")
-	}
-	var v []int
-	if err := dps.Scan(ctx, &v); err != nil {
-		return nil, err
-	}
-	return v, nil
-}
-
-// IntsX is like Ints, but panics if an error occurs.
-func (dps *DbPackageSelect) IntsX(ctx context.Context) []int {
-	v, err := dps.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 (dps *DbPackageSelect) Int(ctx context.Context) (_ int, err error) {
-	var v []int
-	if v, err = dps.Ints(ctx); err != nil {
-		return
-	}
-	switch len(v) {
-	case 1:
-		return v[0], nil
-	case 0:
-		err = &NotFoundError{dbpackage.Label}
-	default:
-		err = fmt.Errorf("ent: DbPackageSelect.Ints returned %d results when one was expected", len(v))
-	}
-	return
-}
-
-// IntX is like Int, but panics if an error occurs.
-func (dps *DbPackageSelect) IntX(ctx context.Context) int {
-	v, err := dps.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 (dps *DbPackageSelect) Float64s(ctx context.Context) ([]float64, error) {
-	if len(dps.fields) > 1 {
-		return nil, errors.New("ent: DbPackageSelect.Float64s is not achievable when selecting more than 1 field")
-	}
-	var v []float64
-	if err := dps.Scan(ctx, &v); err != nil {
-		return nil, err
-	}
-	return v, nil
-}
-
-// Float64sX is like Float64s, but panics if an error occurs.
-func (dps *DbPackageSelect) Float64sX(ctx context.Context) []float64 {
-	v, err := dps.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 (dps *DbPackageSelect) Float64(ctx context.Context) (_ float64, err error) {
-	var v []float64
-	if v, err = dps.Float64s(ctx); err != nil {
-		return
-	}
-	switch len(v) {
-	case 1:
-		return v[0], nil
-	case 0:
-		err = &NotFoundError{dbpackage.Label}
-	default:
-		err = fmt.Errorf("ent: DbPackageSelect.Float64s returned %d results when one was expected", len(v))
-	}
-	return
-}
-
-// Float64X is like Float64, but panics if an error occurs.
-func (dps *DbPackageSelect) Float64X(ctx context.Context) float64 {
-	v, err := dps.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 (dps *DbPackageSelect) Bools(ctx context.Context) ([]bool, error) {
-	if len(dps.fields) > 1 {
-		return nil, errors.New("ent: DbPackageSelect.Bools is not achievable when selecting more than 1 field")
-	}
-	var v []bool
-	if err := dps.Scan(ctx, &v); err != nil {
-		return nil, err
-	}
-	return v, nil
-}
-
-// BoolsX is like Bools, but panics if an error occurs.
-func (dps *DbPackageSelect) BoolsX(ctx context.Context) []bool {
-	v, err := dps.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 (dps *DbPackageSelect) Bool(ctx context.Context) (_ bool, err error) {
-	var v []bool
-	if v, err = dps.Bools(ctx); err != nil {
-		return
-	}
-	switch len(v) {
-	case 1:
-		return v[0], nil
-	case 0:
-		err = &NotFoundError{dbpackage.Label}
-	default:
-		err = fmt.Errorf("ent: DbPackageSelect.Bools returned %d results when one was expected", len(v))
-	}
-	return
-}
-
-// BoolX is like Bool, but panics if an error occurs.
-func (dps *DbPackageSelect) BoolX(ctx context.Context) bool {
-	v, err := dps.Bool(ctx)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
-
 func (dps *DbPackageSelect) sqlScan(ctx context.Context, v interface{}) error {
 	rows := &sql.Rows{}
 	query, args := dps.sql.Query()