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
cacdb322
Commit
cacdb322
authored
Mar 10, 2014
by
slene
Committed by
asta.xie
Mar 12, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
orm add operator `between` #518
parent
d0949b64
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
4 deletions
+17
-4
db.go
orm/db.go
+9
-3
orm_test.go
orm/orm_test.go
+8
-1
No files found.
orm/db.go
View file @
cacdb322
...
...
@@ -35,7 +35,7 @@ var (
"istartswith"
:
true
,
"iendswith"
:
true
,
"in"
:
true
,
// "range":
true,
"between"
:
true
,
// "year": true,
// "month": true,
// "day": true,
...
...
@@ -916,13 +916,19 @@ func (d *dbBase) GenerateOperatorSql(mi *modelInfo, fi *fieldInfo, operator stri
}
arg
:=
params
[
0
]
if
operator
==
"in"
{
switch
operator
{
case
"in"
:
marks
:=
make
([]
string
,
len
(
params
))
for
i
,
_
:=
range
marks
{
marks
[
i
]
=
"?"
}
sql
=
fmt
.
Sprintf
(
"IN (%s)"
,
strings
.
Join
(
marks
,
", "
))
}
else
{
case
"between"
:
if
len
(
params
)
!=
2
{
panic
(
fmt
.
Errorf
(
"operator `%s` need 2 args not %d"
,
operator
,
len
(
params
)))
}
sql
=
"BETWEEN ? AND ?"
default
:
if
len
(
params
)
>
1
{
panic
(
fmt
.
Errorf
(
"operator `%s` need 1 args not %d"
,
operator
,
len
(
params
)))
}
...
...
orm/orm_test.go
View file @
cacdb322
...
...
@@ -653,6 +653,14 @@ func TestOperators(t *testing.T) {
num
,
err
=
qs
.
Filter
(
"status__in"
,
[]
*
int
{
&
n1
},
&
n2
)
.
Count
()
throwFail
(
t
,
err
)
throwFail
(
t
,
AssertIs
(
num
,
2
))
num
,
err
=
qs
.
Filter
(
"id__between"
,
2
,
3
)
.
Count
()
throwFail
(
t
,
err
)
throwFail
(
t
,
AssertIs
(
num
,
2
))
num
,
err
=
qs
.
Filter
(
"id__between"
,
[]
int
{
2
,
3
})
.
Count
()
throwFail
(
t
,
err
)
throwFail
(
t
,
AssertIs
(
num
,
2
))
}
func
TestSetCond
(
t
*
testing
.
T
)
{
...
...
@@ -1611,7 +1619,6 @@ func TestDelete(t *testing.T) {
throwFail
(
t
,
err
)
throwFail
(
t
,
AssertIs
(
num
,
4
))
fmt
.
Println
(
"..."
)
qs
=
dORM
.
QueryTable
(
"comment"
)
num
,
err
=
qs
.
Filter
(
"Post__User"
,
3
)
.
Delete
()
throwFail
(
t
,
err
)
...
...
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