bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-07-01 03:21:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

add unit testing case of UnmarshalValue for struct converting of querying result; improve package gdb

Browse Source
This commit is contained in:
John Guo
2021-02-27 23:58:36 +08:00
parent eb6763b0fd
commit d2bd37962e
13 changed files with 676 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
database/gdb/gdb_model.go
View File

@ -183,9 +183,9 @@ func (m *Model) Schema(schema string) *Model {
func (m *Model) Clone() *Model {
newModel := (*Model)(nil)
if m.tx != nil {
newModel = m.tx.Table(m.tablesInit)
newModel = m.tx.Model(m.tablesInit)
} else {
newModel = m.db.Table(m.tablesInit)
newModel = m.db.Model(m.tablesInit)
}
*newModel = *m
// Shallow copy slice attributes.

4
database/gdb/gdb_schema.go
View File

@ -36,9 +36,9 @@ func (tx *TX) Schema(schema string) *Schema {
func (s *Schema) Table(table string) *Model {
var m *Model
if s.tx != nil {
m = s.tx.Table(table)
m = s.tx.Model(table)
} else {
m = s.db.Table(table)
m = s.db.Model(table)
}
// Do not change the schema of the original db,
// it here creates a new db and changes its schema.

4
database/gdb/gdb_z_driver_test.go
View File

@ -56,8 +56,8 @@ func Test_Custom_Driver(t *testing.T) {
gdb.AddConfigNode("driver-test", gdb.ConfigNode{
Host: "127.0.0.1",
Port: "3306",
User: USER,
Pass: PASS,
User: TestDbUser,
Pass: TestDbPass,
Name: "test",
Type: customDriverName,
Role: "master",

41
database/gdb/gdb_z_init_test.go
View File

@ -18,13 +18,14 @@ import (
)
const (
SIZE = 10
TABLE = "user"
SCHEMA1 = "test1"
SCHEMA2 = "test2"
PREFIX1 = "gf_"
USER = "root"
PASS = "12345678"
TableSize = 10
TableName = "user"
TestSchema1 = "test1"
TestSchema2 = "test2"
TableNamePrefix1 = "gf_"
TestDbUser = "root"
TestDbPass = "12345678"
CreateTime = "2018-10-24 10:00:00"
)
var (
@ -42,8 +43,8 @@ func init() {
configNode = gdb.ConfigNode{
Host: "127.0.0.1",
Port: "3306",
User: USER,
Pass: PASS,
User: TestDbUser,
Pass: TestDbPass,
Name: parser.GetOpt("name", ""),
Type: parser.GetOpt("type", "mysql"),
Role: "master",
@ -54,7 +55,7 @@ func init() {
MaxConnLifetime: 600,
}
nodePrefix := configNode
nodePrefix.Prefix = PREFIX1
nodePrefix.Prefix = TableNamePrefix1
gdb.AddConfigNode("test", configNode)
gdb.AddConfigNode("prefix", nodePrefix)
gdb.AddConfigNode(gdb.DefaultGroupName, configNode)
@ -65,13 +66,13 @@ func init() {
db = r
}
schemaTemplate := "CREATE DATABASE IF NOT EXISTS `%s` CHARACTER SET UTF8"
if _, err := db.Exec(fmt.Sprintf(schemaTemplate, SCHEMA1)); err != nil {
if _, err := db.Exec(fmt.Sprintf(schemaTemplate, TestSchema1)); err != nil {
gtest.Error(err)
}
if _, err := db.Exec(fmt.Sprintf(schemaTemplate, SCHEMA2)); err != nil {
if _, err := db.Exec(fmt.Sprintf(schemaTemplate, TestSchema2)); err != nil {
gtest.Error(err)
}
db.SetSchema(SCHEMA1)
db.SetSchema(TestSchema1)
// Prefix db.
if r, err := gdb.New("prefix"); err != nil {
@ -79,13 +80,13 @@ func init() {
} else {
dbPrefix = r
}
if _, err := dbPrefix.Exec(fmt.Sprintf(schemaTemplate, SCHEMA1)); err != nil {
if _, err := dbPrefix.Exec(fmt.Sprintf(schemaTemplate, TestSchema1)); err != nil {
gtest.Error(err)
}
if _, err := dbPrefix.Exec(fmt.Sprintf(schemaTemplate, SCHEMA2)); err != nil {
if _, err := dbPrefix.Exec(fmt.Sprintf(schemaTemplate, TestSchema2)); err != nil {
gtest.Error(err)
}
dbPrefix.SetSchema(SCHEMA1)
dbPrefix.SetSchema(TestSchema1)
}
func createTable(table ...string) string {
@ -104,7 +105,7 @@ func createTableWithDb(db gdb.DB, table ...string) (name string) {
if len(table) > 0 {
name = table[0]
} else {
name = fmt.Sprintf(`%s_%d`, TABLE, gtime.TimestampNano())
name = fmt.Sprintf(`%s_%d`, TableName, gtime.TimestampNano())
}
dropTableWithDb(db, name)
@ -184,13 +185,13 @@ func createTableWithDb(db gdb.DB, table ...string) (name string) {
func createInitTableWithDb(db gdb.DB, table ...string) (name string) {
name = createTableWithDb(db, table...)
array := garray.New(true)
for i := 1; i <= SIZE; i++ {
for i := 1; i <= TableSize; i++ {
array.Append(g.Map{
"id": i,
"passport": fmt.Sprintf(`user_%d`, i),
"password": fmt.Sprintf(`pass_%d`, i),
"nickname": fmt.Sprintf(`name_%d`, i),
"create_time": gtime.NewFromStr("2018-10-24 10:00:00").String(),
"create_time": gtime.NewFromStr(CreateTime).String(),
})
}
@ -199,7 +200,7 @@ func createInitTableWithDb(db gdb.DB, table ...string) (name string) {
n, e := result.RowsAffected()
gtest.Assert(e, nil)
gtest.Assert(n, SIZE)
gtest.Assert(n, TableSize)
return
}

117
database/gdb/gdb_z_mysql_association_test.go
View File

@ -112,19 +112,19 @@ CREATE TABLE %s (
})
// Data check.
gtest.C(t, func(t *gtest.T) {
r, err := db.Table(tableUser).All()
r, err := db.Model(tableUser).All()
t.AssertNil(err)
t.Assert(r.Len(), 1)
t.Assert(r[0]["uid"].Int(), 1)
t.Assert(r[0]["name"].String(), "john")
r, err = db.Table(tableUserDetail).Where("uid", r[0]["uid"].Int()).All()
r, err = db.Model(tableUserDetail).Where("uid", r[0]["uid"].Int()).All()
t.AssertNil(err)
t.Assert(r.Len(), 1)
t.Assert(r[0]["uid"].Int(), 1)
t.Assert(r[0]["address"].String(), `Beijing DongZhiMen #66`)
r, err = db.Table(tableUserScores).Where("uid", r[0]["uid"].Int()).All()
r, err = db.Model(tableUserScores).Where("uid", r[0]["uid"].Int()).All()
t.AssertNil(err)
t.Assert(r.Len(), 2)
t.Assert(r[0]["uid"].Int(), 1)
@ -136,15 +136,15 @@ CREATE TABLE %s (
gtest.C(t, func(t *gtest.T) {
var user Entity
// SELECT * FROM `user` WHERE `name`='john'
err := db.Table(tableUser).Scan(&user.User, "name", "john")
err := db.Model(tableUser).Scan(&user.User, "name", "john")
t.AssertNil(err)
// SELECT * FROM `user_detail` WHERE `uid`=1
err = db.Table(tableUserDetail).Scan(&user.UserDetail, "uid", user.User.Uid)
err = db.Model(tableUserDetail).Scan(&user.UserDetail, "uid", user.User.Uid)
t.AssertNil(err)
// SELECT * FROM `user_scores` WHERE `uid`=1
err = db.Table(tableUserScores).Scan(&user.UserScores, "uid", user.User.Uid)
err = db.Model(tableUserScores).Scan(&user.UserScores, "uid", user.User.Uid)
t.AssertNil(err)
t.Assert(user.User, EntityUser{
@ -250,13 +250,13 @@ CREATE TABLE %s (
// MapKeyValue.
gtest.C(t, func(t *gtest.T) {
all, err := db.Table(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
all, err := db.Model(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
t.AssertNil(err)
t.Assert(all.Len(), 2)
t.Assert(len(all.MapKeyValue("uid")), 2)
t.Assert(all.MapKeyValue("uid")["3"].Map()["uid"], 3)
t.Assert(all.MapKeyValue("uid")["4"].Map()["uid"], 4)
all, err = db.Table(tableUserScores).Where("uid", g.Slice{3, 4}).Order("id asc").All()
all, err = db.Model(tableUserScores).Where("uid", g.Slice{3, 4}).Order("id asc").All()
t.AssertNil(err)
t.Assert(all.Len(), 10)
t.Assert(len(all.MapKeyValue("uid")), 2)
@ -271,7 +271,7 @@ CREATE TABLE %s (
gtest.C(t, func(t *gtest.T) {
var users []Entity
// User
all, err := db.Table(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
all, err := db.Model(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "User")
t.AssertNil(err)
@ -279,14 +279,14 @@ CREATE TABLE %s (
t.Assert(users[0].User, &EntityUser{3, "name_3"})
t.Assert(users[1].User, &EntityUser{4, "name_4"})
// Detail
all, err = db.Table(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
all, err = db.Model(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserDetail", "User", "uid:Uid")
t.AssertNil(err)
t.Assert(users[0].UserDetail, &EntityUserDetail{3, "address_3"})
t.Assert(users[1].UserDetail, &EntityUserDetail{4, "address_4"})
// Scores
all, err = db.Table(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
all, err = db.Model(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserScores", "User", "uid:Uid")
t.AssertNil(err)
@ -304,7 +304,7 @@ CREATE TABLE %s (
gtest.C(t, func(t *gtest.T) {
var users []*Entity
// User
all, err := db.Table(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
all, err := db.Model(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "User")
t.AssertNil(err)
@ -312,14 +312,14 @@ CREATE TABLE %s (
t.Assert(users[0].User, &EntityUser{3, "name_3"})
t.Assert(users[1].User, &EntityUser{4, "name_4"})
// Detail
all, err = db.Table(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
all, err = db.Model(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserDetail", "User", "uid:Uid")
t.AssertNil(err)
t.Assert(users[0].UserDetail, &EntityUserDetail{3, "address_3"})
t.Assert(users[1].UserDetail, &EntityUserDetail{4, "address_4"})
// Scores
all, err = db.Table(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
all, err = db.Model(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserScores", "User", "uid:Uid")
t.AssertNil(err)
@ -355,7 +355,7 @@ CREATE TABLE %s (
}
var users []Entity
// User
all, err := db.Table(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
all, err := db.Model(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "User")
t.AssertNil(err)
@ -363,14 +363,14 @@ CREATE TABLE %s (
t.Assert(users[0].User, &EntityUser{3, "name_3"})
t.Assert(users[1].User, &EntityUser{4, "name_4"})
// Detail
all, err = db.Table(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
all, err = db.Model(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserDetail", "User", "uid:Uid")
t.AssertNil(err)
t.Assert(users[0].UserDetail, &EntityUserDetail{3, "address_3"})
t.Assert(users[1].UserDetail, &EntityUserDetail{4, "address_4"})
// Scores
all, err = db.Table(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
all, err = db.Model(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserScores", "User", "uid:Uid")
t.AssertNil(err)
@ -407,7 +407,7 @@ CREATE TABLE %s (
var users []*Entity
// User
all, err := db.Table(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
all, err := db.Model(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "User")
t.AssertNil(err)
@ -415,14 +415,14 @@ CREATE TABLE %s (
t.Assert(users[0].User, &EntityUser{3, "name_3"})
t.Assert(users[1].User, &EntityUser{4, "name_4"})
// Detail
all, err = db.Table(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
all, err = db.Model(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserDetail", "User", "uid:Uid")
t.AssertNil(err)
t.Assert(users[0].UserDetail, &EntityUserDetail{3, "address_3"})
t.Assert(users[1].UserDetail, &EntityUserDetail{4, "address_4"})
// Scores
all, err = db.Table(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
all, err = db.Model(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserScores", "User", "uid:Uid")
t.AssertNil(err)
@ -440,19 +440,19 @@ CREATE TABLE %s (
gtest.C(t, func(t *gtest.T) {
var users []*Entity
// User
err := db.Table(tableUser).
err := db.Model(tableUser).
Where("uid", g.Slice{3, 4}).
Order("uid asc").
ScanList(&users, "User")
t.AssertNil(err)
// Detail
err = db.Table(tableUserDetail).
err = db.Model(tableUserDetail).
Where("uid", gdb.ListItemValues(users, "User", "Uid")).
Order("uid asc").
ScanList(&users, "UserDetail", "User", "uid:Uid")
t.AssertNil(err)
// Scores
err = db.Table(tableUserScores).
err = db.Model(tableUserScores).
Where("uid", gdb.ListItemValues(users, "User", "Uid")).
Order("id asc").
ScanList(&users, "UserScores", "User", "uid:Uid")
@ -564,13 +564,13 @@ CREATE TABLE %s (
// MapKeyValue.
gtest.C(t, func(t *gtest.T) {
all, err := db.Table(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
all, err := db.Model(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
t.AssertNil(err)
t.Assert(all.Len(), 2)
t.Assert(len(all.MapKeyValue("uid")), 2)
t.Assert(all.MapKeyValue("uid")["3"].Map()["uid"], 3)
t.Assert(all.MapKeyValue("uid")["4"].Map()["uid"], 4)
all, err = db.Table(tableUserScores).Where("uid", g.Slice{3, 4}).Order("id asc").All()
all, err = db.Model(tableUserScores).Where("uid", g.Slice{3, 4}).Order("id asc").All()
t.AssertNil(err)
t.Assert(all.Len(), 10)
t.Assert(len(all.MapKeyValue("uid")), 2)
@ -585,7 +585,7 @@ CREATE TABLE %s (
gtest.C(t, func(t *gtest.T) {
var users []Entity
// User
all, err := db.Table(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
all, err := db.Model(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "User")
t.AssertNil(err)
@ -593,14 +593,14 @@ CREATE TABLE %s (
t.Assert(users[0].User, &EntityUser{3, "name_3"})
t.Assert(users[1].User, &EntityUser{4, "name_4"})
// Detail
all, err = db.Table(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
all, err = db.Model(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserDetail", "User", "uid:uid")
t.AssertNil(err)
t.Assert(users[0].UserDetail, &EntityUserDetail{3, "address_3"})
t.Assert(users[1].UserDetail, &EntityUserDetail{4, "address_4"})
// Scores
all, err = db.Table(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
all, err = db.Model(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserScores", "User", "uid:uid")
t.AssertNil(err)
@ -618,7 +618,7 @@ CREATE TABLE %s (
gtest.C(t, func(t *gtest.T) {
var users []*Entity
// User
all, err := db.Table(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
all, err := db.Model(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "User")
t.AssertNil(err)
@ -626,14 +626,14 @@ CREATE TABLE %s (
t.Assert(users[0].User, &EntityUser{3, "name_3"})
t.Assert(users[1].User, &EntityUser{4, "name_4"})
// Detail
all, err = db.Table(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
all, err = db.Model(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserDetail", "User", "Uid:UID")
t.AssertNil(err)
t.Assert(users[0].UserDetail, &EntityUserDetail{3, "address_3"})
t.Assert(users[1].UserDetail, &EntityUserDetail{4, "address_4"})
// Scores
all, err = db.Table(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
all, err = db.Model(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserScores", "User", "Uid:UID")
t.AssertNil(err)
@ -669,7 +669,7 @@ CREATE TABLE %s (
}
var users []Entity
// User
all, err := db.Table(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
all, err := db.Model(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "User")
t.AssertNil(err)
@ -677,14 +677,14 @@ CREATE TABLE %s (
t.Assert(users[0].User, &EntityUser{3, "name_3"})
t.Assert(users[1].User, &EntityUser{4, "name_4"})
// Detail
all, err = db.Table(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
all, err = db.Model(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserDetail", "User", "uid:UId")
t.AssertNil(err)
t.Assert(users[0].UserDetail, &EntityUserDetail{3, "address_3"})
t.Assert(users[1].UserDetail, &EntityUserDetail{4, "address_4"})
// Scores
all, err = db.Table(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
all, err = db.Model(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserScores", "User", "UId:Uid")
t.AssertNil(err)
@ -721,7 +721,7 @@ CREATE TABLE %s (
var users []*Entity
// User
all, err := db.Table(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
all, err := db.Model(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "User")
t.AssertNil(err)
@ -729,14 +729,14 @@ CREATE TABLE %s (
t.Assert(users[0].User, &EntityUser{3, "name_3"})
t.Assert(users[1].User, &EntityUser{4, "name_4"})
// Detail
all, err = db.Table(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
all, err = db.Model(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserDetail", "User", "uid:Uid")
t.AssertNil(err)
t.Assert(users[0].UserDetail, &EntityUserDetail{3, "address_3"})
t.Assert(users[1].UserDetail, &EntityUserDetail{4, "address_4"})
// Scores
all, err = db.Table(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
all, err = db.Model(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserScores", "User", "UID:Uid")
t.AssertNil(err)
@ -754,19 +754,19 @@ CREATE TABLE %s (
gtest.C(t, func(t *gtest.T) {
var users []*Entity
// User
err := db.Table(tableUser).
err := db.Model(tableUser).
Where("uid", g.Slice{3, 4}).
Order("uid asc").
ScanList(&users, "User")
t.AssertNil(err)
// Detail
err = db.Table(tableUserDetail).
err = db.Model(tableUserDetail).
Where("uid", gdb.ListItemValues(users, "User", "Uid")).
Order("uid asc").
ScanList(&users, "UserDetail", "User", "uid:Uid")
t.AssertNil(err)
// Scores
err = db.Table(tableUserScores).
err = db.Model(tableUserScores).
Where("uid", gdb.ListItemValues(users, "User", "Uid")).
Order("id asc").
ScanList(&users, "UserScores", "User", "uid:Uid")
@ -851,22 +851,21 @@ CREATE TABLE %s (
// Result ScanList with struct elements and pointer attributes.
gtest.C(t, func(t *gtest.T) {
db.SetDebug(true)
var users []Entity
// User
all, err := db.Table(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
all, err := db.Model(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "User")
t.AssertNil(err)
t.Assert(len(users), 0)
// Detail
all, err = db.Table(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
all, err = db.Model(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserDetail", "User", "uid:uid")
t.AssertNil(err)
// Scores
all, err = db.Table(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
all, err = db.Model(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserScores", "User", "uid:uid")
t.AssertNil(err)
@ -876,20 +875,20 @@ CREATE TABLE %s (
gtest.C(t, func(t *gtest.T) {
var users []*Entity
// User
all, err := db.Table(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
all, err := db.Model(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "User")
t.AssertNil(err)
t.Assert(len(users), 0)
// Detail
all, err = db.Table(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
all, err = db.Model(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserDetail", "User", "Uid:UID")
t.AssertNil(err)
// Scores
all, err = db.Table(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
all, err = db.Model(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserScores", "User", "Uid:UID")
t.AssertNil(err)
@ -917,19 +916,19 @@ CREATE TABLE %s (
}
var users []Entity
// User
all, err := db.Table(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
all, err := db.Model(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "User")
t.AssertNil(err)
// Detail
all, err = db.Table(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
all, err = db.Model(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserDetail", "User", "uid:UId")
t.AssertNil(err)
// Scores
all, err = db.Table(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
all, err = db.Model(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserScores", "User", "UId:Uid")
t.AssertNil(err)
@ -958,19 +957,19 @@ CREATE TABLE %s (
var users []*Entity
// User
all, err := db.Table(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
all, err := db.Model(tableUser).Where("uid", g.Slice{3, 4}).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "User")
t.AssertNil(err)
t.Assert(len(users), 0)
// Detail
all, err = db.Table(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
all, err = db.Model(tableUserDetail).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("uid asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserDetail", "User", "uid:Uid")
t.AssertNil(err)
// Scores
all, err = db.Table(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
all, err = db.Model(tableUserScores).Where("uid", gdb.ListItemValues(users, "User", "Uid")).Order("id asc").All()
t.AssertNil(err)
err = all.ScanList(&users, "UserScores", "User", "UID:Uid")
t.AssertNil(err)
@ -980,19 +979,19 @@ CREATE TABLE %s (
gtest.C(t, func(t *gtest.T) {
var users []*Entity
// User
err := db.Table(tableUser).
err := db.Model(tableUser).
Where("uid", g.Slice{3, 4}).
Order("uid asc").
ScanList(&users, "User")
t.AssertNil(err)
// Detail
err = db.Table(tableUserDetail).
err = db.Model(tableUserDetail).
Where("uid", gdb.ListItemValues(users, "User", "Uid")).
Order("uid asc").
ScanList(&users, "UserDetail", "User", "uid:Uid")
t.AssertNil(err)
// Scores
err = db.Table(tableUserScores).
err = db.Model(tableUserScores).
Where("uid", gdb.ListItemValues(users, "User", "Uid")).
Order("id asc").
ScanList(&users, "UserScores", "User", "uid:Uid")
@ -1092,17 +1091,17 @@ CREATE TABLE %s (
scores []*EntityUserScores
)
// SELECT * FROM `user_scores`
err = db.Table(tableUserScores).Scan(&scores)
err = db.Model(tableUserScores).Scan(&scores)
t.AssertNil(err)
// SELECT * FROM `user_scores` WHERE `uid` IN(1,2,3,4,5)
err = db.Table(tableUser).
err = db.Model(tableUser).
Where("uid", gdb.ListItemValuesUnique(&scores, "Uid")).
ScanList(&scores, "EntityUser", "uid:Uid")
t.AssertNil(err)
// SELECT * FROM `user_detail` WHERE `uid` IN(1,2,3,4,5)
err = db.Table(tableUserDetail).
err = db.Model(tableUserDetail).
Where("uid", gdb.ListItemValuesUnique(&scores, "Uid")).
ScanList(&scores, "EntityUserDetail", "uid:Uid")
t.AssertNil(err)

30
database/gdb/gdb_z_mysql_internal_test.go
View File

@ -17,9 +17,9 @@ import (
)
const (
SCHEMA = "test_internal"
USER = "root"
PASS = "12345678"
SCHEMA = "test_internal"
TestDbUser = "root"
TestDbPass = "12345678"
)
var (
@ -36,8 +36,8 @@ func init() {
configNode = ConfigNode{
Host: "127.0.0.1",
Port: "3306",
User: USER,
Pass: PASS,
User: TestDbUser,
Pass: TestDbPass,
Name: parser.GetOpt("name", ""),
Type: parser.GetOpt("type", "mysql"),
Role: "master",
@ -204,7 +204,7 @@ CREATE TABLE %s (
defer dropTable(table2)
gtest.C(t, func(t *gtest.T) {
model := db.Table(table1)
model := db.Model(table1)
gtest.Assert(model.getSoftFieldNameCreated(table2), "createat")
gtest.Assert(model.getSoftFieldNameUpdated(table2), "updateat")
gtest.Assert(model.getSoftFieldNameDeleted(table2), "deleteat")
@ -243,48 +243,48 @@ CREATE TABLE %s (
defer dropTable(table2)
gtest.C(t, func(t *gtest.T) {
model := db.Table(table1)
model := db.Model(table1)
t.Assert(model.getConditionForSoftDeleting(), "`delete_at` IS NULL")
})
gtest.C(t, func(t *gtest.T) {
model := db.Table(fmt.Sprintf(`%s as t`, table1))
model := db.Model(fmt.Sprintf(`%s as t`, table1))
t.Assert(model.getConditionForSoftDeleting(), "`delete_at` IS NULL")
})
gtest.C(t, func(t *gtest.T) {
model := db.Table(fmt.Sprintf(`%s, %s`, table1, table2))
model := db.Model(fmt.Sprintf(`%s, %s`, table1, table2))
t.Assert(model.getConditionForSoftDeleting(), fmt.Sprintf(
"`%s`.`delete_at` IS NULL AND `%s`.`deleteat` IS NULL",
table1, table2,
))
})
gtest.C(t, func(t *gtest.T) {
model := db.Table(fmt.Sprintf(`%s t1, %s as t2`, table1, table2))
model := db.Model(fmt.Sprintf(`%s t1, %s as t2`, table1, table2))
t.Assert(model.getConditionForSoftDeleting(), "`t1`.`delete_at` IS NULL AND `t2`.`deleteat` IS NULL")
})
gtest.C(t, func(t *gtest.T) {
model := db.Table(fmt.Sprintf(`%s as t1, %s as t2`, table1, table2))
model := db.Model(fmt.Sprintf(`%s as t1, %s as t2`, table1, table2))
t.Assert(model.getConditionForSoftDeleting(), "`t1`.`delete_at` IS NULL AND `t2`.`deleteat` IS NULL")
})
gtest.C(t, func(t *gtest.T) {
model := db.Table(fmt.Sprintf(`%s as t1`, table1)).LeftJoin(table2+" t2", "t2.id2=t1.id1")
model := db.Model(fmt.Sprintf(`%s as t1`, table1)).LeftJoin(table2+" t2", "t2.id2=t1.id1")
t.Assert(model.getConditionForSoftDeleting(), "`t1`.`delete_at` IS NULL AND `t2`.`deleteat` IS NULL")
})
gtest.C(t, func(t *gtest.T) {
model := db.Table(fmt.Sprintf(`%s`, table1)).LeftJoin(table2, "t2.id2=t1.id1")
model := db.Model(fmt.Sprintf(`%s`, table1)).LeftJoin(table2, "t2.id2=t1.id1")
t.Assert(model.getConditionForSoftDeleting(), fmt.Sprintf(
"`%s`.`delete_at` IS NULL AND `%s`.`deleteat` IS NULL",
table1, table2,
))
})
gtest.C(t, func(t *gtest.T) {
model := db.Table(fmt.Sprintf(`%s`, table1)).LeftJoin(table2, "t2.id2=t1.id1").RightJoin(table2, "t2.id2=t1.id1")
model := db.Model(fmt.Sprintf(`%s`, table1)).LeftJoin(table2, "t2.id2=t1.id1").RightJoin(table2, "t2.id2=t1.id1")
t.Assert(model.getConditionForSoftDeleting(), fmt.Sprintf(
"`%s`.`delete_at` IS NULL AND `%s`.`deleteat` IS NULL AND `%s`.`deleteat` IS NULL",
table1, table2, table2,
))
})
gtest.C(t, func(t *gtest.T) {
model := db.Table(table1+" as t1").LeftJoin(table2+" as t2", "t2.id2=t1.id1").RightJoin(table2+" as t3 ", "t2.id2=t1.id1")
model := db.Model(table1+" as t1").LeftJoin(table2+" as t2", "t2.id2=t1.id1").RightJoin(table2+" as t3 ", "t2.id2=t1.id1")
t.Assert(
model.getConditionForSoftDeleting(),
"`t1`.`delete_at` IS NULL AND `t2`.`deleteat` IS NULL AND `t3`.`deleteat` IS NULL",

76
database/gdb/gdb_z_mysql_method_test.go
View File

@ -124,7 +124,7 @@ func Test_DB_Insert(t *testing.T) {
n, _ = result.RowsAffected()
t.Assert(n, 1)
one, err := db.Table(table).Where("id", 3).One()
one, err := db.Model(table).Where("id", 3).One()
t.AssertNil(err)
t.Assert(one["id"].Int(), 3)
@ -146,7 +146,7 @@ func Test_DB_Insert(t *testing.T) {
n, _ = result.RowsAffected()
t.Assert(n, 1)
one, err = db.Table(table).Where("id", 4).One()
one, err = db.Model(table).Where("id", 4).One()
t.AssertNil(err)
t.Assert(one["id"].Int(), 4)
t.Assert(one["passport"].String(), "t4")
@ -176,7 +176,7 @@ func Test_DB_Insert(t *testing.T) {
n, _ = r.RowsAffected()
t.Assert(n, 2)
one, err = db.Table(table).Where("id", 200).One()
one, err = db.Model(table).Where("id", 200).One()
t.AssertNil(err)
t.Assert(one["id"].Int(), 200)
t.Assert(one["passport"].String(), "t200")
@ -437,7 +437,7 @@ func Test_DB_Save(t *testing.T) {
})
t.AssertNil(err)
one, err := db.Table(table).Where("id", 1).One()
one, err := db.Model(table).Where("id", 1).One()
t.AssertNil(err)
t.Assert(one["id"].Int(), 1)
t.Assert(one["passport"].String(), "t1")
@ -462,7 +462,7 @@ func Test_DB_Replace(t *testing.T) {
})
t.AssertNil(err)
one, err := db.Table(table).Where("id", 1).One()
one, err := db.Model(table).Where("id", 1).One()
t.AssertNil(err)
t.Assert(one["id"].Int(), 1)
t.Assert(one["passport"].String(), "t1")
@ -482,7 +482,7 @@ func Test_DB_Update(t *testing.T) {
n, _ := result.RowsAffected()
t.Assert(n, 1)
one, err := db.Table(table).Where("id", 3).One()
one, err := db.Model(table).Where("id", 3).One()
t.AssertNil(err)
t.Assert(one["id"].Int(), 3)
t.Assert(one["passport"].String(), "user_3")
@ -567,7 +567,7 @@ func Test_DB_GetCount(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
count, err := db.GetCount(fmt.Sprintf("SELECT * FROM %s", table))
t.AssertNil(err)
t.Assert(count, SIZE)
t.Assert(count, TableSize)
})
}
@ -616,7 +616,7 @@ func Test_DB_GetStructs(t *testing.T) {
var users []User
err := db.GetStructs(&users, fmt.Sprintf("SELECT * FROM %s WHERE id>?", table), 1)
t.AssertNil(err)
t.Assert(len(users), SIZE-1)
t.Assert(len(users), TableSize-1)
t.Assert(users[0].Id, 2)
t.Assert(users[1].Id, 3)
t.Assert(users[2].Id, 4)
@ -636,7 +636,7 @@ func Test_DB_GetStructs(t *testing.T) {
var users []User
err := db.GetStructs(&users, fmt.Sprintf("SELECT * FROM %s WHERE id>?", table), 1)
t.AssertNil(err)
t.Assert(len(users), SIZE-1)
t.Assert(len(users), TableSize-1)
t.Assert(users[0].Id, 2)
t.Assert(users[1].Id, 3)
t.Assert(users[2].Id, 4)
@ -687,7 +687,7 @@ func Test_DB_GetScan(t *testing.T) {
var users []User
err := db.GetScan(&users, fmt.Sprintf("SELECT * FROM %s WHERE id>?", table), 1)
t.AssertNil(err)
t.Assert(len(users), SIZE-1)
t.Assert(len(users), TableSize-1)
t.Assert(users[0].Id, 2)
t.Assert(users[1].Id, 3)
t.Assert(users[2].Id, 4)
@ -707,7 +707,7 @@ func Test_DB_GetScan(t *testing.T) {
var users []User
err := db.GetScan(&users, fmt.Sprintf("SELECT * FROM %s WHERE id>?", table), 1)
t.AssertNil(err)
t.Assert(len(users), SIZE-1)
t.Assert(len(users), TableSize-1)
t.Assert(users[0].Id, 2)
t.Assert(users[1].Id, 3)
t.Assert(users[2].Id, 4)
@ -724,7 +724,7 @@ func Test_DB_Delete(t *testing.T) {
result, err := db.Delete(table, 1)
t.AssertNil(err)
n, _ := result.RowsAffected()
t.Assert(n, SIZE)
t.Assert(n, TableSize)
})
}
@ -784,7 +784,7 @@ func Test_DB_ToJson(t *testing.T) {
gtest.AssertNil(err)
gtest.C(t, func(t *gtest.T) {
result, err := db.Table(table).Fields("*").Where("id =? ", 1).Select()
result, err := db.Model(table).Fields("*").Where("id =? ", 1).Select()
if err != nil {
gtest.Fatal(err)
}
@ -825,7 +825,7 @@ func Test_DB_ToJson(t *testing.T) {
})
gtest.C(t, func(t *gtest.T) {
result, err := db.Table(table).Fields("*").Where("id =? ", 1).One()
result, err := db.Model(table).Fields("*").Where("id =? ", 1).One()
if err != nil {
gtest.Fatal(err)
}
@ -858,7 +858,7 @@ func Test_DB_ToXml(t *testing.T) {
gtest.AssertNil(err)
gtest.C(t, func(t *gtest.T) {
record, err := db.Table(table).Fields("*").Where("id = ?", 1).One()
record, err := db.Model(table).Fields("*").Where("id = ?", 1).One()
if err != nil {
gtest.Fatal(err)
}
@ -924,7 +924,7 @@ func Test_DB_ToStringMap(t *testing.T) {
gtest.AssertNil(err)
gtest.C(t, func(t *gtest.T) {
id := "1"
result, err := db.Table(table).Fields("*").Where("id = ?", 1).Select()
result, err := db.Model(table).Fields("*").Where("id = ?", 1).Select()
if err != nil {
gtest.Fatal(err)
}
@ -961,7 +961,7 @@ func Test_DB_ToIntMap(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
id := 1
result, err := db.Table(table).Fields("*").Where("id = ?", id).Select()
result, err := db.Model(table).Fields("*").Where("id = ?", id).Select()
if err != nil {
gtest.Fatal(err)
}
@ -997,7 +997,7 @@ func Test_DB_ToUintMap(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
id := 1
result, err := db.Table(table).Fields("*").Where("id = ?", id).Select()
result, err := db.Model(table).Fields("*").Where("id = ?", id).Select()
if err != nil {
gtest.Fatal(err)
}
@ -1035,7 +1035,7 @@ func Test_DB_ToStringRecord(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
id := 1
ids := "1"
result, err := db.Table(table).Fields("*").Where("id = ?", id).Select()
result, err := db.Model(table).Fields("*").Where("id = ?", id).Select()
if err != nil {
gtest.Fatal(err)
}
@ -1072,7 +1072,7 @@ func Test_DB_ToIntRecord(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
id := 1
result, err := db.Table(table).Fields("*").Where("id = ?", id).Select()
result, err := db.Model(table).Fields("*").Where("id = ?", id).Select()
if err != nil {
gtest.Fatal(err)
}
@ -1109,7 +1109,7 @@ func Test_DB_ToUintRecord(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
id := 1
result, err := db.Table(table).Fields("*").Where("id = ?", id).Select()
result, err := db.Model(table).Fields("*").Where("id = ?", id).Select()
if err != nil {
gtest.Fatal(err)
}
@ -1169,7 +1169,7 @@ func Test_DB_TableField(t *testing.T) {
"field_varchar": "abc",
"field_varbinary": "aaa",
}
res, err := db.Table(name).Data(data).Insert()
res, err := db.Model(name).Data(data).Insert()
if err != nil {
gtest.Fatal(err)
}
@ -1181,7 +1181,7 @@ func Test_DB_TableField(t *testing.T) {
gtest.Assert(n, 1)
}
result, err := db.Table(name).Fields("*").Where("field_int = ?", 2).Select()
result, err := db.Model(name).Fields("*").Where("field_int = ?", 2).Select()
if err != nil {
gtest.Fatal(err)
}
@ -1191,8 +1191,8 @@ func Test_DB_TableField(t *testing.T) {
func Test_DB_Prefix(t *testing.T) {
db := dbPrefix
name := fmt.Sprintf(`%s_%d`, TABLE, gtime.TimestampNano())
table := PREFIX1 + name
name := fmt.Sprintf(`%s_%d`, TableName, gtime.TimestampNano())
table := TableNamePrefix1 + name
createTableWithDb(db, table)
defer dropTable(table)
@ -1272,7 +1272,7 @@ func Test_DB_Prefix(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
array := garray.New(true)
for i := 1; i <= SIZE; i++ {
for i := 1; i <= TableSize; i++ {
array.Append(g.Map{
"id": i,
"passport": fmt.Sprintf(`user_%d`, i),
@ -1287,7 +1287,7 @@ func Test_DB_Prefix(t *testing.T) {
n, e := result.RowsAffected()
t.Assert(e, nil)
t.Assert(n, SIZE)
t.Assert(n, TableSize)
})
}
@ -1300,7 +1300,7 @@ func Test_Model_InnerJoin(t *testing.T) {
defer dropTable(table1)
defer dropTable(table2)
res, err := db.Table(table1).Where("id > ?", 5).Delete()
res, err := db.Model(table1).Where("id > ?", 5).Delete()
if err != nil {
t.Fatal(err)
}
@ -1312,14 +1312,14 @@ func Test_Model_InnerJoin(t *testing.T) {
t.Assert(n, 5)
result, err := db.Table(table1+" u1").InnerJoin(table2+" u2", "u1.id = u2.id").OrderBy("u1.id").Select()
result, err := db.Model(table1+" u1").InnerJoin(table2+" u2", "u1.id = u2.id").OrderBy("u1.id").Select()
if err != nil {
t.Fatal(err)
}
t.Assert(len(result), 5)
result, err = db.Table(table1+" u1").InnerJoin(table2+" u2", "u1.id = u2.id").Where("u1.id > ?", 1).OrderBy("u1.id").Select()
result, err = db.Model(table1+" u1").InnerJoin(table2+" u2", "u1.id = u2.id").Where("u1.id > ?", 1).OrderBy("u1.id").Select()
if err != nil {
t.Fatal(err)
}
@ -1336,7 +1336,7 @@ func Test_Model_LeftJoin(t *testing.T) {
defer dropTable(table1)
defer dropTable(table2)
res, err := db.Table(table2).Where("id > ?", 3).Delete()
res, err := db.Model(table2).Where("id > ?", 3).Delete()
if err != nil {
t.Fatal(err)
}
@ -1348,14 +1348,14 @@ func Test_Model_LeftJoin(t *testing.T) {
t.Assert(n, 7)
}
result, err := db.Table(table1+" u1").LeftJoin(table2+" u2", "u1.id = u2.id").Select()
result, err := db.Model(table1+" u1").LeftJoin(table2+" u2", "u1.id = u2.id").Select()
if err != nil {
t.Fatal(err)
}
t.Assert(len(result), 10)
result, err = db.Table(table1+" u1").LeftJoin(table2+" u2", "u1.id = u2.id").Where("u1.id > ? ", 2).Select()
result, err = db.Model(table1+" u1").LeftJoin(table2+" u2", "u1.id = u2.id").Where("u1.id > ? ", 2).Select()
if err != nil {
t.Fatal(err)
}
@ -1372,7 +1372,7 @@ func Test_Model_RightJoin(t *testing.T) {
defer dropTable(table1)
defer dropTable(table2)
res, err := db.Table(table1).Where("id > ?", 3).Delete()
res, err := db.Model(table1).Where("id > ?", 3).Delete()
if err != nil {
t.Fatal(err)
}
@ -1384,13 +1384,13 @@ func Test_Model_RightJoin(t *testing.T) {
t.Assert(n, 7)
result, err := db.Table(table1+" u1").RightJoin(table2+" u2", "u1.id = u2.id").Select()
result, err := db.Model(table1+" u1").RightJoin(table2+" u2", "u1.id = u2.id").Select()
if err != nil {
t.Fatal(err)
}
t.Assert(len(result), 10)
result, err = db.Table(table1+" u1").RightJoin(table2+" u2", "u1.id = u2.id").Where("u1.id > 2").Select()
result, err = db.Model(table1+" u1").RightJoin(table2+" u2", "u1.id = u2.id").Where("u1.id > 2").Select()
if err != nil {
t.Fatal(err)
}
@ -1445,7 +1445,7 @@ func Test_DB_UpdateCounter(t *testing.T) {
t.AssertNil(err)
n, _ := result.RowsAffected()
t.Assert(n, 1)
one, err := db.Table(tableName).Where("id", 1).One()
one, err := db.Model(tableName).Where("id", 1).One()
t.AssertNil(err)
t.Assert(one["id"].Int(), 1)
t.Assert(one["views"].Int(), 1)
@ -1464,7 +1464,7 @@ func Test_DB_UpdateCounter(t *testing.T) {
t.AssertNil(err)
n, _ := result.RowsAffected()
t.Assert(n, 1)
one, err := db.Table(tableName).Where("id", 1).One()
one, err := db.Model(tableName).Where("id", 1).One()
t.AssertNil(err)
t.Assert(one["id"].Int(), 1)
t.Assert(one["views"].Int(), 0)

710
database/gdb/gdb_z_mysql_model_test.go
View File

File diff suppressed because it is too large Load Diff

8
database/gdb/gdb_z_mysql_raw_test.go
View File

@ -19,7 +19,7 @@ func Test_Insert_Raw(t *testing.T) {
defer dropTable(table)
gtest.C(t, func(t *gtest.T) {
user := db.Table(table)
user := db.Model(table)
result, err := user.Filter().Data(g.Map{
"id": gdb.Raw("id+2"),
"passport": "port_1",
@ -38,7 +38,7 @@ func Test_BatchInsert_Raw(t *testing.T) {
defer dropTable(table)
gtest.C(t, func(t *gtest.T) {
user := db.Table(table)
user := db.Model(table)
result, err := user.Filter().Data(
g.List{
g.Map{
@ -68,7 +68,7 @@ func Test_Update_Raw(t *testing.T) {
defer dropTable(table)
gtest.C(t, func(t *gtest.T) {
user := db.Table(table)
user := db.Model(table)
result, err := user.Data(g.Map{
"id": gdb.Raw("id+100"),
"create_time": gdb.Raw("now()"),
@ -78,7 +78,7 @@ func Test_Update_Raw(t *testing.T) {
t.Assert(n, 1)
})
gtest.C(t, func(t *gtest.T) {
user := db.Table(table)
user := db.Model(table)
n, err := user.Where("id", 101).Count()
t.AssertNil(err)
t.Assert(n, 1)

101
database/gdb/gdb_z_mysql_struct_test.go
View File

@ -8,6 +8,7 @@ package gdb_test
import (
"database/sql"
"github.com/gogf/gf/database/gdb"
"github.com/gogf/gf/frame/g"
"github.com/gogf/gf/os/gtime"
"github.com/gogf/gf/test/gtest"
@ -31,7 +32,7 @@ func Test_Model_Inherit_Insert(t *testing.T) {
Password string `json:"password"`
Nickname string `json:"nickname"`
}
result, err := db.Table(table).Filter().Data(User{
result, err := db.Model(table).Filter().Data(User{
Passport: "john-test",
Password: "123456",
Nickname: "John",
@ -44,7 +45,7 @@ func Test_Model_Inherit_Insert(t *testing.T) {
t.AssertNil(err)
n, _ := result.RowsAffected()
t.Assert(n, 1)
value, err := db.Table(table).Fields("passport").Where("id=100").Value()
value, err := db.Model(table).Fields("passport").Where("id=100").Value()
t.AssertNil(err)
t.Assert(value.String(), "john-test")
})
@ -77,12 +78,12 @@ func Test_Model_Inherit_MapToStruct(t *testing.T) {
"nickname": "T1",
"create_time": gtime.Now().String(),
}
result, err := db.Table(table).Filter().Data(data).Insert()
result, err := db.Model(table).Filter().Data(data).Insert()
t.AssertNil(err)
n, _ := result.RowsAffected()
t.Assert(n, 1)
one, err := db.Table(table).Where("id=100").One()
one, err := db.Model(table).Where("id=100").One()
t.AssertNil(err)
user := new(User)
@ -109,7 +110,7 @@ func Test_Struct_Pointer_Attribute(t *testing.T) {
}
gtest.C(t, func(t *gtest.T) {
one, err := db.Table(table).FindOne(1)
one, err := db.Model(table).FindOne(1)
t.AssertNil(err)
user := new(User)
err = one.Struct(user)
@ -121,7 +122,7 @@ func Test_Struct_Pointer_Attribute(t *testing.T) {
})
gtest.C(t, func(t *gtest.T) {
user := new(User)
err := db.Table(table).Struct(user, "id=1")
err := db.Model(table).Struct(user, "id=1")
t.AssertNil(err)
t.Assert(*user.Id, 1)
t.Assert(*user.Passport, "user_1")
@ -130,7 +131,7 @@ func Test_Struct_Pointer_Attribute(t *testing.T) {
})
gtest.C(t, func(t *gtest.T) {
var user *User
err := db.Table(table).Struct(&user, "id=1")
err := db.Model(table).Struct(&user, "id=1")
t.AssertNil(err)
t.Assert(*user.Id, 1)
t.Assert(*user.Passport, "user_1")
@ -151,7 +152,7 @@ func Test_Structs_Pointer_Attribute(t *testing.T) {
}
// All
gtest.C(t, func(t *gtest.T) {
one, err := db.Table(table).All("id < 3")
one, err := db.Model(table).All("id < 3")
t.AssertNil(err)
users := make([]User, 0)
err = one.Structs(&users)
@ -163,7 +164,7 @@ func Test_Structs_Pointer_Attribute(t *testing.T) {
t.Assert(users[0].Nickname, "name_1")
})
gtest.C(t, func(t *gtest.T) {
one, err := db.Table(table).All("id < 3")
one, err := db.Model(table).All("id < 3")
t.AssertNil(err)
users := make([]*User, 0)
err = one.Structs(&users)
@ -176,7 +177,7 @@ func Test_Structs_Pointer_Attribute(t *testing.T) {
})
gtest.C(t, func(t *gtest.T) {
var users []User
one, err := db.Table(table).All("id < 3")
one, err := db.Model(table).All("id < 3")
t.AssertNil(err)
err = one.Structs(&users)
t.AssertNil(err)
@ -188,7 +189,7 @@ func Test_Structs_Pointer_Attribute(t *testing.T) {
})
gtest.C(t, func(t *gtest.T) {
var users []*User
one, err := db.Table(table).All("id < 3")
one, err := db.Model(table).All("id < 3")
t.AssertNil(err)
err = one.Structs(&users)
t.AssertNil(err)
@ -201,7 +202,7 @@ func Test_Structs_Pointer_Attribute(t *testing.T) {
// Structs
gtest.C(t, func(t *gtest.T) {
users := make([]User, 0)
err := db.Table(table).Structs(&users, "id < 3")
err := db.Model(table).Structs(&users, "id < 3")
t.AssertNil(err)
t.Assert(len(users), 2)
t.Assert(*users[0].Id, 1)
@ -211,7 +212,7 @@ func Test_Structs_Pointer_Attribute(t *testing.T) {
})
gtest.C(t, func(t *gtest.T) {
users := make([]*User, 0)
err := db.Table(table).Structs(&users, "id < 3")
err := db.Model(table).Structs(&users, "id < 3")
t.AssertNil(err)
t.Assert(len(users), 2)
t.Assert(*users[0].Id, 1)
@ -221,7 +222,7 @@ func Test_Structs_Pointer_Attribute(t *testing.T) {
})
gtest.C(t, func(t *gtest.T) {
var users []User
err := db.Table(table).Structs(&users, "id < 3")
err := db.Model(table).Structs(&users, "id < 3")
t.AssertNil(err)
t.Assert(len(users), 2)
t.Assert(*users[0].Id, 1)
@ -231,7 +232,7 @@ func Test_Structs_Pointer_Attribute(t *testing.T) {
})
gtest.C(t, func(t *gtest.T) {
var users []*User
err := db.Table(table).Structs(&users, "id < 3")
err := db.Model(table).Structs(&users, "id < 3")
t.AssertNil(err)
t.Assert(len(users), 2)
t.Assert(*users[0].Id, 1)
@ -254,13 +255,13 @@ func Test_Struct_Empty(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
user := new(User)
err := db.Table(table).Where("id=100").Struct(user)
err := db.Model(table).Where("id=100").Struct(user)
t.Assert(err, sql.ErrNoRows)
t.AssertNE(user, nil)
})
gtest.C(t, func(t *gtest.T) {
one, err := db.Table(table).Where("id=100").One()
one, err := db.Model(table).Where("id=100").One()
t.AssertNil(err)
var user *User
t.Assert(one.Struct(&user), nil)
@ -269,7 +270,7 @@ func Test_Struct_Empty(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
var user *User
err := db.Table(table).Where("id=100").Struct(&user)
err := db.Model(table).Where("id=100").Struct(&user)
t.AssertNil(err)
t.Assert(user, nil)
})
@ -287,38 +288,38 @@ func Test_Structs_Empty(t *testing.T) {
}
gtest.C(t, func(t *gtest.T) {
all, err := db.Table(table).Where("id>100").All()
all, err := db.Model(table).Where("id>100").All()
t.AssertNil(err)
users := make([]User, 0)
t.Assert(all.Structs(&users), nil)
})
gtest.C(t, func(t *gtest.T) {
all, err := db.Table(table).Where("id>100").All()
all, err := db.Model(table).Where("id>100").All()
t.AssertNil(err)
users := make([]User, 10)
t.Assert(all.Structs(&users), nil)
})
gtest.C(t, func(t *gtest.T) {
all, err := db.Table(table).Where("id>100").All()
all, err := db.Model(table).Where("id>100").All()
t.AssertNil(err)
var users []User
t.Assert(all.Structs(&users), nil)
})
gtest.C(t, func(t *gtest.T) {
all, err := db.Table(table).Where("id>100").All()
all, err := db.Model(table).Where("id>100").All()
t.AssertNil(err)
users := make([]*User, 0)
t.Assert(all.Structs(&users), nil)
})
gtest.C(t, func(t *gtest.T) {
all, err := db.Table(table).Where("id>100").All()
all, err := db.Model(table).Where("id>100").All()
t.AssertNil(err)
users := make([]*User, 10)
t.Assert(all.Structs(&users), nil)
})
gtest.C(t, func(t *gtest.T) {
all, err := db.Table(table).Where("id>100").All()
all, err := db.Model(table).Where("id>100").All()
t.AssertNil(err)
var users []*User
t.Assert(all.Structs(&users), nil)
@ -343,21 +344,65 @@ func (st *MyTimeSt) UnmarshalValue(v interface{}) error {
return nil
}
func Test_Model_Scan_CustomType(t *testing.T) {
func Test_Model_Scan_CustomType_Time(t *testing.T) {
table := createInitTable()
defer dropTable(table)
gtest.C(t, func(t *gtest.T) {
st := new(MyTimeSt)
err := db.Table(table).Fields("create_time").Scan(st)
err := db.Model(table).Fields("create_time").Scan(st)
t.AssertNil(err)
t.Assert(st.CreateTime.String(), "2018-10-24 10:00:00")
})
gtest.C(t, func(t *gtest.T) {
var stSlice []*MyTimeSt
err := db.Table(table).Fields("create_time").Scan(&stSlice)
err := db.Model(table).Fields("create_time").Scan(&stSlice)
t.AssertNil(err)
t.Assert(len(stSlice), SIZE)
t.Assert(len(stSlice), TableSize)
t.Assert(stSlice[0].CreateTime.String(), "2018-10-24 10:00:00")
t.Assert(stSlice[9].CreateTime.String(), "2018-10-24 10:00:00")
})
}
type User struct {
Id int
Passport string
Password string
Nickname string
CreateTime *gtime.Time
}
func (user *User) UnmarshalValue(value interface{}) error {
switch result := value.(type) {
case map[string]interface{}:
user.Id = result["id"].(gdb.Value).Int()
user.Passport = result["passport"].(gdb.Value).String()
user.Password = ""
user.Nickname = result["nickname"].(gdb.Value).String()
user.CreateTime = result["create_time"].(gdb.Value).GTime()
return nil
default:
return gconv.Struct(value, user)
}
}
func Test_Model_Scan_UnmarshalValue(t *testing.T) {
table := createInitTable()
defer dropTable(table)
gtest.C(t, func(t *gtest.T) {
var users []*User
err := db.Model(table).Order("id asc").Scan(&users)
t.AssertNil(err)
t.Assert(len(users), TableSize)
t.Assert(users[0].Id, 1)
t.Assert(users[0].Passport, "user_1")
t.Assert(users[0].Password, "")
t.Assert(users[0].Nickname, "name_1")
t.Assert(users[0].CreateTime.String(), CreateTime)
t.Assert(users[9].Id, 10)
t.Assert(users[9].Passport, "user_10")
t.Assert(users[9].Password, "")
t.Assert(users[9].Nickname, "name_10")
t.Assert(users[9].CreateTime.String(), CreateTime)
})
}

164
database/gdb/gdb_z_mysql_time_maintain_test.go
View File

@ -40,12 +40,12 @@ CREATE TABLE %s (
"id": 1,
"name": "name_1",
}
r, err := db.Table(table).Data(dataInsert).Insert()
r, err := db.Model(table).Data(dataInsert).Insert()
t.AssertNil(err)
n, _ := r.RowsAffected()
t.Assert(n, 1)
oneInsert, err := db.Table(table).FindOne(1)
oneInsert, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(oneInsert["id"].Int(), 1)
t.Assert(oneInsert["name"].String(), "name_1")
@ -61,12 +61,12 @@ CREATE TABLE %s (
"id": 1,
"name": "name_10",
}
r, err = db.Table(table).Data(dataSave).Save()
r, err = db.Model(table).Data(dataSave).Save()
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 2)
oneSave, err := db.Table(table).FindOne(1)
oneSave, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(oneSave["id"].Int(), 1)
t.Assert(oneSave["name"].String(), "name_10")
@ -82,12 +82,12 @@ CREATE TABLE %s (
dataUpdate := g.Map{
"name": "name_1000",
}
r, err = db.Table(table).Data(dataUpdate).WherePri(1).Update()
r, err = db.Model(table).Data(dataUpdate).WherePri(1).Update()
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 1)
oneUpdate, err := db.Table(table).FindOne(1)
oneUpdate, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(oneUpdate["id"].Int(), 1)
t.Assert(oneUpdate["name"].String(), "name_1000")
@ -100,12 +100,12 @@ CREATE TABLE %s (
"id": 1,
"name": "name_100",
}
r, err = db.Table(table).Data(dataReplace).Replace()
r, err = db.Model(table).Data(dataReplace).Replace()
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 2)
oneReplace, err := db.Table(table).FindOne(1)
oneReplace, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(oneReplace["id"].Int(), 1)
t.Assert(oneReplace["name"].String(), "name_100")
@ -117,35 +117,35 @@ CREATE TABLE %s (
time.Sleep(2 * time.Second)
// Delete
r, err = db.Table(table).Delete("id", 1)
r, err = db.Model(table).Delete("id", 1)
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 1)
// Delete Select
one4, err := db.Table(table).FindOne(1)
one4, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(len(one4), 0)
one5, err := db.Table(table).Unscoped().FindOne(1)
one5, err := db.Model(table).Unscoped().FindOne(1)
t.AssertNil(err)
t.Assert(one5["id"].Int(), 1)
t.AssertGE(one5["delete_at"].GTime().Timestamp(), gtime.Timestamp()-2)
// Delete Count
i, err := db.Table(table).FindCount()
i, err := db.Model(table).FindCount()
t.AssertNil(err)
t.Assert(i, 0)
i, err = db.Table(table).Unscoped().FindCount()
i, err = db.Model(table).Unscoped().FindCount()
t.AssertNil(err)
t.Assert(i, 1)
// Delete Unscoped
r, err = db.Table(table).Unscoped().Delete("id", 1)
r, err = db.Model(table).Unscoped().Delete("id", 1)
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 1)
one6, err := db.Table(table).Unscoped().FindOne(1)
one6, err := db.Model(table).Unscoped().FindOne(1)
t.AssertNil(err)
t.Assert(len(one6), 0)
i, err = db.Table(table).Unscoped().FindCount()
i, err = db.Model(table).Unscoped().FindCount()
t.AssertNil(err)
t.Assert(i, 0)
})
@ -174,12 +174,12 @@ CREATE TABLE %s (
"id": 1,
"name": "name_1",
}
r, err := db.Table(table).Data(dataInsert).Insert()
r, err := db.Model(table).Data(dataInsert).Insert()
t.AssertNil(err)
n, _ := r.RowsAffected()
t.Assert(n, 1)
oneInsert, err := db.Table(table).FindOne(1)
oneInsert, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(oneInsert["id"].Int(), 1)
t.Assert(oneInsert["name"].String(), "name_1")
@ -195,12 +195,12 @@ CREATE TABLE %s (
"id": 1,
"name": "name_10",
}
r, err = db.Table(table).Data(dataSave).Save()
r, err = db.Model(table).Data(dataSave).Save()
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 2)
oneSave, err := db.Table(table).FindOne(1)
oneSave, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(oneSave["id"].Int(), 1)
t.Assert(oneSave["name"].String(), "name_10")
@ -216,12 +216,12 @@ CREATE TABLE %s (
dataUpdate := g.Map{
"name": "name_1000",
}
r, err = db.Table(table).Data(dataUpdate).WherePri(1).Update()
r, err = db.Model(table).Data(dataUpdate).WherePri(1).Update()
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 1)
oneUpdate, err := db.Table(table).FindOne(1)
oneUpdate, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(oneUpdate["id"].Int(), 1)
t.Assert(oneUpdate["name"].String(), "name_1000")
@ -234,12 +234,12 @@ CREATE TABLE %s (
"id": 1,
"name": "name_100",
}
r, err = db.Table(table).Data(dataReplace).Replace()
r, err = db.Model(table).Data(dataReplace).Replace()
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 2)
oneReplace, err := db.Table(table).FindOne(1)
oneReplace, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(oneReplace["id"].Int(), 1)
t.Assert(oneReplace["name"].String(), "name_100")
@ -251,35 +251,35 @@ CREATE TABLE %s (
time.Sleep(2 * time.Second)
// Delete
r, err = db.Table(table).Delete("id", 1)
r, err = db.Model(table).Delete("id", 1)
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 1)
// Delete Select
one4, err := db.Table(table).FindOne(1)
one4, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(len(one4), 0)
one5, err := db.Table(table).Unscoped().FindOne(1)
one5, err := db.Model(table).Unscoped().FindOne(1)
t.AssertNil(err)
t.Assert(one5["id"].Int(), 1)
t.AssertGE(one5["deleted_at"].GTime().Timestamp(), gtime.Timestamp()-2)
// Delete Count
i, err := db.Table(table).FindCount()
i, err := db.Model(table).FindCount()
t.AssertNil(err)
t.Assert(i, 0)
i, err = db.Table(table).Unscoped().FindCount()
i, err = db.Model(table).Unscoped().FindCount()
t.AssertNil(err)
t.Assert(i, 1)
// Delete Unscoped
r, err = db.Table(table).Unscoped().Delete("id", 1)
r, err = db.Model(table).Unscoped().Delete("id", 1)
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 1)
one6, err := db.Table(table).Unscoped().FindOne(1)
one6, err := db.Model(table).Unscoped().FindOne(1)
t.AssertNil(err)
t.Assert(len(one6), 0)
i, err = db.Table(table).Unscoped().FindCount()
i, err = db.Model(table).Unscoped().FindCount()
t.AssertNil(err)
t.Assert(i, 0)
})
@ -315,12 +315,12 @@ CREATE TABLE %s (
Id: 1,
Name: "name_1",
}
r, err := db.Table(table).Data(dataInsert).Insert()
r, err := db.Model(table).Data(dataInsert).Insert()
t.AssertNil(err)
n, _ := r.RowsAffected()
t.Assert(n, 1)
oneInsert, err := db.Table(table).FindOne(1)
oneInsert, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(oneInsert["id"].Int(), 1)
t.Assert(oneInsert["name"].String(), "name_1")
@ -336,12 +336,12 @@ CREATE TABLE %s (
Id: 1,
Name: "name_10",
}
r, err = db.Table(table).Data(dataSave).OmitEmpty().Save()
r, err = db.Model(table).Data(dataSave).OmitEmpty().Save()
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 2)
oneSave, err := db.Table(table).FindOne(1)
oneSave, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(oneSave["id"].Int(), 1)
t.Assert(oneSave["name"].String(), "name_10")
@ -357,12 +357,12 @@ CREATE TABLE %s (
dataUpdate := User{
Name: "name_1000",
}
r, err = db.Table(table).Data(dataUpdate).OmitEmpty().WherePri(1).Update()
r, err = db.Model(table).Data(dataUpdate).OmitEmpty().WherePri(1).Update()
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 1)
oneUpdate, err := db.Table(table).FindOne(1)
oneUpdate, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(oneUpdate["id"].Int(), 1)
t.Assert(oneUpdate["name"].String(), "name_1000")
@ -375,12 +375,12 @@ CREATE TABLE %s (
Id: 1,
Name: "name_100",
}
r, err = db.Table(table).Data(dataReplace).OmitEmpty().Replace()
r, err = db.Model(table).Data(dataReplace).OmitEmpty().Replace()
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 2)
oneReplace, err := db.Table(table).FindOne(1)
oneReplace, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(oneReplace["id"].Int(), 1)
t.Assert(oneReplace["name"].String(), "name_100")
@ -392,35 +392,35 @@ CREATE TABLE %s (
time.Sleep(2 * time.Second)
// Delete
r, err = db.Table(table).Delete("id", 1)
r, err = db.Model(table).Delete("id", 1)
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 1)
// Delete Select
one4, err := db.Table(table).FindOne(1)
one4, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(len(one4), 0)
one5, err := db.Table(table).Unscoped().FindOne(1)
one5, err := db.Model(table).Unscoped().FindOne(1)
t.AssertNil(err)
t.Assert(one5["id"].Int(), 1)
t.AssertGE(one5["deleted_at"].GTime().Timestamp(), gtime.Timestamp()-2)
// Delete Count
i, err := db.Table(table).FindCount()
i, err := db.Model(table).FindCount()
t.AssertNil(err)
t.Assert(i, 0)
i, err = db.Table(table).Unscoped().FindCount()
i, err = db.Model(table).Unscoped().FindCount()
t.AssertNil(err)
t.Assert(i, 1)
// Delete Unscoped
r, err = db.Table(table).Unscoped().Delete("id", 1)
r, err = db.Model(table).Unscoped().Delete("id", 1)
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 1)
one6, err := db.Table(table).Unscoped().FindOne(1)
one6, err := db.Model(table).Unscoped().FindOne(1)
t.AssertNil(err)
t.Assert(len(one6), 0)
i, err = db.Table(table).Unscoped().FindCount()
i, err = db.Model(table).Unscoped().FindCount()
t.AssertNil(err)
t.Assert(i, 0)
})
@ -448,18 +448,18 @@ CREATE TABLE %s (
"id": 1,
"num": 10,
}
r, err := db.Table(table).Data(dataInsert).Insert()
r, err := db.Model(table).Data(dataInsert).Insert()
t.AssertNil(err)
n, _ := r.RowsAffected()
t.Assert(n, 1)
oneInsert, err := db.Table(table).FindOne(1)
oneInsert, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(oneInsert["id"].Int(), 1)
t.Assert(oneInsert["num"].Int(), 10)
// Update.
r, err = db.Table(table).Data("num=num+1").Where("id=?", 1).Update()
r, err = db.Model(table).Data("num=num+1").Where("id=?", 1).Update()
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 1)
@ -488,21 +488,21 @@ CREATE TABLE %s (
"id": i,
"name": fmt.Sprintf("name_%d", i),
}
r, err := db.Table(table).Data(data).Insert()
r, err := db.Model(table).Data(data).Insert()
t.AssertNil(err)
n, _ := r.RowsAffected()
t.Assert(n, 1)
}
})
gtest.C(t, func(t *gtest.T) {
one, err := db.Table(table).FindOne(1)
one, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.AssertNE(one["create_at"].String(), "")
t.AssertNE(one["update_at"].String(), "")
t.Assert(one["delete_at"].String(), "")
})
gtest.C(t, func(t *gtest.T) {
one, err := db.Table(table).FindOne(10)
one, err := db.Model(table).FindOne(10)
t.AssertNil(err)
t.AssertNE(one["create_at"].String(), "")
t.AssertNE(one["update_at"].String(), "")
@ -510,16 +510,16 @@ CREATE TABLE %s (
})
gtest.C(t, func(t *gtest.T) {
ids := g.SliceInt{1, 3, 5}
r, err := db.Table(table).Where("id", ids).Delete()
r, err := db.Model(table).Where("id", ids).Delete()
t.AssertNil(err)
n, _ := r.RowsAffected()
t.Assert(n, 3)
count, err := db.Table(table).FindCount(ids)
count, err := db.Model(table).FindCount(ids)
t.AssertNil(err)
t.Assert(count, 0)
all, err := db.Table(table).Unscoped().FindAll(ids)
all, err := db.Model(table).Unscoped().FindAll(ids)
t.AssertNil(err)
t.Assert(len(all), 3)
t.AssertNE(all[0]["create_at"].String(), "")
@ -571,7 +571,7 @@ CREATE TABLE %s (
"id": 1,
"name": "name_1",
}
r, err := db.Table(table1).Data(dataInsert1).Insert()
r, err := db.Model(table1).Data(dataInsert1).Insert()
t.AssertNil(err)
n, _ := r.RowsAffected()
t.Assert(n, 1)
@ -580,26 +580,26 @@ CREATE TABLE %s (
"id": 1,
"name": "name_2",
}
r, err = db.Table(table2).Data(dataInsert2).Insert()
r, err = db.Model(table2).Data(dataInsert2).Insert()
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 1)
one, err := db.Table(table1, "t1").LeftJoin(table2, "t2", "t2.id=t1.id").Fields("t1.name").FindOne()
one, err := db.Model(table1, "t1").LeftJoin(table2, "t2", "t2.id=t1.id").Fields("t1.name").FindOne()
t.AssertNil(err)
t.Assert(one["name"], "name_1")
// Soft deleting.
r, err = db.Table(table1).Delete()
r, err = db.Model(table1).Delete()
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 1)
one, err = db.Table(table1, "t1").LeftJoin(table2, "t2", "t2.id=t1.id").Fields("t1.name").FindOne()
one, err = db.Model(table1, "t1").LeftJoin(table2, "t2", "t2.id=t1.id").Fields("t1.name").FindOne()
t.AssertNil(err)
t.Assert(one.IsEmpty(), true)
one, err = db.Table(table2, "t2").LeftJoin(table1, "t1", "t2.id=t1.id").Fields("t2.name").FindOne()
one, err = db.Model(table2, "t2").LeftJoin(table1, "t1", "t2.id=t1.id").Fields("t2.name").FindOne()
t.AssertNil(err)
t.Assert(one.IsEmpty(), true)
})
@ -628,7 +628,7 @@ CREATE TABLE %s (
"id": i,
"name": fmt.Sprintf("name_%d", i),
}
r, err := db.Table(table).Data(data).Insert()
r, err := db.Model(table).Data(data).Insert()
t.AssertNil(err)
n, _ := r.RowsAffected()
t.Assert(n, 1)
@ -636,12 +636,12 @@ CREATE TABLE %s (
})
gtest.C(t, func(t *gtest.T) {
ids := g.SliceInt{1, 3, 5}
r, err := db.Table(table).Where("id", ids).Delete()
r, err := db.Model(table).Where("id", ids).Delete()
t.AssertNil(err)
n, _ := r.RowsAffected()
t.Assert(n, 3)
count, err := db.Table(table).Where("id", 1).Or("id", 3).Count()
count, err := db.Model(table).Where("id", 1).Or("id", 3).Count()
t.AssertNil(err)
t.Assert(count, 0)
})
@ -679,12 +679,12 @@ CREATE TABLE %s (
UpdateAt: nil,
DeleteAt: nil,
}
r, err := db.Table(table).Data(dataInsert).Insert()
r, err := db.Model(table).Data(dataInsert).Insert()
t.AssertNil(err)
n, _ := r.RowsAffected()
t.Assert(n, 1)
oneInsert, err := db.Table(table).FindOne(1)
oneInsert, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(oneInsert["id"].Int(), 1)
t.Assert(oneInsert["name"].String(), "name_1")
@ -702,12 +702,12 @@ CREATE TABLE %s (
UpdateAt: nil,
DeleteAt: nil,
}
r, err = db.Table(table).Data(dataSave).Save()
r, err = db.Model(table).Data(dataSave).Save()
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 2)
oneSave, err := db.Table(table).FindOne(1)
oneSave, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(oneSave["id"].Int(), 1)
t.Assert(oneSave["name"].String(), "name_10")
@ -726,12 +726,12 @@ CREATE TABLE %s (
UpdateAt: nil,
DeleteAt: nil,
}
r, err = db.Table(table).Data(dataUpdate).WherePri(1).Update()
r, err = db.Model(table).Data(dataUpdate).WherePri(1).Update()
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 1)
oneUpdate, err := db.Table(table).FindOne(1)
oneUpdate, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(oneUpdate["id"].Int(), 1)
t.Assert(oneUpdate["name"].String(), "name_1000")
@ -747,12 +747,12 @@ CREATE TABLE %s (
UpdateAt: nil,
DeleteAt: nil,
}
r, err = db.Table(table).Data(dataReplace).Replace()
r, err = db.Model(table).Data(dataReplace).Replace()
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 2)
oneReplace, err := db.Table(table).FindOne(1)
oneReplace, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(oneReplace["id"].Int(), 1)
t.Assert(oneReplace["name"].String(), "name_100")
@ -763,35 +763,35 @@ CREATE TABLE %s (
time.Sleep(2 * time.Second)
// Delete
r, err = db.Table(table).Delete("id", 1)
r, err = db.Model(table).Delete("id", 1)
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 1)
// Delete Select
one4, err := db.Table(table).FindOne(1)
one4, err := db.Model(table).FindOne(1)
t.AssertNil(err)
t.Assert(len(one4), 0)
one5, err := db.Table(table).Unscoped().FindOne(1)
one5, err := db.Model(table).Unscoped().FindOne(1)
t.AssertNil(err)
t.Assert(one5["id"].Int(), 1)
t.AssertGE(one5["delete_at"].GTime().Timestamp(), gtime.Timestamp()-2)
// Delete Count
i, err := db.Table(table).FindCount()
i, err := db.Model(table).FindCount()
t.AssertNil(err)
t.Assert(i, 0)
i, err = db.Table(table).Unscoped().FindCount()
i, err = db.Model(table).Unscoped().FindCount()
t.AssertNil(err)
t.Assert(i, 1)
// Delete Unscoped
r, err = db.Table(table).Unscoped().Delete("id", 1)
r, err = db.Model(table).Unscoped().Delete("id", 1)
t.AssertNil(err)
n, _ = r.RowsAffected()
t.Assert(n, 1)
one6, err := db.Table(table).Unscoped().FindOne(1)
one6, err := db.Model(table).Unscoped().FindOne(1)
t.AssertNil(err)
t.Assert(len(one6), 0)
i, err = db.Table(table).Unscoped().FindCount()
i, err = db.Model(table).Unscoped().FindCount()
t.AssertNil(err)
t.Assert(i, 0)
})

42
database/gdb/gdb_z_mysql_transaction_test.go
View File

@ -183,7 +183,7 @@ func Test_TX_BatchInsert(t *testing.T) {
if err := tx.Commit(); err != nil {
gtest.Error(err)
}
if n, err := db.Table(table).Count(); err != nil {
if n, err := db.Model(table).Count(); err != nil {
gtest.Error(err)
} else {
t.Assert(n, 2)
@ -221,12 +221,12 @@ func Test_TX_BatchReplace(t *testing.T) {
if err := tx.Commit(); err != nil {
gtest.Error(err)
}
if n, err := db.Table(table).Count(); err != nil {
if n, err := db.Model(table).Count(); err != nil {
gtest.Error(err)
} else {
t.Assert(n, SIZE)
t.Assert(n, TableSize)
}
if value, err := db.Table(table).Fields("password").Where("id", 2).Value(); err != nil {
if value, err := db.Model(table).Fields("password").Where("id", 2).Value(); err != nil {
gtest.Error(err)
} else {
t.Assert(value.String(), "PASS_2")
@ -258,13 +258,13 @@ func Test_TX_BatchSave(t *testing.T) {
gtest.Error(err)
}
if n, err := db.Table(table).Count(); err != nil {
if n, err := db.Model(table).Count(); err != nil {
gtest.Error(err)
} else {
t.Assert(n, SIZE)
t.Assert(n, TableSize)
}
if value, err := db.Table(table).Fields("password").Where("id", 4).Value(); err != nil {
if value, err := db.Model(table).Fields("password").Where("id", 4).Value(); err != nil {
gtest.Error(err)
} else {
t.Assert(value.String(), "PASS_4")
@ -293,7 +293,7 @@ func Test_TX_Replace(t *testing.T) {
if err := tx.Rollback(); err != nil {
gtest.Error(err)
}
if value, err := db.Table(table).Fields("nickname").Where("id", 1).Value(); err != nil {
if value, err := db.Model(table).Fields("nickname").Where("id", 1).Value(); err != nil {
gtest.Error(err)
} else {
t.Assert(value.String(), "name_1")
@ -322,7 +322,7 @@ func Test_TX_Save(t *testing.T) {
if err := tx.Commit(); err != nil {
gtest.Error(err)
}
if value, err := db.Table(table).Fields("nickname").Where("id", 1).Value(); err != nil {
if value, err := db.Model(table).Fields("nickname").Where("id", 1).Value(); err != nil {
gtest.Error(err)
} else {
t.Assert(value.String(), "NAME_1")
@ -351,7 +351,7 @@ func Test_TX_Update(t *testing.T) {
_, err = tx.Table(table).Fields("create_time").Where("id", 3).Value()
t.AssertNE(err, nil)
if value, err := db.Table(table).Fields("create_time").Where("id", 3).Value(); err != nil {
if value, err := db.Model(table).Fields("create_time").Where("id", 3).Value(); err != nil {
gtest.Error(err)
} else {
t.Assert(value.String(), "2019-10-24 10:00:00")
@ -435,7 +435,7 @@ func Test_TX_GetCount(t *testing.T) {
if count, err := tx.GetCount("SELECT * FROM " + table); err != nil {
gtest.Error(err)
} else {
t.Assert(count, SIZE)
t.Assert(count, TableSize)
}
if err := tx.Commit(); err != nil {
gtest.Error(err)
@ -513,7 +513,7 @@ func Test_TX_GetStructs(t *testing.T) {
if err := tx.GetStructs(&users, fmt.Sprintf("SELECT * FROM %s WHERE id>=?", table), 1); err != nil {
gtest.Error(err)
}
t.Assert(len(users), SIZE)
t.Assert(len(users), TableSize)
t.Assert(users[0].Id, 1)
t.Assert(users[1].Id, 2)
t.Assert(users[2].Id, 3)
@ -542,7 +542,7 @@ func Test_TX_GetStructs(t *testing.T) {
if err := tx.GetStructs(&users, fmt.Sprintf("SELECT * FROM %s WHERE id>=?", table), 1); err != nil {
gtest.Error(err)
}
t.Assert(len(users), SIZE)
t.Assert(len(users), TableSize)
t.Assert(users[0].Id, 1)
t.Assert(users[1].Id, 2)
t.Assert(users[2].Id, 3)
@ -621,7 +621,7 @@ func Test_TX_GetScan(t *testing.T) {
if err := tx.GetScan(&users, fmt.Sprintf("SELECT * FROM %s WHERE id>=?", table), 1); err != nil {
gtest.Error(err)
}
t.Assert(len(users), SIZE)
t.Assert(len(users), TableSize)
t.Assert(users[0].Id, 1)
t.Assert(users[1].Id, 2)
t.Assert(users[2].Id, 3)
@ -650,7 +650,7 @@ func Test_TX_GetScan(t *testing.T) {
if err := tx.GetScan(&users, fmt.Sprintf("SELECT * FROM %s WHERE id>=?", table), 1); err != nil {
gtest.Error(err)
}
t.Assert(len(users), SIZE)
t.Assert(len(users), TableSize)
t.Assert(users[0].Id, 1)
t.Assert(users[1].Id, 2)
t.Assert(users[2].Id, 3)
@ -679,7 +679,7 @@ func Test_TX_Delete(t *testing.T) {
if err := tx.Commit(); err != nil {
gtest.Error(err)
}
if n, err := db.Table(table).Count(); err != nil {
if n, err := db.Model(table).Count(); err != nil {
gtest.Error(err)
} else {
t.Assert(n, 0)
@ -704,10 +704,10 @@ func Test_TX_Delete(t *testing.T) {
if err := tx.Rollback(); err != nil {
gtest.Error(err)
}
if n, err := db.Table(table).Count(); err != nil {
if n, err := db.Model(table).Count(); err != nil {
gtest.Error(err)
} else {
t.Assert(n, SIZE)
t.Assert(n, TableSize)
t.AssertNE(n, 0)
}
})
@ -732,7 +732,7 @@ func Test_Transaction(t *testing.T) {
})
t.AssertNE(err, nil)
if value, err := db.Table(table).Fields("nickname").Where("id", 1).Value(); err != nil {
if value, err := db.Model(table).Fields("nickname").Where("id", 1).Value(); err != nil {
gtest.Error(err)
} else {
t.Assert(value.String(), "name_1")
@ -754,7 +754,7 @@ func Test_Transaction(t *testing.T) {
})
t.AssertNil(err)
if value, err := db.Table(table).Fields("nickname").Where("id", 1).Value(); err != nil {
if value, err := db.Model(table).Fields("nickname").Where("id", 1).Value(); err != nil {
gtest.Error(err)
} else {
t.Assert(value.String(), "NAME_1")
@ -782,7 +782,7 @@ func Test_Transaction_Panic(t *testing.T) {
})
t.AssertNE(err, nil)
if value, err := db.Table(table).Fields("nickname").Where("id", 1).Value(); err != nil {
if value, err := db.Model(table).Fields("nickname").Where("id", 1).Value(); err != nil {
gtest.Error(err)
} else {
t.Assert(value.String(), "name_1")

6
database/gdb/gdb_z_mysql_types_test.go
View File

@ -58,12 +58,12 @@ func Test_Types(t *testing.T) {
"tinyint": true,
"bool": false,
}
r, err := db.Table("types").Data(data).Insert()
r, err := db.Model("types").Data(data).Insert()
t.AssertNil(err)
n, _ := r.RowsAffected()
t.Assert(n, 1)
one, err := db.Table("types").One()
one, err := db.Model("types").One()
t.AssertNil(err)
t.Assert(one["id"].Int(), 1)
t.Assert(one["blob"].String(), data["blob"])
@ -87,7 +87,7 @@ func Test_Types(t *testing.T) {
TinyInt bool
}
var obj *T
err = db.Table("types").Struct(&obj)
err = db.Model("types").Struct(&obj)
t.AssertNil(err)
t.Assert(obj.Id, 1)
t.Assert(obj.Blob, data["blob"])