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: chagne column-check error format

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/m2m2types/ent/ent.go
View File

@@ -42,12 +42,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
}
@@ -59,7 +59,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)))
}
@@ -72,7 +72,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)))
}
@@ -106,7 +106,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))
@@ -118,7 +118,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))
@@ -130,7 +130,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))
@@ -142,7 +142,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))