add: between and not between

Author: afumu

constants/keyword.go

@@ -1,17 +1,18 @@
 package constants
 
 const (
-	And  = "AND"
-	Or   = "OR"
-	In   = "IN"
-	Not  = "NOT"
-	Like = " LIKE "
-	Eq   = "="
-	Ne   = "<>"
-	Gt   = ">"
-	Ge   = ">="
-	Lt   = "<"
-	Le   = "<="
-	Desc = "DESC"
-	Asc  = "ASC"
+	And     = "AND"
+	Or      = "OR"
+	In      = "IN"
+	Not     = "NOT"
+	Like    = " LIKE "
+	Eq      = "="
+	Ne      = "<>"
+	Gt      = ">"
+	Ge      = ">="
+	Lt      = "<"
+	Le      = "<="
+	Between = "BETWEEN"
+	Desc    = "DESC"
+	Asc     = "ASC"
 )

gormplus/mapper.go

@@ -82,6 +82,7 @@ func SelectOne[T any](q *Query[T]) (*gorm.DB, T) {
 func SelectList[T any](q *Query[T]) (*gorm.DB, []T) {
 	var results []T
 	resultDb := GormDb.Model(new(T))
+	//resultDb.Where("price between ? and ?", 100, 200)
 
 	if len(q.DistinctColumns) > 0 {
 		resultDb.Distinct(q.DistinctColumns)

gormplus/mapper_test.go

@@ -117,6 +117,7 @@ func TestSelectOne(t *testing.T) {
 
 func TestSelectList(t *testing.T) {
 	q := Query[Test1]{}
+	q.NotBetween("price", 100, 200)
 	db, result := SelectList(&q)
 	fmt.Println(db.RowsAffected)
 	for _, v := range result {

gormplus/query.go

@@ -77,6 +77,20 @@ func (q *Query[T]) In(column string, val ...any) *Query[T] {
 	return q
 }
 
+func (q *Query[T]) Between(column string, start, end any) *Query[T] {
+	cond := fmt.Sprintf("%s %s ? and ? ", column, constants.Between)
+	q.QueryBuilder.WriteString(cond)
+	q.QueryArgs = append(q.QueryArgs, start, end)
+	return q
+}
+
+func (q *Query[T]) NotBetween(column string, start, end any) *Query[T] {
+	cond := fmt.Sprintf("%s %s %s ? and ? ", column, constants.Not, constants.Between)
+	q.QueryBuilder.WriteString(cond)
+	q.QueryArgs = append(q.QueryArgs, start, end)
+	return q
+}
+
 func (q *Query[T]) Distinct(column ...string) *Query[T] {
 	q.DistinctColumns = column
 	return q