feat: add queryWrapper (#3)

* feat: add queryWrapper

* feat: update gobatis version v0.2.6 to v0.2.7

Author: afumu

go.mod

@@ -3,13 +3,27 @@ module github.com/acmestack/gobatis-plus
 go 1.18
 
 require (
+	github.com/acmestack/gobatis v0.2.7
+	github.com/go-sql-driver/mysql v1.6.0
 	github.com/spf13/pflag v1.0.5
 	k8s.io/gengo v0.0.0-20220613173612-397b4ae3bce7
 	k8s.io/klog/v2 v2.2.0
 )
 
 require (
+	github.com/Masterminds/goutils v1.1.1 // indirect
+	github.com/Masterminds/semver/v3 v3.1.1 // indirect
+	github.com/Masterminds/sprig/v3 v3.2.2 // indirect
 	github.com/go-logr/logr v0.2.0 // indirect
+	github.com/google/uuid v1.1.1 // indirect
+	github.com/huandu/xstrings v1.3.1 // indirect
+	github.com/imdario/mergo v0.3.11 // indirect
+	github.com/mitchellh/copystructure v1.0.0 // indirect
+	github.com/mitchellh/reflectwalk v1.0.0 // indirect
+	github.com/shopspring/decimal v1.2.0 // indirect
+	github.com/spf13/cast v1.3.1 // indirect
+	github.com/xfali/loadbalance v0.0.1 // indirect
+	golang.org/x/crypto v0.0.0-20200414173820-0848c9571904 // indirect
 	golang.org/x/mod v0.2.0 // indirect
 	golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8 // indirect
 	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect

go.sum

@@ -1,18 +1,53 @@
+github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
+github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
+github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
+github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
+github.com/Masterminds/sprig/v3 v3.2.2 h1:17jRggJu518dr3QaafizSXOjKYp94wKfABxUmyxvxX8=
+github.com/Masterminds/sprig/v3 v3.2.2/go.mod h1:UoaO7Yp8KlPnJIYWTFkMaqPUYKTfGFPhxNuwnnxkKlk=
+github.com/acmestack/gobatis v0.2.7 h1:aec/toZ5lZTmccI1WQ5jPPQjdITrwbIEPkt5dSajeaE=
+github.com/acmestack/gobatis v0.2.7/go.mod h1:vEEXPWzVzeDoFpYD2FoOfGfCyEuLtSiMIbP6jqO44Xg=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-logr/logr v0.2.0 h1:QvGt2nLcHH0WK9orKa+ppBPAxREcH364nPUedEpK0TY=
 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
+github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
+github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs=
+github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
+github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
+github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ=
+github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
+github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY=
+github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
+github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
+github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
+github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/xfali/loadbalance v0.0.1 h1:UVOuuDipJ740KyTaBUxTeW6UEC+fukiQCOn/5YQgexA=
+github.com/xfali/loadbalance v0.0.1/go.mod h1:yrzHHRZMdt2wBpLnBDeU2zbjnRYeNvUWV6sq6+3KVG0=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200414173820-0848c9571904 h1:bXoxMPcSLOq08zI3/c5dEBT6lE4eh+jOh886GHrn6V8=
+golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -32,7 +67,10 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IV
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 k8s.io/gengo v0.0.0-20220613173612-397b4ae3bce7 h1:RGb68G3yotdQggcyenx9y0+lnVJCXXcLa6geXOMlf5o=
 k8s.io/gengo v0.0.0-20220613173612-397b4ae3bce7/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=

pkg/constants/keyword.go

@@ -0,0 +1,24 @@
+package constants
+
+const (
+	And       = "and"
+	Or        = "or"
+	In        = "in"
+	Not       = "not"
+	Like      = " like "
+	Eq        = "="
+	Ne        = "<>"
+	Gt        = ">"
+	Ge        = ">="
+	Lt        = "<"
+	Le        = "<="
+	IsNull    = "is null"
+	IsNotNull = "is not null"
+	GroupBy   = "group by"
+	Having    = "having"
+	OrderBy   = "order by"
+	Exists    = "exists"
+	Between   = "between"
+	Asc       = "asc"
+	Desc      = "desc"
+)

pkg/generator/gobatis-gen.go

@@ -33,7 +33,7 @@ import (
 )
 
 var (
-	gobatisImports = []string{"github.com/xfali/gobatis"}
+	gobatisImports = []string{"github.com/acmestack/gobatis"}
 )
 
 type gobatisAnnotion struct {

pkg/mapper/base.go

@@ -17,24 +17,24 @@
 
 package mapper
 
-import "context"
+type Base[T any] interface {
+	Insert(entity T) int64
 
-type BaseMapper[T any] interface {
-	Insert(ctx context.Context, entity T) int64
+	InsertBatch(entities ...T) (int64, int64)
 
-	InsertBatch(ctx context.Context, entities ...T) (int64, int64)
+	DeleteById(id any) int64
 
-	DeleteById(ctx context.Context, id any) int64
+	DeleteBatchIds(ids []any) int64
 
-	DeleteBatchIds(ctx context.Context, ids []any) int64
+	UpdateById(entity T) int64
 
-	UpdateById(ctx context.Context, entity T) int64
+	SelectById(id any) T
 
-	SelectById(ctx context.Context, id any) T
+	SelectBatchIds(ids []any) []T
 
-	SelectBatchIds(ctx context.Context, ids []any) []T
+	SelectOne(entity T) T
 
-	SelectOne(ctx context.Context, entity T) T
+	SelectCount(entity T) int64
 
-	SelectCount(ctx context.Context, entity T) int64
+	SelectList(queryWrapper QueryWrapper[T]) ([]T, error)
 }

pkg/mapper/base_mapper.go

@@ -0,0 +1,56 @@
+package mapper
+
+import (
+	"context"
+	"github.com/acmestack/gobatis"
+)
+
+type BaseMapper[T any] struct {
+	SessMgr *gobatis.SessionManager
+	Ctx     context.Context
+	Columns []string
+}
+
+func (userMapper *BaseMapper[T]) Insert(entity T) int64 {
+	return 0
+}
+
+func (userMapper *BaseMapper[T]) InsertBatch(entities ...T) (int64, int64) {
+	return 0, 0
+}
+func (userMapper *BaseMapper[T]) DeleteById(id any) int64 {
+	return 0
+}
+func (userMapper *BaseMapper[T]) DeleteBatchIds(ids []any) int64 {
+	return 0
+}
+func (userMapper *BaseMapper[T]) UpdateById(entity T) int64 {
+	return 0
+}
+func (userMapper *BaseMapper[T]) SelectById(id any) T {
+	return *new(T)
+}
+func (userMapper *BaseMapper[T]) SelectBatchIds(ids []any) []T {
+	var arr []T
+	return arr
+}
+func (userMapper *BaseMapper[T]) SelectOne(entity T) T {
+	return *new(T)
+}
+func (userMapper *BaseMapper[T]) SelectCount(entity T) int64 {
+	return 0
+}
+
+func (userMapper *BaseMapper[T]) SelectList(queryWrapper *QueryWrapper[T]) ([]T, error) {
+	if queryWrapper == nil {
+		queryWrapper = &QueryWrapper[T]{}
+		queryWrapper.init()
+	}
+	sess := userMapper.SessMgr.NewSession()
+	var arr []T
+	err := sess.Select(queryWrapper.SqlBuild.String()).Param(queryWrapper.Entity).Result(&arr)
+	if err != nil {
+		return nil, err
+	}
+	return arr, nil
+}

pkg/mapper/query_wrapper.go

@@ -0,0 +1,149 @@
+package mapper
+
+import (
+	"github.com/acmestack/gobatis-plus/pkg/constants"
+	"github.com/acmestack/gobatis/builder"
+	"reflect"
+)
+
+type QueryWrapper[T any] struct {
+	Columns   []string
+	Entity    *T
+	SqlBuild  *builder.SQLFragment
+	TableName string
+}
+
+func (queryWrapper *QueryWrapper[T]) Eq(column string, val any) Wrapper[T] {
+	queryWrapper.setCondition(column, val, constants.Eq)
+	return queryWrapper
+}
+
+func (queryWrapper *QueryWrapper[T]) Ne(column string, val any) Wrapper[T] {
+	queryWrapper.setCondition(column, val, constants.Ne)
+	return queryWrapper
+}
+
+func (queryWrapper *QueryWrapper[T]) Gt(column string, val any) Wrapper[T] {
+	queryWrapper.setCondition(column, val, constants.Gt)
+	return queryWrapper
+}
+
+func (queryWrapper *QueryWrapper[T]) Ge(column string, val any) Wrapper[T] {
+	queryWrapper.setCondition(column, val, constants.Ge)
+	return queryWrapper
+}
+
+func (queryWrapper *QueryWrapper[T]) Lt(column string, val any) Wrapper[T] {
+	queryWrapper.setCondition(column, val, constants.Lt)
+	return queryWrapper
+}
+
+func (queryWrapper *QueryWrapper[T]) Le(column string, val any) Wrapper[T] {
+	queryWrapper.setCondition(column, val, constants.Le)
+	return queryWrapper
+}
+
+func (queryWrapper *QueryWrapper[T]) Like(column string, val any) Wrapper[T] {
+	s := val.(string)
+	queryWrapper.setCondition(column, "%"+s+"%", constants.Like)
+	return queryWrapper
+}
+
+func (queryWrapper *QueryWrapper[T]) NotLike(column string, val any) Wrapper[T] {
+	s := val.(string)
+	queryWrapper.setCondition(column, "%"+s+"%", constants.Not+constants.Like)
+	return queryWrapper
+}
+
+func (queryWrapper *QueryWrapper[T]) LikeLeft(column string, val any) Wrapper[T] {
+	s := val.(string)
+	queryWrapper.setCondition(column, "%"+s, constants.Like)
+	return queryWrapper
+}
+
+func (queryWrapper *QueryWrapper[T]) LikeRight(column string, val any) Wrapper[T] {
+	s := val.(string)
+	queryWrapper.setCondition(column, s+"%", constants.Like)
+	return queryWrapper
+}
+
+func (queryWrapper *QueryWrapper[T]) And() Wrapper[T] {
+	queryWrapper.SqlBuild = queryWrapper.SqlBuild.And()
+	return queryWrapper
+}
+
+func (queryWrapper *QueryWrapper[T]) Or() Wrapper[T] {
+	queryWrapper.SqlBuild = queryWrapper.SqlBuild.Or()
+	return queryWrapper
+}
+
+func (queryWrapper *QueryWrapper[T]) Select(columns ...string) Wrapper[T] {
+	queryWrapper.SqlBuild.Select(columns...)
+	return queryWrapper
+}
+
+func (queryWrapper *QueryWrapper[T]) init() {
+	if queryWrapper.Entity == nil {
+		queryWrapper.Entity = new(T)
+	}
+	if queryWrapper.TableName == "" {
+		queryWrapper.setTableName()
+	}
+}
+
+func (queryWrapper *QueryWrapper[T]) setCondition(column string, val any, conditionType string) {
+	queryWrapper.init()
+	entityValueRef := reflect.ValueOf(queryWrapper.Entity).Elem()
+	entityRef := reflect.TypeOf(queryWrapper.Entity).Elem()
+	numField := entityRef.NumField()
+	for i := 0; i < numField; i++ {
+		field := entityRef.Field(i)
+		filedName := field.Tag.Get("xfield")
+		if filedName == column {
+			setField(entityValueRef, field, val)
+		}
+	}
+	key := getConditionKey(column, entityRef.Name(), conditionType)
+	queryWrapper.SqlBuild = queryWrapper.SqlBuild.Where(key)
+}
+
+func getConditionKey(column string, name string, conditionType string) string {
+	key := column + conditionType + "#{" + name + "." + column + "}"
+	return key
+}
+
+func setField(entityValueRef reflect.Value, field reflect.StructField, val any) {
+	ft := field.Type
+	switch ft.Kind() {
+	case reflect.String:
+		entityValueRef.FieldByName(field.Name).SetString(val.(string))
+	case reflect.Int:
+		i := val.(int)
+		entityValueRef.FieldByName(field.Name).SetInt(int64(i))
+	}
+}
+
+func (queryWrapper *QueryWrapper[T]) setTableName() {
+	// todo The future is through annotations get the tableName
+	entityRef := reflect.TypeOf(queryWrapper.Entity).Elem()
+	tableName := entityRef.Field(0).Tag
+	queryWrapper.TableName = string(tableName)
+
+	queryWrapper.checkColumns()
+
+	queryWrapper.SqlBuild = builder.Select(queryWrapper.Columns...).From(string(tableName))
+}
+
+func (queryWrapper *QueryWrapper[T]) checkColumns() {
+	if len(queryWrapper.Columns) == 0 {
+		entityRef := reflect.TypeOf(queryWrapper.Entity).Elem()
+		numField := entityRef.NumField()
+		for i := 0; i < numField; i++ {
+			field := entityRef.Field(i)
+			filedName := field.Tag.Get("xfield")
+			if filedName != "" {
+				queryWrapper.Columns = append(queryWrapper.Columns, filedName)
+			}
+		}
+	}
+}