Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
beego
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
beego
Commits
110dbcb3
Unverified
Commit
110dbcb3
authored
Jun 23, 2018
by
astaxie
Committed by
GitHub
Jun 23, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3208 from hurisheng/qs_forupdate
add 'FOR UPDATE' support for querySet
parents
740bf72f
fc2c96a1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
10 deletions
+25
-10
db.go
orm/db.go
+4
-0
orm_queryset.go
orm/orm_queryset.go
+17
-10
types.go
orm/types.go
+4
-0
No files found.
orm/db.go
View file @
110dbcb3
...
...
@@ -969,6 +969,10 @@ func (d *dbBase) ReadBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condi
}
query
:=
fmt
.
Sprintf
(
"%s %s FROM %s%s%s T0 %s%s%s%s%s"
,
sqlSelect
,
sels
,
Q
,
mi
.
table
,
Q
,
join
,
where
,
groupBy
,
orderBy
,
limit
)
if
qs
.
forupdate
{
query
+=
" FOR UPDATE"
}
d
.
ins
.
ReplaceMarks
(
&
query
)
var
rs
*
sql
.
Rows
...
...
orm/orm_queryset.go
View file @
110dbcb3
...
...
@@ -55,16 +55,17 @@ func ColValue(opt operator, value interface{}) interface{} {
// real query struct
type
querySet
struct
{
mi
*
modelInfo
cond
*
Condition
related
[]
string
relDepth
int
limit
int64
offset
int64
groups
[]
string
orders
[]
string
distinct
bool
orm
*
orm
mi
*
modelInfo
cond
*
Condition
related
[]
string
relDepth
int
limit
int64
offset
int64
groups
[]
string
orders
[]
string
distinct
bool
forupdate
bool
orm
*
orm
}
var
_
QuerySeter
=
new
(
querySet
)
...
...
@@ -127,6 +128,12 @@ func (o querySet) Distinct() QuerySeter {
return
&
o
}
// add FOR UPDATE to SELECT
func
(
o
querySet
)
ForUpdate
()
QuerySeter
{
o
.
forupdate
=
true
return
&
o
}
// set relation model to query together.
// it will query relation models and assign to parent model.
func
(
o
querySet
)
RelatedSel
(
params
...
interface
{})
QuerySeter
{
...
...
orm/types.go
View file @
110dbcb3
...
...
@@ -190,6 +190,10 @@ type QuerySeter interface {
// Distinct().
// All(&permissions)
Distinct
()
QuerySeter
// set FOR UPDATE to query.
// for example:
// o.QueryTable("user").Filter("uid", uid).ForUpdate().All(&users)
ForUpdate
()
QuerySeter
// return QuerySeter execution result number
// for example:
// num, err = qs.Filter("profile__age__gt", 28).Count()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment