feat: add nest query condition (#49)

Author: afumu

gplus/dao.go

@@ -106,18 +106,6 @@ func Delete[T any](q *QueryCond[T], opts ...OptionFunc) *gorm.DB {
 	return resultDb
 }
 
-// DeleteByMap 根据Map删除记录
-func DeleteByMap[T any](q *QueryCond[T], opts ...OptionFunc) *gorm.DB {
-	db := getDb(opts...)
-	for k, v := range q.ConditionMap {
-		columnName := getColumnName(k)
-		q.Eq(columnName, v)
-	}
-	var entity T
-	resultDb := db.Where(q.queryBuilder.String(), q.queryArgs...).Delete(&entity)
-	return resultDb
-}
-
 // UpdateById 根据 ID 更新
 func UpdateById[T any](entity *T, opts ...OptionFunc) *gorm.DB {
 	db := getDb(opts...)
@@ -297,28 +285,19 @@ func buildCondition[T any](q *QueryCond[T], opts ...OptionFunc) *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.andNestBuilder.Len() > 0 {
+				q.queryArgs = append(q.queryArgs, q.andNestArgs...)
+				q.queryBuilder.WriteString(q.andNestBuilder.String())
 			}
 
-			if q.orBracketBuilder.Len() > 0 {
-				q.queryArgs = append(q.queryArgs, q.orBracketArgs...)
-				q.queryBuilder.WriteString(q.orBracketBuilder.String())
+			if q.orNestBuilder.Len() > 0 {
+				q.queryArgs = append(q.queryArgs, q.orNestArgs...)
+				q.queryBuilder.WriteString(q.orNestBuilder.String())
 			}
 
 			resultDb.Where(q.queryBuilder.String(), q.queryArgs...)
 		}
 
-		if len(q.ConditionMap) > 0 {
-			var condMap = make(map[string]any)
-			for k, v := range q.ConditionMap {
-				columnName := getColumnName(k)
-				condMap[columnName] = v
-			}
-			resultDb.Where(condMap)
-		}
-
 		if q.orderBuilder.Len() > 0 {
 			resultDb.Order(q.orderBuilder.String())
 		}
@@ -330,6 +309,14 @@ func buildCondition[T any](q *QueryCond[T], opts ...OptionFunc) *gorm.DB {
 		if q.havingBuilder.Len() > 0 {
 			resultDb.Having(q.havingBuilder.String(), q.havingArgs...)
 		}
+
+		if q.limit != nil {
+			resultDb.Limit(*q.limit)
+		}
+
+		if q.offset != 0 {
+			resultDb.Offset(q.offset)
+		}
 	}
 	return resultDb
 }

gplus/option.go

@@ -20,10 +20,9 @@ package gplus
 import "gorm.io/gorm"
 
 type Option struct {
-	Db      *gorm.DB
-	Selects []any
-	Omits   []any
-
+	Db          *gorm.DB
+	Selects     []any
+	Omits       []any
 	IgnoreTotal bool
 }
 

gplus/query.go

@@ -25,21 +25,22 @@ import (
 )
 
 type QueryCond[T any] struct {
-	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
-	ConditionMap      map[any]any
+	selectColumns   []string
+	distinctColumns []string
+	queryBuilder    strings.Builder
+	orNestBuilder   strings.Builder
+	orNestArgs      []any
+	andNestBuilder  strings.Builder
+	andNestArgs     []any
+	queryArgs       []any
+	orderBuilder    strings.Builder
+	groupBuilder    strings.Builder
+	havingBuilder   strings.Builder
+	havingArgs      []any
+	lastCond        string
+	limit           *int
+	offset          int
+	updateMap       map[string]any
 }
 
 // NewQuery 构建查询条件
@@ -83,21 +84,6 @@ func NewQueryModel[T any, R any]() (*QueryCond[T], *T, *R) {
 	return q, t, r
 }
 
-// NewQueryMap 构建Map查询条件
-func NewQueryMap[T any]() (*QueryCond[T], *T) {
-	q := &QueryCond[T]{}
-
-	modelTypeStr := reflect.TypeOf((*T)(nil)).Elem().String()
-	if model, ok := modelInstanceCache.Load(modelTypeStr); ok {
-		return q, model.(*T)
-	}
-	m := new(T)
-	Cache(m)
-
-	q.ConditionMap = make(map[any]any)
-	return q, m
-}
-
 // Eq 等于 =
 func (q *QueryCond[T]) Eq(column any, val any) *QueryCond[T] {
 	q.addCond(column, val, constants.Eq)
@@ -223,35 +209,35 @@ func (q *QueryCond[T]) Distinct(columns ...any) *QueryCond[T] {
 }
 
 // And 拼接 AND
-func (q *QueryCond[T]) And() *QueryCond[T] {
+func (q *QueryCond[T]) And(fn ...func(q *QueryCond[T])) *QueryCond[T] {
+	if len(fn) > 0 {
+		nestQuery := &QueryCond[T]{}
+		fn[0](nestQuery)
+		q.andNestBuilder.WriteString(constants.And + " " + constants.LeftBracket + nestQuery.queryBuilder.String() + constants.RightBracket + " ")
+		q.andNestArgs = append(q.andNestArgs, nestQuery.queryArgs...)
+		return q
+	}
 	q.queryBuilder.WriteString(constants.And)
 	q.queryBuilder.WriteString(" ")
 	q.lastCond = constants.And
 	return q
 }
 
-// AndBracket 拼接 AND，括号包裹条件
-func (q *QueryCond[T]) AndBracket(bracketQuery *QueryCond[T]) *QueryCond[T] {
-	q.andBracketBuilder.WriteString(constants.And + " " + constants.LeftBracket + bracketQuery.queryBuilder.String() + constants.RightBracket + " ")
-	q.andBracketArgs = append(q.andBracketArgs, bracketQuery.queryArgs...)
-	return q
-}
-
 // Or 拼接 OR
-func (q *QueryCond[T]) Or() *QueryCond[T] {
+func (q *QueryCond[T]) Or(fn ...func(q *QueryCond[T])) *QueryCond[T] {
+	if len(fn) > 0 {
+		nestQuery := &QueryCond[T]{}
+		fn[0](nestQuery)
+		q.orNestBuilder.WriteString(constants.Or + " " + constants.LeftBracket + nestQuery.queryBuilder.String() + constants.RightBracket + " ")
+		q.orNestArgs = append(q.orNestArgs, nestQuery.queryArgs...)
+		return q
+	}
 	q.queryBuilder.WriteString(constants.Or)
 	q.queryBuilder.WriteString(" ")
 	q.lastCond = constants.Or
 	return q
 }
 
-// OrBracket 拼接 OR，括号包裹条件
-func (q *QueryCond[T]) OrBracket(bracketQuery *QueryCond[T]) *QueryCond[T] {
-	q.orBracketBuilder.WriteString(constants.Or + " " + constants.LeftBracket + bracketQuery.queryBuilder.String() + constants.RightBracket + " ")
-	q.orBracketArgs = append(q.orBracketArgs, bracketQuery.queryArgs...)
-	return q
-}
-
 // Select 查询字段
 func (q *QueryCond[T]) Select(columns ...any) *QueryCond[T] {
 	for _, v := range columns {
@@ -319,6 +305,18 @@ func (q *QueryCond[T]) Set(column any, val any) *QueryCond[T] {
 	return q
 }
 
+// Limit 指的查询记录数量
+func (q *QueryCond[T]) Limit(limit int) *QueryCond[T] {
+	q.limit = &limit
+	return q
+}
+
+// Offset 指定跳过记录数量
+func (q *QueryCond[T]) Offset(offset int) *QueryCond[T] {
+	q.offset = offset
+	return q
+}
+
 func (q *QueryCond[T]) addCond(column any, val any, condType string) {
 	columnName := getColumnName(column)
 	q.buildAndIfNeed()