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

fix issue #1219

Browse Source
This commit is contained in:
John Guo
2022-02-17 23:04:50 +08:00
parent fdf09b5978
commit 7812f41b43
2 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
database/gdb/gdb_core_structure.go
View File

@ -159,6 +159,7 @@ func (c *Core) convertFieldValueToLocalValue(fieldValue interface{}, fieldType s
return gconv.Bool(fieldValue)
case "date":
// Date without time.
if t, ok := fieldValue.(time.Time); ok {
return gtime.NewFromTime(t).Format("Y-m-d")
}
@ -173,7 +174,7 @@ func (c *Core) convertFieldValueToLocalValue(fieldValue interface{}, fieldType s
return gtime.NewFromTime(t)
}
t, _ := gtime.StrToTime(gconv.String(fieldValue))
return t.String()
return t
default:
// Auto-detect field type, using key match.
@ -199,7 +200,7 @@ func (c *Core) convertFieldValueToLocalValue(fieldValue interface{}, fieldType s
if err != nil {
return s
}
return t.String()
return t
case strings.Contains(typeName, "date"):
s := gconv.String(fieldValue)
@ -207,7 +208,7 @@ func (c *Core) convertFieldValueToLocalValue(fieldValue interface{}, fieldType s
if err != nil {
return s
}
return t.Format("Y-m-d")
return t
default:
return gconv.String(fieldValue)

44
database/gdb/gdb_z_mysql_core_test.go
View File

@ -1520,6 +1520,7 @@ func Test_Types(t *testing.T) {
%s binary(8) NOT NULL,
%s date NOT NULL,
%s time NOT NULL,
%s timestamp(6) NOT NULL,
%s decimal(5,2) NOT NULL,
%s double NOT NULL,
%s bit(2) NOT NULL,
@ -1532,6 +1533,7 @@ func Test_Types(t *testing.T) {
"`binary`",
"`date`",
"`time`",
"`timestamp`",
"`decimal`",
"`double`",
"`bit`",
@ -1541,16 +1543,17 @@ func Test_Types(t *testing.T) {
}
defer dropTable("types")
data := g.Map{
"id": 1,
"blob": "i love gf",
"binary": []byte("abcdefgh"),
"date": "1880-10-24",
"time": "10:00:01",
"decimal": -123.456,
"double": -123.456,
"bit": 2,
"tinyint": true,
"bool": false,
"id": 1,
"blob": "i love gf",
"binary": []byte("abcdefgh"),
"date": "1880-10-24",
"time": "10:00:01",
"timestamp": "2022-02-14 12:00:01.123456",
"decimal": -123.456,
"double": -123.456,
"bit": 2,
"tinyint": true,
"bool": false,
}
r, err := db.Model("types").Data(data).Insert()
t.AssertNil(err)
@ -1564,21 +1567,23 @@ func Test_Types(t *testing.T) {
t.Assert(one["binary"].String(), data["binary"])
t.Assert(one["date"].String(), data["date"])
t.Assert(one["time"].String(), `10:00:01`)
t.Assert(one["timestamp"].GTime().Format(`Y-m-d H:i:s.u`), `2022-02-14 12:00:01.123`)
t.Assert(one["decimal"].String(), -123.46)
t.Assert(one["double"].String(), data["double"])
t.Assert(one["bit"].Int(), data["bit"])
t.Assert(one["tinyint"].Bool(), data["tinyint"])
type T struct {
Id int
Blob []byte
Binary []byte
Date *gtime.Time
Time *gtime.Time
Decimal float64
Double float64
Bit int8
TinyInt bool
Id int
Blob []byte
Binary []byte
Date *gtime.Time
Time *gtime.Time
Timestamp *gtime.Time
Decimal float64
Double float64
Bit int8
TinyInt bool
}
var obj *T
err = db.Model("types").Scan(&obj)
@ -1588,6 +1593,7 @@ func Test_Types(t *testing.T) {
t.Assert(obj.Binary, data["binary"])
t.Assert(obj.Date.Format("Y-m-d"), data["date"])
t.Assert(obj.Time.String(), `10:00:01`)
t.Assert(obj.Timestamp.Format(`Y-m-d H:i:s.u`), `2022-02-14 12:00:01.123`)
t.Assert(obj.Decimal, -123.46)
t.Assert(obj.Double, data["double"])
t.Assert(obj.Bit, data["bit"])