entc/gen: better formatted codegen for predicates (#336)

2026-05-24 09:31:56 +03:00 · 2020-02-09 11:38:03 +02:00
parent 26440c2bc9
commit 9f9596c184
61 changed files with 3783 additions and 6660 deletions
--- a/examples/m2m2types/ent/group/where.go
+++ b/examples/m2m2types/ent/group/where.go
@@ -14,27 +14,23 @@ import (

 // ID filters vertices based on their identifier.
 func ID(id int) predicate.Group {
-	return predicate.Group(
-		func(s *sql.Selector) {
-			s.Where(sql.EQ(s.C(FieldID), id))
-		},
-	)
+	return predicate.Group(func(s *sql.Selector) {
+		s.Where(sql.EQ(s.C(FieldID), id))
+	})
 }

 // IDEQ applies the EQ predicate on the ID field.
 func IDEQ(id int) predicate.Group {
 	return predicate.Group(func(s *sql.Selector) {
 		s.Where(sql.EQ(s.C(FieldID), id))
-	},
-	)
+	})
 }

 // IDNEQ applies the NEQ predicate on the ID field.
 func IDNEQ(id int) predicate.Group {
 	return predicate.Group(func(s *sql.Selector) {
 		s.Where(sql.NEQ(s.C(FieldID), id))
-	},
-	)
+	})
 }

 // IDIn applies the In predicate on the ID field.
@@ -51,8 +47,7 @@ func IDIn(ids ...int) predicate.Group {
 			v[i] = ids[i]
 		}
 		s.Where(sql.In(s.C(FieldID), v...))
-	},
-	)
+	})
 }

 // IDNotIn applies the NotIn predicate on the ID field.
@@ -69,64 +64,56 @@ func IDNotIn(ids ...int) predicate.Group {
 			v[i] = ids[i]
 		}
 		s.Where(sql.NotIn(s.C(FieldID), v...))
-	},
-	)
+	})
 }

 // IDGT applies the GT predicate on the ID field.
 func IDGT(id int) predicate.Group {
 	return predicate.Group(func(s *sql.Selector) {
 		s.Where(sql.GT(s.C(FieldID), id))
-	},
-	)
+	})
 }

 // IDGTE applies the GTE predicate on the ID field.
 func IDGTE(id int) predicate.Group {
 	return predicate.Group(func(s *sql.Selector) {
 		s.Where(sql.GTE(s.C(FieldID), id))
-	},
-	)
+	})
 }

 // IDLT applies the LT predicate on the ID field.
 func IDLT(id int) predicate.Group {
 	return predicate.Group(func(s *sql.Selector) {
 		s.Where(sql.LT(s.C(FieldID), id))
-	},
-	)
+	})
 }

 // IDLTE applies the LTE predicate on the ID field.
 func IDLTE(id int) predicate.Group {
 	return predicate.Group(func(s *sql.Selector) {
 		s.Where(sql.LTE(s.C(FieldID), id))
-	},
-	)
+	})
 }

 // Name applies equality check predicate on the "name" field. It's identical to NameEQ.
 func Name(v string) predicate.Group {
 	return predicate.Group(func(s *sql.Selector) {
 		s.Where(sql.EQ(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameEQ applies the EQ predicate on the "name" field.
 func NameEQ(v string) predicate.Group {
 	return predicate.Group(func(s *sql.Selector) {
 		s.Where(sql.EQ(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameNEQ applies the NEQ predicate on the "name" field.
 func NameNEQ(v string) predicate.Group {
 	return predicate.Group(func(s *sql.Selector) {
 		s.Where(sql.NEQ(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameIn applies the In predicate on the "name" field.
@@ -143,8 +130,7 @@ func NameIn(vs ...string) predicate.Group {
 			return
 		}
 		s.Where(sql.In(s.C(FieldName), v...))
-	},
-	)
+	})
 }

 // NameNotIn applies the NotIn predicate on the "name" field.
@@ -161,80 +147,70 @@ func NameNotIn(vs ...string) predicate.Group {
 			return
 		}
 		s.Where(sql.NotIn(s.C(FieldName), v...))
-	},
-	)
+	})
 }

 // NameGT applies the GT predicate on the "name" field.
 func NameGT(v string) predicate.Group {
 	return predicate.Group(func(s *sql.Selector) {
 		s.Where(sql.GT(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameGTE applies the GTE predicate on the "name" field.
 func NameGTE(v string) predicate.Group {
 	return predicate.Group(func(s *sql.Selector) {
 		s.Where(sql.GTE(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameLT applies the LT predicate on the "name" field.
 func NameLT(v string) predicate.Group {
 	return predicate.Group(func(s *sql.Selector) {
 		s.Where(sql.LT(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameLTE applies the LTE predicate on the "name" field.
 func NameLTE(v string) predicate.Group {
 	return predicate.Group(func(s *sql.Selector) {
 		s.Where(sql.LTE(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameContains applies the Contains predicate on the "name" field.
 func NameContains(v string) predicate.Group {
 	return predicate.Group(func(s *sql.Selector) {
 		s.Where(sql.Contains(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameHasPrefix applies the HasPrefix predicate on the "name" field.
 func NameHasPrefix(v string) predicate.Group {
 	return predicate.Group(func(s *sql.Selector) {
 		s.Where(sql.HasPrefix(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameHasSuffix applies the HasSuffix predicate on the "name" field.
 func NameHasSuffix(v string) predicate.Group {
 	return predicate.Group(func(s *sql.Selector) {
 		s.Where(sql.HasSuffix(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameEqualFold applies the EqualFold predicate on the "name" field.
 func NameEqualFold(v string) predicate.Group {
 	return predicate.Group(func(s *sql.Selector) {
 		s.Where(sql.EqualFold(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameContainsFold applies the ContainsFold predicate on the "name" field.
 func NameContainsFold(v string) predicate.Group {
 	return predicate.Group(func(s *sql.Selector) {
 		s.Where(sql.ContainsFold(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // HasUsers applies the HasEdge predicate on the "users" edge.
@@ -246,8 +222,7 @@ func HasUsers() predicate.Group {
 			sqlgraph.Edge(sqlgraph.M2M, false, UsersTable, UsersPrimaryKey...),
 		)
 		sqlgraph.HasNeighbors(s, step)
-	},
-	)
+	})
 }

 // HasUsersWith applies the HasEdge predicate on the "users" edge with a given conditions (other predicates).
@@ -263,44 +238,37 @@ func HasUsersWith(preds ...predicate.User) predicate.Group {
 				p(s)
 			}
 		})
-	},
-	)
+	})
 }

 // And groups list of predicates with the AND operator between them.
 func And(predicates ...predicate.Group) predicate.Group {
-	return predicate.Group(
-		func(s *sql.Selector) {
-			s1 := s.Clone().SetP(nil)
-			for _, p := range predicates {
-				p(s1)
-			}
-			s.Where(s1.P())
-		},
-	)
+	return predicate.Group(func(s *sql.Selector) {
+		s1 := s.Clone().SetP(nil)
+		for _, p := range predicates {
+			p(s1)
+		}
+		s.Where(s1.P())
+	})
 }

 // Or groups list of predicates with the OR operator between them.
 func Or(predicates ...predicate.Group) predicate.Group {
-	return predicate.Group(
-		func(s *sql.Selector) {
-			s1 := s.Clone().SetP(nil)
-			for i, p := range predicates {
-				if i > 0 {
-					s1.Or()
-				}
-				p(s1)
+	return predicate.Group(func(s *sql.Selector) {
+		s1 := s.Clone().SetP(nil)
+		for i, p := range predicates {
+			if i > 0 {
+				s1.Or()
 			}
-			s.Where(s1.P())
-		},
-	)
+			p(s1)
+		}
+		s.Where(s1.P())
+	})
 }

 // Not applies the not operator on the given predicate.
 func Not(p predicate.Group) predicate.Group {
-	return predicate.Group(
-		func(s *sql.Selector) {
-			p(s.Not())
-		},
-	)
+	return predicate.Group(func(s *sql.Selector) {
+		p(s.Not())
+	})
 }
--- a/examples/m2m2types/ent/user/where.go
+++ b/examples/m2m2types/ent/user/where.go
@@ -14,27 +14,23 @@ import (

 // ID filters vertices based on their identifier.
 func ID(id int) predicate.User {
-	return predicate.User(
-		func(s *sql.Selector) {
-			s.Where(sql.EQ(s.C(FieldID), id))
-		},
-	)
+	return predicate.User(func(s *sql.Selector) {
+		s.Where(sql.EQ(s.C(FieldID), id))
+	})
 }

 // IDEQ applies the EQ predicate on the ID field.
 func IDEQ(id int) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.EQ(s.C(FieldID), id))
-	},
-	)
+	})
 }

 // IDNEQ applies the NEQ predicate on the ID field.
 func IDNEQ(id int) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.NEQ(s.C(FieldID), id))
-	},
-	)
+	})
 }

 // IDIn applies the In predicate on the ID field.
@@ -51,8 +47,7 @@ func IDIn(ids ...int) predicate.User {
 			v[i] = ids[i]
 		}
 		s.Where(sql.In(s.C(FieldID), v...))
-	},
-	)
+	})
 }

 // IDNotIn applies the NotIn predicate on the ID field.
@@ -69,72 +64,63 @@ func IDNotIn(ids ...int) predicate.User {
 			v[i] = ids[i]
 		}
 		s.Where(sql.NotIn(s.C(FieldID), v...))
-	},
-	)
+	})
 }

 // IDGT applies the GT predicate on the ID field.
 func IDGT(id int) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.GT(s.C(FieldID), id))
-	},
-	)
+	})
 }

 // IDGTE applies the GTE predicate on the ID field.
 func IDGTE(id int) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.GTE(s.C(FieldID), id))
-	},
-	)
+	})
 }

 // IDLT applies the LT predicate on the ID field.
 func IDLT(id int) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.LT(s.C(FieldID), id))
-	},
-	)
+	})
 }

 // IDLTE applies the LTE predicate on the ID field.
 func IDLTE(id int) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.LTE(s.C(FieldID), id))
