HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more tests

This commit is contained in:
Lunny Xiao 2018-04-08 17:32:28 +08:00
parent c3b84c6ae2
commit 607b473d7c
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
session_find_test.go
View File

@ -162,6 +162,38 @@ func TestFind3(t *testing.T) {
Join("INNER", teamUser, "`team_user`.team_id=`team`.id"). Join("INNER", teamUser, "`team_user`.team_id=`team`.id").
Find(&teams) Find(&teams)
assert.NoError(t, err) assert.NoError(t, err)
teams = make([]Team, 0)
err = testEngine.Cols("`team`.id").
Where("`team_user`.org_id=?", 1).
And("`team_user`.uid=?", 2).
Join("INNER", []interface{}{teamUser}, "`team_user`.team_id=`team`.id").
Find(&teams)
assert.NoError(t, err)
teams = make([]Team, 0)
err = testEngine.Cols("`team`.id").
Where("`tu`.org_id=?", 1).
And("`tu`.uid=?", 2).
Join("INNER", []string{"team_user", "tu"}, "`tu`.team_id=`team`.id").
Find(&teams)
assert.NoError(t, err)
teams = make([]Team, 0)
err = testEngine.Cols("`team`.id").
Where("`tu`.org_id=?", 1).
And("`tu`.uid=?", 2).
Join("INNER", []interface{}{"team_user", "tu"}, "`tu`.team_id=`team`.id").
Find(&teams)
assert.NoError(t, err)
teams = make([]Team, 0)
err = testEngine.Cols("`team`.id").
Where("`tu`.org_id=?", 1).
And("`tu`.uid=?", 2).
Join("INNER", []interface{}{teamUser, "tu"}, "`tu`.team_id=`team`.id").
Find(&teams)
assert.NoError(t, err)
} }
func TestFindMap(t *testing.T) { func TestFindMap(t *testing.T) {

8
statement.go
View File

@ -772,7 +772,13 @@ func (statement *Statement) Join(joinOP string, tablename interface{}, condition
case TableName: case TableName:
table = f.(TableName).TableName() table = f.(TableName).TableName()
default: default:
// FIXME: error v := rValue(f)
t := v.Type()
if t.Kind() == reflect.Struct {
fmt.Fprintf(&buf, statement.Engine.tbName(v))
} else {
fmt.Fprintf(&buf, statement.Engine.Quote(fmt.Sprintf("%v", f)))
}
} }
} }
if l > 1 { if l > 1 {