refactor: Refactor query condition,support nested query (#54)

Author: afumu

constants/keyword.go

@@ -18,24 +18,26 @@
 package constants
 
 const (
-	And     = "AND"
-	Or      = "OR"
-	In      = "IN"
-	Not     = "NOT"
-	Like    = "LIKE"
-	Eq      = "="
-	Ne      = "<>"
-	Gt      = ">"
-	Ge      = ">="
-	Lt      = "<"
-	Le      = "<="
-	Between = "BETWEEN"
-	Desc    = "DESC"
-	Asc     = "ASC"
-	As      = "AS"
-	SUM     = "SUM"
-	AVG     = "AVG"
-	MAX     = "MAX"
-	MIN     = "MIN"
-	COUNT   = "COUNT"
+	And       = "AND"
+	Or        = "OR"
+	In        = "IN"
+	Not       = "NOT"
+	Like      = "LIKE"
+	Eq        = "="
+	Ne        = "<>"
+	Gt        = ">"
+	Ge        = ">="
+	Lt        = "<"
+	Le        = "<="
+	IsNull    = "IS NULL"
+	IsNotNull = "IS NOT NULL"
+	Between   = "BETWEEN"
+	Desc      = "DESC"
+	Asc       = "ASC"
+	As        = "AS"
+	SUM       = "SUM"
+	AVG       = "AVG"
+	MAX       = "MAX"
+	MIN       = "MIN"
+	COUNT     = "COUNT"
 )

gplus/dao.go

@@ -14,17 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package gplus
 
 import (
 	"database/sql"
-	"reflect"
-
 	"github.com/acmestack/gorm-plus/constants"
 	"gorm.io/gorm"
 	"gorm.io/gorm/schema"
 	"gorm.io/gorm/utils"
+	"reflect"
+	"strings"
 )
 
 var globalDb *gorm.DB
@@ -45,8 +44,7 @@ type Page[T any] struct {
 type Dao[T any] struct{}
 
 func (dao Dao[T]) NewQuery() (*QueryCond[T], *T) {
-	q := &QueryCond[T]{}
-	return q, nil
+	return NewQuery[T]()
 }
 
 func NewPage[T any](current, size int) *Page[T] {
@@ -268,8 +266,11 @@ func paginate[T any](p *Page[T]) func(db *gorm.DB) *gorm.DB {
 
 func buildCondition[T any](q *QueryCond[T], opts ...OptionFunc) *gorm.DB {
 	db := getDb(opts...)
+	// 这里清空参数，避免用户重复使用一个query条件
+	q.queryArgs = make([]any, 0)
 	resultDb := db.Model(new(T))
 	if q != nil {
+
 		if len(q.distinctColumns) > 0 {
 			resultDb.Distinct(q.distinctColumns)
 		}
@@ -278,19 +279,11 @@ func buildCondition[T any](q *QueryCond[T], opts ...OptionFunc) *gorm.DB {
 			resultDb.Select(q.selectColumns)
 		}
 
-		if q.queryBuilder.Len() > 0 {
-
-			if q.andNestBuilder.Len() > 0 {
-				q.queryArgs = append(q.queryArgs, q.andNestArgs...)
-				q.queryBuilder.WriteString(q.andNestBuilder.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...)
+		expressions := q.queryExpressions
+		if len(expressions) > 0 {
+			var sqlBuilder strings.Builder
+			q.queryArgs = buildSqlAndArgs[T](expressions, &sqlBuilder, q.queryArgs)
+			resultDb.Where(sqlBuilder.String(), q.queryArgs...)
 		}
 
 		if q.orderBuilder.Len() > 0 {
@@ -316,29 +309,31 @@ func buildCondition[T any](q *QueryCond[T], opts ...OptionFunc) *gorm.DB {
 	return resultDb
 }
 
-func getPkColumnName[T any]() string {
-	var entity T
-	entityType := reflect.TypeOf(entity)
-	numField := entityType.NumField()
-	var columnName string
-	for i := 0; i < numField; i++ {
-		field := entityType.Field(i)
-		tagSetting := schema.ParseTagSetting(field.Tag.Get("gorm"), ";")
-		isPrimaryKey := utils.CheckTruth(tagSetting["PRIMARYKEY"], tagSetting["PRIMARY_KEY"])
-		if isPrimaryKey {
-			name, ok := tagSetting["COLUMN"]
-			if !ok {
-				namingStrategy := schema.NamingStrategy{}
-				name = namingStrategy.ColumnName("", field.Name)
+func buildSqlAndArgs[T any](expressions []any, sqlBuilder *strings.Builder, queryArgs []any) []any {
+	for _, v := range expressions {
+		// 判断是否是columnValue类型
+		switch segment := v.(type) {
+		case *columnPointer:
+			sqlBuilder.WriteString(segment.getSqlSegment() + " ")
+		case *sqlKeyword:
+			sqlBuilder.WriteString(segment.getSqlSegment() + " ")
+		case *columnValue:
+			if segment.value == constants.And {
+				sqlBuilder.WriteString(segment.value.(string) + " ")
+				continue
 			}
-			columnName = name
-			break
+			if segment.value != "" {
+				sqlBuilder.WriteString("? ")
+				queryArgs = append(queryArgs, segment.value)
+			}
+		case *QueryCond[T]:
+			sqlBuilder.WriteString(constants.LeftBracket + " ")
+			// 递归处理条件
+			queryArgs = buildSqlAndArgs[T](segment.queryExpressions, sqlBuilder, queryArgs)
+			sqlBuilder.WriteString(constants.RightBracket + " ")
 		}
 	}
-	if columnName == "" {
-		return constants.DefaultPrimaryName
-	}
-	return columnName
+	return queryArgs
 }
 
 func getDb(opts ...OptionFunc) *gorm.DB {
@@ -359,6 +354,14 @@ func getDb(opts ...OptionFunc) *gorm.DB {
 	return db
 }
 
+func getOption(opts []OptionFunc) Option {
+	var config Option
+	for _, op := range opts {
+		op(&config)
+	}
+	return config
+}
+
 func setSelectIfNeed(option Option, db *gorm.DB) {
 	if len(option.Selects) > 0 {
 		var columnNames []string
@@ -381,10 +384,27 @@ func setOmitIfNeed(option Option, db *gorm.DB) {
 	}
 }
 
-func getOption(opts []OptionFunc) Option {
-	var config Option
-	for _, op := range opts {
-		op(&config)
+func getPkColumnName[T any]() string {
+	var entity T
+	entityType := reflect.TypeOf(entity)
+	numField := entityType.NumField()
+	var columnName string
+	for i := 0; i < numField; i++ {
+		field := entityType.Field(i)
+		tagSetting := schema.ParseTagSetting(field.Tag.Get("gorm"), ";")
+		isPrimaryKey := utils.CheckTruth(tagSetting["PRIMARYKEY"], tagSetting["PRIMARY_KEY"])
+		if isPrimaryKey {
+			name, ok := tagSetting["COLUMN"]
+			if !ok {
+				namingStrategy := schema.NamingStrategy{}
+				name = namingStrategy.ColumnName("", field.Name)
+			}
+			columnName = name
+			break
+		}
 	}
-	return config
+	if columnName == "" {
+		return constants.DefaultPrimaryName
+	}
+	return columnName
 }

gplus/function.go

@@ -67,11 +67,11 @@ func (f *Function) NotIn(values ...any) (string, []any) {
 }
 
 func (f *Function) Between(start int64, end int64) (string, int64, int64) {
-	return f.funStr + " " + constants.Between + " ? and ?", start, end
+	return f.funStr + " " + constants.Between + " ? " + constants.And + " ?", start, end
 }
 
 func (f *Function) NotBetween(start int64, end int64) (string, int64, int64) {
-	return f.funStr + " " + constants.Not + " " + constants.Between + " ? and ?", start, end
+	return f.funStr + " " + constants.Not + " " + constants.Between + " ? " + constants.And + " ?", start, end
 }
 
 func Sum(columnName any) *Function {