Merge 81d8b70ed3
into 33fc33b2f5
This commit is contained in:
commit
cbdd12d962
|
@ -7,6 +7,7 @@
|
|||
# Folders
|
||||
_obj
|
||||
_test
|
||||
vendor/
|
||||
|
||||
# Architecture specific extensions/prefixes
|
||||
*.[568vq]
|
||||
|
|
|
@ -1600,7 +1600,7 @@ func (engine *Engine) formatTime(sqlTypeName string, t time.Time) (v interface{}
|
|||
v = s[11:19]
|
||||
case core.Date:
|
||||
v = t.Format("2006-01-02")
|
||||
case core.DateTime, core.TimeStamp:
|
||||
case core.DateTime, core.TimeStamp, core.Varchar: // !DarthPestilane! format time when sqlTypeName is core.Varchar.
|
||||
v = t.Format("2006-01-02 15:04:05")
|
||||
case core.TimeStampz:
|
||||
if engine.dialect.DBType() == core.MSSQL {
|
||||
|
|
11
time_test.go
11
time_test.go
|
@ -255,10 +255,12 @@ func TestTimeUserDeleted(t *testing.T) {
|
|||
assert.NoError(t, prepareEngine())
|
||||
|
||||
type UserDeleted struct {
|
||||
Id string
|
||||
CreatedAt time.Time `xorm:"created"`
|
||||
UpdatedAt time.Time `xorm:"updated"`
|
||||
DeletedAt time.Time `xorm:"deleted"`
|
||||
Id string
|
||||
CreatedAt time.Time `xorm:"created"`
|
||||
UpdatedAt time.Time `xorm:"updated"`
|
||||
DeletedAt time.Time `xorm:"deleted"`
|
||||
CreatedAtStr string `xorm:"datetime created"`
|
||||
UpdatedAtStr string `xorm:"datetime updated"`
|
||||
}
|
||||
|
||||
assertSync(t, new(UserDeleted))
|
||||
|
@ -282,6 +284,7 @@ func TestTimeUserDeleted(t *testing.T) {
|
|||
assert.EqualValues(t, formatTime(user.UpdatedAt), formatTime(user2.UpdatedAt))
|
||||
assert.True(t, isTimeZero(user2.DeletedAt))
|
||||
fmt.Println("user2", user2.CreatedAt, user2.UpdatedAt, user2.DeletedAt)
|
||||
fmt.Println("user2 str", user2.CreatedAtStr, user2.UpdatedAtStr)
|
||||
|
||||
var user3 UserDeleted
|
||||
cnt, err = testEngine.Where("id = ?", "lunny").Delete(&user3)
|
||||
|
|
Loading…
Reference in New Issue