Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions internal/template/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ func (q *Query) clone(db *gorm.DB) *Query {
}

func (q *Query) ReadDB() *Query {
return q.ReplaceDB(q.db.Clauses(dbresolver.Read))
return q.Clauses(dbresolver.Read)
}

func (q *Query) WriteDB() *Query {
return q.ReplaceDB(q.db.Clauses(dbresolver.Write))
return q.Clauses(dbresolver.Write)
}

func (q *Query) ReplaceDB(db *gorm.DB) *Query {
Expand All @@ -65,6 +65,16 @@ func (q *Query) ReplaceDB(db *gorm.DB) *Query {
}
}


func (q *Query) Clauses(conds ...clause.Expression) *Query {
return &Query{
db: q.db.Clauses(conds...),
{{range $name,$d :=.Data -}}
{{$d.ModelStructName}}: q.{{$d.ModelStructName}}.clauses(conds...),
{{end}}
}
}

type queryCtx struct{
{{range $name,$d :=.Data -}}
{{$d.ModelStructName}} {{$d.ReturnObject}}
Expand Down
10 changes: 8 additions & 2 deletions internal/template/struct.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const (
{{.QueryStructName}}Do
` + fields + `
}
` + tableMethod + asMethond + updateFieldMethod + getFieldMethod + fillFieldMapMethod + cloneMethod + replaceMethod + relationship + defineMethodStruct
` + tableMethod + asMethond + updateFieldMethod + getFieldMethod + fillFieldMapMethod + cloneMethod + replaceMethod + clausesMethod + relationship + defineMethodStruct

// TableQueryStructWithContext table query struct with context
TableQueryStructWithContext = createMethod + `
Expand All @@ -27,7 +27,7 @@ const (

func ({{.S}} {{.QueryStructName}}) Columns(cols ...field.Expr) gen.Columns { return {{.S}}.{{.QueryStructName}}Do.Columns(cols...) }

` + getFieldMethod + fillFieldMapMethod + cloneMethod + replaceMethod + relationship + defineMethodStruct
` + getFieldMethod + fillFieldMapMethod + cloneMethod + replaceMethod + clausesMethod + relationship + defineMethodStruct

// TableQueryIface table query interface
TableQueryIface = defineDoInterface
Expand Down Expand Up @@ -116,6 +116,12 @@ func ({{.S}} {{.QueryStructName}}) replaceDB(db *gorm.DB) {{.QueryStructName}} {
{{.S}}.{{.QueryStructName}}Do.ReplaceDB(db)
return {{.S}}
}
`
clausesMethod = `
func ({{.S}} {{.QueryStructName}}) clauses(conds ...clause.Expression) {{.QueryStructName}} {
{{.S}}.{{.QueryStructName}}Do.ReplaceDB({{.S}}.{{.QueryStructName}}Do.UnderlyingDB().Clauses(conds...))
return {{.S}}
}
`
getFieldMethod = `
func ({{.S}} *{{.QueryStructName}}) GetFieldByName(fieldName string) (field.OrderExpr, bool) {
Expand Down
5 changes: 5 additions & 0 deletions tests/.expect/dal_1/query/banks.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions tests/.expect/dal_1/query/credit_cards.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions tests/.expect/dal_1/query/customers.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 14 additions & 2 deletions tests/.expect/dal_1/query/gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions tests/.expect/dal_1/query/people.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions tests/.expect/dal_1/query/users.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading