entc/gen: chagne column-check error format

This commit is contained in:
Ariel Mashraki
2021-03-29 14:45:30 +03:00
committed by Ariel Mashraki
parent f12ef91829
commit 21989f4aa4
30 changed files with 225 additions and 225 deletions

View File

@@ -44,12 +44,12 @@ func columnChecker(table string) func(string) error {
check, ok := checks[table]
if !ok {
return func(string) error {
return fmt.Errorf("ent: unknown table %q", table)
return fmt.Errorf("unknown table %q", table)
}
}
return func(column string) error {
if !check(column) {
return fmt.Errorf("ent: unknown column %q for table %q", column, table)
return fmt.Errorf("unknown column %q for table %q", column, table)
}
return nil
}
@@ -61,7 +61,7 @@ func Asc(fields ...string) OrderFunc {
check := columnChecker(s.TableName())
for _, f := range fields {
if err := check(f); err != nil {
s.AddError(&ValidationError{Name: f, err: fmt.Errorf("ordering error: %w", err)})
s.AddError(&ValidationError{Name: f, err: fmt.Errorf("ent: %w", err)})
}
s.OrderBy(sql.Asc(s.C(f)))
}
@@ -74,7 +74,7 @@ func Desc(fields ...string) OrderFunc {
check := columnChecker(s.TableName())
for _, f := range fields {
if err := check(f); err != nil {
s.AddError(&ValidationError{Name: f, err: fmt.Errorf("ordering error: %w", err)})
s.AddError(&ValidationError{Name: f, err: fmt.Errorf("ent: %w", err)})
}
s.OrderBy(sql.Desc(s.C(f)))
}
@@ -108,7 +108,7 @@ func Max(field string) AggregateFunc {
return func(s *sql.Selector) string {
check := columnChecker(s.TableName())
if err := check(field); err != nil {
s.AddError(&ValidationError{Name: field, err: fmt.Errorf("grouping error: %w", err)})
s.AddError(&ValidationError{Name: field, err: fmt.Errorf("ent: %w", err)})
return ""
}
return sql.Max(s.C(field))
@@ -120,7 +120,7 @@ func Mean(field string) AggregateFunc {
return func(s *sql.Selector) string {
check := columnChecker(s.TableName())
if err := check(field); err != nil {
s.AddError(&ValidationError{Name: field, err: fmt.Errorf("grouping error: %w", err)})
s.AddError(&ValidationError{Name: field, err: fmt.Errorf("ent: %w", err)})
return ""
}
return sql.Avg(s.C(field))
@@ -132,7 +132,7 @@ func Min(field string) AggregateFunc {
return func(s *sql.Selector) string {
check := columnChecker(s.TableName())
if err := check(field); err != nil {
s.AddError(&ValidationError{Name: field, err: fmt.Errorf("grouping error: %w", err)})
s.AddError(&ValidationError{Name: field, err: fmt.Errorf("ent: %w", err)})
return ""
}
return sql.Min(s.C(field))
@@ -144,7 +144,7 @@ func Sum(field string) AggregateFunc {
return func(s *sql.Selector) string {
check := columnChecker(s.TableName())
if err := check(field); err != nil {
s.AddError(&ValidationError{Name: field, err: fmt.Errorf("grouping error: %w", err)})
s.AddError(&ValidationError{Name: field, err: fmt.Errorf("ent: %w", err)})
return ""
}
return sql.Sum(s.C(field))