feat: add bracket query

Author: afumu

constants/constants.go

@@ -1,5 +1,7 @@
 package constants
 
 const (
-	COMMA = ","
+	Comma        = ","
+	LeftBracket  = "("
+	RightBracket = ")"
 )

example/example_select_test.go

@@ -70,8 +70,18 @@ func TestSelectOne2(t *testing.T) {
 	log.Println(string(marshal))
 }
 
-func TestSelectList1(t *testing.T) {
-	q := &gormplus.Query[User]{}
+func f(q *gormplus.Query[User]) *gormplus.Query[User] {
+	q.Eq(UserColumn.Address, "上海").Or().Eq(UserColumn.Address, "北京")
+	return q
+}
+func aa(q1 *gormplus.Query[User]) func(q *gormplus.Query[User]) *gormplus.Query[User] {
+	return func(q *gormplus.Query[User]) *gormplus.Query[User] {
+		return q1
+	}
+}
+
+func TestSelectList(t *testing.T) {
+	q := gormplus.NewQuery[User]()
 	q.Eq(UserColumn.Username, "zhangsan")
 	users, resultDb := gormplus.SelectList(q)
 	if resultDb.Error != nil {
@@ -83,6 +93,21 @@ func TestSelectList1(t *testing.T) {
 	}
 }
 
+func TestSelectBracketList(t *testing.T) {
+	q := gormplus.NewQuery[User]()
+	bracketQuery := gormplus.NewQuery[User]()
+	bracketQuery.Eq(UserColumn.Address, "上海").Or().Eq(UserColumn.Address, "北京")
+	q.Eq(UserColumn.Username, "zhangsan").AndBracket(bracketQuery)
+	users, resultDb := gormplus.SelectList(q)
+	if resultDb.Error != nil {
+		log.Fatalln("error:", resultDb.Error)
+	}
+	for _, u := range users {
+		marshal, _ := json.Marshal(u)
+		log.Println(string(marshal))
+	}
+}
+
 func TestSelectTableList(t *testing.T) {
 	type deptCount struct {
 		Dept  string

example/user.go

@@ -6,6 +6,7 @@ type User struct {
 	ID        int64  `gorm:"primaryKey"`
 	Username  string `gorm:"column:username"`
 	Password  string
+	Address   string
 	Age       int
 	Phone     string
 	Score     int

example/zz_gen_column.go

@@ -4,6 +4,7 @@ var UserColumn = struct {
 	ID        string
 	Username  string
 	Password  string
+	Address   string
 	Age       string
 	Phone     string
 	Score     string
@@ -14,6 +15,7 @@ var UserColumn = struct {
 	ID:        "id",
 	Username:  "username",
 	Password:  "password",
+	Address:   "address",
 	Age:       "age",
 	Phone:     "phone",
 	Score:     "score",

gormplus/mapper.go

@@ -166,6 +166,17 @@ func buildCondition[T any](q *Query[T]) *gorm.DB {
 		}
 
 		if q.QueryBuilder.Len() > 0 {
+
+			if q.AndBracketBuilder.Len() > 0 {
+				q.QueryArgs = append(q.QueryArgs, q.AndBracketArgs...)
+				q.QueryBuilder.WriteString(q.AndBracketBuilder.String())
+			}
+
+			if q.OrBracketBuilder.Len() > 0 {
+				q.QueryArgs = append(q.QueryArgs, q.OrBracketArgs...)
+				q.QueryBuilder.WriteString(q.OrBracketBuilder.String())
+			}
+
 			resultDb.Where(q.QueryBuilder.String(), q.QueryArgs...)
 		}
 

gormplus/query.go

@@ -7,16 +7,20 @@ import (
 )
 
 type Query[T any] struct {
-	SelectColumns   []string
-	DistinctColumns []string
-	QueryBuilder    strings.Builder
-	QueryArgs       []any
-	OrderBuilder    strings.Builder
-	GroupBuilder    strings.Builder
-	HavingBuilder   strings.Builder
-	HavingArgs      []any
-	LastCond        string
-	UpdateMap       map[string]any
+	SelectColumns     []string
+	DistinctColumns   []string
+	QueryBuilder      strings.Builder
+	OrBracketBuilder  strings.Builder
+	OrBracketArgs     []any
+	AndBracketBuilder strings.Builder
+	AndBracketArgs    []any
+	QueryArgs         []any
+	OrderBuilder      strings.Builder
+	GroupBuilder      strings.Builder
+	HavingBuilder     strings.Builder
+	HavingArgs        []any
+	LastCond          string
+	UpdateMap         map[string]any
 }
 
 func NewQuery[T any]() *Query[T] {
@@ -129,13 +133,25 @@ func (q *Query[T]) And() *Query[T] {
 	return q
 }
 
+func (q *Query[T]) AndBracket(bracketQuery *Query[T]) *Query[T] {
+	q.AndBracketBuilder.WriteString(constants.And + " " + constants.LeftBracket + bracketQuery.QueryBuilder.String() + constants.RightBracket + " ")
+	q.AndBracketArgs = append(q.AndBracketArgs, bracketQuery.QueryArgs...)
+	return q
+}
+
 func (q *Query[T]) Or() *Query[T] {
 	q.QueryBuilder.WriteString(constants.Or)
 	q.QueryBuilder.WriteString(" ")
 	q.LastCond = constants.Or
 	return q
 }
 
+func (q *Query[T]) OrBracket(bracketQuery *Query[T]) *Query[T] {
+	q.OrBracketBuilder.WriteString(constants.Or + " " + constants.LeftBracket + bracketQuery.QueryBuilder.String() + constants.RightBracket + " ")
+	q.OrBracketArgs = append(q.OrBracketArgs, bracketQuery.QueryArgs...)
+	return q
+}
+
 func (q *Query[T]) Select(columns ...string) *Query[T] {
 	q.SelectColumns = append(q.SelectColumns, columns...)
 	return q
@@ -154,7 +170,7 @@ func (q *Query[T]) OrderByAsc(columns ...string) *Query[T] {
 func (q *Query[T]) Group(columns ...string) *Query[T] {
 	for _, v := range columns {
 		if q.GroupBuilder.Len() > 0 {
-			q.GroupBuilder.WriteString(constants.COMMA)
+			q.GroupBuilder.WriteString(constants.Comma)
 		}
 		q.GroupBuilder.WriteString(v)
 	}
@@ -194,7 +210,7 @@ func (q *Query[T]) buildAndIfNeed() {
 func (q *Query[T]) buildOrder(orderType string, columns ...string) {
 	for _, v := range columns {
 		if q.OrderBuilder.Len() > 0 {
-			q.OrderBuilder.WriteString(constants.COMMA)
+			q.OrderBuilder.WriteString(constants.Comma)
 		}
 		q.OrderBuilder.WriteString(v)
 		q.OrderBuilder.WriteString(" ")