-	},
-	)
+	})
 }

 // Age applies equality check predicate on the "age" field. It's identical to AgeEQ.
 func Age(v int) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.EQ(s.C(FieldAge), v))
-	},
-	)
+	})
 }

 // Name applies equality check predicate on the "name" field. It's identical to NameEQ.
 func Name(v string) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.EQ(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // AgeEQ applies the EQ predicate on the "age" field.
 func AgeEQ(v int) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.EQ(s.C(FieldAge), v))
-	},
-	)
+	})
 }

 // AgeNEQ applies the NEQ predicate on the "age" field.
 func AgeNEQ(v int) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.NEQ(s.C(FieldAge), v))
-	},
-	)
+	})
 }

 // AgeIn applies the In predicate on the "age" field.
@@ -151,8 +137,7 @@ func AgeIn(vs ...int) predicate.User {
 			return
 		}
 		s.Where(sql.In(s.C(FieldAge), v...))
-	},
-	)
+	})
 }

 // AgeNotIn applies the NotIn predicate on the "age" field.
@@ -169,56 +154,49 @@ func AgeNotIn(vs ...int) predicate.User {
 			return
 		}
 		s.Where(sql.NotIn(s.C(FieldAge), v...))
-	},
-	)
+	})
 }

 // AgeGT applies the GT predicate on the "age" field.
 func AgeGT(v int) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.GT(s.C(FieldAge), v))
-	},
-	)
+	})
 }

 // AgeGTE applies the GTE predicate on the "age" field.
 func AgeGTE(v int) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.GTE(s.C(FieldAge), v))
-	},
-	)
+	})
 }

 // AgeLT applies the LT predicate on the "age" field.
 func AgeLT(v int) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.LT(s.C(FieldAge), v))
-	},
-	)
+	})
 }

 // AgeLTE applies the LTE predicate on the "age" field.
 func AgeLTE(v int) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.LTE(s.C(FieldAge), v))
