From 819706ee2b41a44e13dfd69d8957c615575c0772 Mon Sep 17 00:00:00 2001 From: jiang4869 <1121429190@qq.com> Date: Fri, 7 Jan 2022 16:43:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=90=8D=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=93=BE=E5=BC=8F=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/view/genfunc/def.go | 26 ++++++++++++++------------ data/view/genfunc/genfunc_test.go | 12 ++++++------ data/view/genfunc/model/gen.base.go | 26 ++++++++++++++------------ 3 files changed, 34 insertions(+), 30 deletions(-) diff --git a/data/view/genfunc/def.go b/data/view/genfunc/def.go index aeb9e8e..8793b6d 100755 --- a/data/view/genfunc/def.go +++ b/data/view/genfunc/def.go @@ -117,45 +117,47 @@ func CloseRelated() { // 自定义sql查询 -type Query struct { - list []*queryInfo +type Condition struct { + list []*conditionInfo } -func (c *Query) AndOnCondition(condition bool,column string, cases string, value interface{}) { +func (c *Condition) AndWithCondition(condition bool,column string, cases string, value interface{}) (*Condition) { if condition { - c.list = append(c.list, &queryInfo{ + c.list = append(c.list, &conditionInfo{ andor: "and", column: column, // 列名 case_: cases, // 条件(and,or,in,>=,<=) value: value, }) } + return c } // And a Condition by and .and 一个条件 -func (c *Query) And(column string, cases string, value interface{}) { - c.AndOnCondition(true,column,cases,value) +func (c *Condition) And(column string, cases string, value interface{}) (*Condition) { + return c.AndWithCondition(true,column,cases,value) } -func (c *Query) OrOnCondition(condition bool,column string, cases string, value interface{}) { +func (c *Condition) OrWithCondition(condition bool,column string, cases string, value interface{}) (*Condition) { if condition { - c.list = append(c.list, &queryInfo{ + c.list = append(c.list, &conditionInfo{ andor: "or", column: column, // 列名 case_: cases, // 条件(and,or,in,>=,<=) value: value, }) } + return c } // Or a Condition by or .or 一个条件 -func (c *Query) Or(column string, cases string, value interface{}) { - c.OrOnCondition(true,column,cases,value) +func (c *Condition) Or(column string, cases string, value interface{}) (*Condition) { + return c.OrWithCondition(true,column,cases,value) } -func (c *Query) Get() (where string, out []interface{}) { +func (c *Condition) Get() (where string, out []interface{}) { firstAnd := -1 for i := 0; i < len(c.list); i++ { // 查找第一个and if c.list[i].andor == "and" { @@ -182,7 +184,7 @@ func (c *Query) Get() (where string, out []interface{}) { return } -type queryInfo struct { +type conditionInfo struct { andor string column string // 列名 case_ string // 条件(in,>=,<=) diff --git a/data/view/genfunc/genfunc_test.go b/data/view/genfunc/genfunc_test.go index 876d5f5..93800c5 100644 --- a/data/view/genfunc/genfunc_test.go +++ b/data/view/genfunc/genfunc_test.go @@ -140,13 +140,13 @@ func TestFuncFetchBy(t *testing.T) { // TestCondition 测试sql构建 func TestCondition(t *testing.T) { - query := model.Query{} - query.And(model.AccountColumns.AccountID, ">=", "1") - query.And(model.AccountColumns.UserID, "in", []string{"1", "2", "3"}) - query.AndOnCondition(false, model.AccountColumns.AccountID, "in", []string{"5"}) - query.Or(model.AccountColumns.Type, "in", []string{"1", "2", "3"}) + condition := model.Condition{} + condition.And(model.AccountColumns.AccountID, ">=", "1") + condition.And(model.AccountColumns.UserID, "in", []string{"1", "2", "3"}) + condition.AndWithCondition(false, model.AccountColumns.AccountID, "in", []string{"5"}) + condition.Or(model.AccountColumns.Type, "in", []string{"1", "2", "3"}) - where, obj := query.Get() + where, obj := condition.Get() fmt.Println(where) fmt.Println(obj...) diff --git a/data/view/genfunc/model/gen.base.go b/data/view/genfunc/model/gen.base.go index 617387f..89a575c 100644 --- a/data/view/genfunc/model/gen.base.go +++ b/data/view/genfunc/model/gen.base.go @@ -93,43 +93,45 @@ func CloseRelated() { } // 自定义sql查询 -type Query struct { - list []*queryInfo +type Condition struct { + list []*conditionInfo } -func (c *Query) AndOnCondition(condition bool, column string, cases string, value interface{}) { +func (c *Condition) AndWithCondition(condition bool, column string, cases string, value interface{}) (*Condition) { if condition { - c.list = append(c.list, &queryInfo{ + c.list = append(c.list, &conditionInfo{ andor: "and", column: column, // 列名 case_: cases, // 条件(and,or,in,>=,<=) value: value, }) } + return c } // And a Condition by and .and 一个条件 -func (c *Query) And(column string, cases string, value interface{}) { - c.AndOnCondition(true, column, cases, value) +func (c *Condition) And(column string, cases string, value interface{})(*Condition) { + return c.AndWithCondition(true, column, cases, value) } -func (c *Query) OrOnCondition(condition bool, column string, cases string, value interface{}) { +func (c *Condition) OrWithCondition(condition bool, column string, cases string, value interface{}) (*Condition){ if condition { - c.list = append(c.list, &queryInfo{ + c.list = append(c.list, &conditionInfo{ andor: "or", column: column, // 列名 case_: cases, // 条件(and,or,in,>=,<=) value: value, }) } + return c } // Or a Condition by or .or 一个条件 -func (c *Query) Or(column string, cases string, value interface{}) { - c.OrOnCondition(true, column, cases, value) +func (c *Condition) Or(column string, cases string, value interface{})(*Condition) { + return c.OrWithCondition(true, column, cases, value) } -func (c *Query) Get() (where string, out []interface{}) { +func (c *Condition) Get() (where string, out []interface{}) { firstAnd := -1 for i := 0; i < len(c.list); i++ { // 查找第一个and if c.list[i].andor == "and" { @@ -156,7 +158,7 @@ func (c *Query) Get() (where string, out []interface{}) { return } -type queryInfo struct { +type conditionInfo struct { andor string column string // 列名 case_ string // 条件(in,>=,<=)