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

fix issue in debug infor for soft deleting feature of package gdb

Browse Source
This commit is contained in:
John
2020-06-17 23:47:47 +08:00
parent abe9b54112
commit f3525c84a3
3 changed files with 74 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
database/gdb/gdb_func.go
View File

@ -517,8 +517,10 @@ func FormatSqlWithArgs(sql string, args []interface{}) string {
if args[index] == nil {
return "null"
}
rv := reflect.ValueOf(args[index])
kind := rv.Kind()
var (
rv = reflect.ValueOf(args[index])
kind = rv.Kind()
)
if kind == reflect.Ptr {
if rv.IsNil() || !rv.IsValid() {
return "null"

4
database/gdb/gdb_model_delete.go
View File

@ -40,9 +40,9 @@ func (m *Model) Delete(where ...interface{}) (result sql.Result, err error) {
return m.db.DoUpdate(
m.getLink(true),
m.tables,
fmt.Sprintf(`%s='%s'`, m.db.QuoteString(fieldNameDelete), gtime.Now().String()),
fmt.Sprintf(`%s=?`, m.db.QuoteString(fieldNameDelete)),
conditionWhere+conditionExtra,
conditionArgs...,
append([]interface{}{gtime.Now().String()}, conditionArgs...),
)
}
return m.db.DoDelete(m.getLink(true), m.tables, conditionWhere+conditionExtra, conditionArgs...)

68
database/gdb/gdb_z_mysql_time_test.go → database/gdb/gdb_z_mysql_soft_time_test.go
View File

@ -148,6 +148,74 @@ CREATE TABLE %s (
})
}
func Test_SoftDelete(t *testing.T) {
table := "time_test_table"
if _, err := db.Exec(fmt.Sprintf(`
CREATE TABLE %s (
id int(11) NOT NULL,
name varchar(45) DEFAULT NULL,
create_at datetime DEFAULT NULL,
update_at datetime DEFAULT NULL,
delete_at datetime DEFAULT NULL,
PRIMARY KEY (id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
`, table)); err != nil {
gtest.Error(err)
}
defer dropTable(table)
db.SetDebug(true)
gtest.C(t, func(t *gtest.T) {
for i := 1; i <= 10; i++ {
data := g.Map{
"id": i,
"name": fmt.Sprintf("name_%d", i),
}
r, err := db.Table(table).Data(data).Insert()
t.Assert(err, nil)
n, _ := r.RowsAffected()
t.Assert(n, 1)
}
})
gtest.C(t, func(t *gtest.T) {
one, err := db.Table(table).FindOne(1)
t.Assert(err, nil)
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)
t.Assert(err, nil)
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) {
ids := g.SliceInt{1, 3, 5}
r, err := db.Table(table).Where("id", ids).Delete()
t.Assert(err, nil)
n, _ := r.RowsAffected()
t.Assert(n, 3)
count, err := db.Table(table).FindCount(ids)
t.Assert(err, nil)
t.Assert(count, 0)
all, err := db.Table(table).Unscoped().FindAll(ids)
t.Assert(err, nil)
t.Assert(len(all), 3)
t.AssertNE(all[0]["create_at"].String(), "")
t.AssertNE(all[0]["update_at"].String(), "")
t.AssertNE(all[0]["delete_at"].String(), "")
t.AssertNE(all[1]["create_at"].String(), "")
t.AssertNE(all[1]["update_at"].String(), "")
t.AssertNE(all[1]["delete_at"].String(), "")
t.AssertNE(all[2]["create_at"].String(), "")
t.AssertNE(all[2]["update_at"].String(), "")
t.AssertNE(all[2]["delete_at"].String(), "")
})
}
func Test_SoftDelete_Join(t *testing.T) {
table1 := "time_test_table1"
if _, err := db.Exec(fmt.Sprintf(`