-	},
-	)
+	})
 }

 // NameEQ applies the EQ predicate on the "name" field.
 func NameEQ(v string) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.EQ(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameNEQ applies the NEQ predicate on the "name" field.
 func NameNEQ(v string) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.NEQ(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameIn applies the In predicate on the "name" field.
@@ -235,8 +213,7 @@ func NameIn(vs ...string) predicate.User {
 			return
 		}
 		s.Where(sql.In(s.C(FieldName), v...))
-	},
-	)
+	})
 }

 // NameNotIn applies the NotIn predicate on the "name" field.
@@ -253,80 +230,70 @@ func NameNotIn(vs ...string) predicate.User {
 			return
 		}
 		s.Where(sql.NotIn(s.C(FieldName), v...))
-	},
-	)
+	})
 }

 // NameGT applies the GT predicate on the "name" field.
 func NameGT(v string) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.GT(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameGTE applies the GTE predicate on the "name" field.
 func NameGTE(v string) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.GTE(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameLT applies the LT predicate on the "name" field.
 func NameLT(v string) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.LT(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameLTE applies the LTE predicate on the "name" field.
 func NameLTE(v string) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.LTE(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameContains applies the Contains predicate on the "name" field.
 func NameContains(v string) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.Contains(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameHasPrefix applies the HasPrefix predicate on the "name" field.
 func NameHasPrefix(v string) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.HasPrefix(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameHasSuffix applies the HasSuffix predicate on the "name" field.
 func NameHasSuffix(v string) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.HasSuffix(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameEqualFold applies the EqualFold predicate on the "name" field.
 func NameEqualFold(v string) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.EqualFold(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // NameContainsFold applies the ContainsFold predicate on the "name" field.
 func NameContainsFold(v string) predicate.User {
 	return predicate.User(func(s *sql.Selector) {
 		s.Where(sql.ContainsFold(s.C(FieldName), v))
-	},
-	)
+	})
 }

 // HasGroups applies the HasEdge predicate on the "groups" edge.
@@ -338,8 +305,7 @@ func HasGroups() predicate.User {
 			sqlgraph.Edge(sqlgraph.M2M, true, GroupsTable, GroupsPrimaryKey...),
 		)
 		sqlgraph.HasNeighbors(s, step)
-	},
-	)
+	})
 }

 // HasGroupsWith applies the HasEdge predicate on the "groups" edge with a given conditions (other predicates).
@@ -355,44 +321,37 @@ func HasGroupsWith(preds ...predicate.Group) predicate.User {
 				p(s)
 			}
 		})
-	},
-	)
+	})
 }

 // And groups list of predicates with the AND operator between them.
 func And(predicates ...predicate.User) predicate.User {
-	return predicate.User(
-		func(s *sql.Selector) {
-			s1 := s.Clone().SetP(nil)
-			for _, p := range predicates {
-				p(s1)
-			}
-			s.Where(s1.P())
-		},
-	)
+	return predicate.User(func(s *sql.Selector) {
+		s1 := s.Clone().SetP(nil)
+		for _, p := range predicates {
+			p(s1)
+		}
+		s.Where(s1.P())
+	})
 }

 // Or groups list of predicates with the OR operator between them.
 func Or(predicates ...predicate.User) predicate.User {
-	return predicate.User(
-		func(s *sql.Selector) {
-			s1 := s.Clone().SetP(nil)
-			for i, p := range predicates {
-				if i > 0 {
-					s1.Or()
-				}
-				p(s1)
+	return predicate.User(func(s *sql.Selector) {
+		s1 := s.Clone().SetP(nil)
+		for i, p := range predicates {
+			if i > 0 {
+				s1.Or()
 			}
-			s.Where(s1.P())
-		},
-	)
+			p(s1)
+		}
+		s.Where(s1.P())
+	})
 }

 // Not applies the not operator on the given predicate.
 func Not(p predicate.User) predicate.User {
-	return predicate.User(
-		func(s *sql.Selector) {
-			p(s.Not())
-		},
-	)
+	return predicate.User(func(s *sql.Selector) {
+		p(s.Not())
+	})
 }