feat: add having

Author: afumu

gormplus/mapper.go

@@ -45,7 +45,7 @@ func DeleteByIds[T any](ids ...any) *gorm.DB {
 
 func Delete[T any](q *Query[T]) *gorm.DB {
 	var entity T
-	resultDb := GormDb.Where(q.QueryBuilder.String(), q.Args...).Delete(&entity)
+	resultDb := GormDb.Where(q.QueryBuilder.String(), q.QueryArgs...).Delete(&entity)
 	return resultDb
 }
 
@@ -57,7 +57,7 @@ func UpdateById[T any](id any, entity *T) *gorm.DB {
 }
 
 func Update[T any](q *Query[T], entity *T) *gorm.DB {
-	resultDb := GormDb.Where(q.QueryBuilder.String(), q.Args...).Updates(entity)
+	resultDb := GormDb.Where(q.QueryBuilder.String(), q.QueryArgs...).Updates(entity)
 	return resultDb
 }
 
@@ -75,23 +75,29 @@ func SelectByIds[T any](ids ...any) (*gorm.DB, []T) {
 
 func SelectOne[T any](q *Query[T]) (*gorm.DB, T) {
 	var entity T
-	resultDb := GormDb.Select(q.Columns).Where(q.QueryBuilder.String(), q.Args...).First(&entity)
+	resultDb := GormDb.Select(q.Columns).Where(q.QueryBuilder.String(), q.QueryArgs...).First(&entity)
 	return resultDb, entity
 }
 
 func SelectList[T any](q *Query[T]) (*gorm.DB, []T) {
 	var results []T
-	resultDb := GormDb.Select(q.Columns).Where(q.QueryBuilder.String(), q.Args...).
+	resultDb := GormDb.Select(q.Columns).Where(q.QueryBuilder.String(), q.QueryArgs...).
 		Order(q.OrderBuilder.String())
+
 	if q.GroupBuilder.Len() > 0 {
 		resultDb.Group(q.GroupBuilder.String())
 	}
+
+	if q.HavingBuilder.Len() > 0 {
+		resultDb.Having(q.HavingBuilder.String(), q.HavingArgs...)
+	}
+
 	resultDb.Find(&results)
 	return resultDb, results
 }
 
 func SelectCount[T any](q *Query[T]) (*gorm.DB, int64) {
 	var count int64
-	resultDb := GormDb.Model(new(T)).Where(q.QueryBuilder.String(), q.Args...).Count(&count)
+	resultDb := GormDb.Model(new(T)).Where(q.QueryBuilder.String(), q.QueryArgs...).Count(&count)
 	return resultDb, count
 }

gormplus/mapper_test.go

@@ -117,7 +117,7 @@ func TestSelectOne(t *testing.T) {
 
 func TestSelectList(t *testing.T) {
 	q := Query[Test1]{}
-	q.Group("price", "code")
+	q.Group("price", "code").Having("count(*) > ?", 1)
 	db, result := SelectList(&q)
 	fmt.Println(db.RowsAffected)
 	for _, v := range result {

gormplus/query.go

@@ -7,12 +7,14 @@ import (
 )
 
 type Query[T any] struct {
-	Columns      []string
-	OrderBuilder strings.Builder
-	GroupBuilder strings.Builder
-	QueryBuilder strings.Builder
-	Args         []any
-	LastCond     string
+	Columns       []string
+	QueryBuilder  strings.Builder
+	QueryArgs     []any
+	OrderBuilder  strings.Builder
+	GroupBuilder  strings.Builder
+	HavingBuilder strings.Builder
+	HavingArgs    []any
+	LastCond      string
 }
 
 func (q *Query[T]) Eq(column string, val any) *Query[T] {
@@ -113,6 +115,12 @@ func (q *Query[T]) Group(columns ...string) *Query[T] {
 	return q
 }
 
+func (q *Query[T]) Having(having string, args ...any) *Query[T] {
+	q.HavingBuilder.WriteString(having)
+	q.HavingArgs = append(q.HavingArgs, args)
+	return q
+}
+
 func (q *Query[T]) addCond(column string, val any, condType string) {
 	if q.LastCond != constants.And && q.LastCond != constants.Or && q.QueryBuilder.Len() > 0 {
 		q.QueryBuilder.WriteString(constants.And)
@@ -122,7 +130,7 @@ func (q *Query[T]) addCond(column string, val any, condType string) {
 	q.QueryBuilder.WriteString(cond)
 	q.QueryBuilder.WriteString(" ")
 	q.LastCond = ""
-	q.Args = append(q.Args, val)
+	q.QueryArgs = append(q.QueryArgs, val)
 }
 
 func (q *Query[T]) buildOrder(orderType string, columns ...string) {