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

Merge 81d8b70ed3 into 33fc33b2f5

This commit is contained in:
Rui Wang 2019-10-13 22:20:31 +00:00 committed by GitHub
parent 33fc33b2f5 81d8b70ed3
commit cbdd12d962
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,6 +7,7 @@
# Folders # Folders
_obj _obj
_test _test
vendor/
# Architecture specific extensions/prefixes # Architecture specific extensions/prefixes
*.[568vq] *.[568vq]

2
engine.go
View File

@ -1600,7 +1600,7 @@ func (engine *Engine) formatTime(sqlTypeName string, t time.Time) (v interface{}
v = s[11:19] v = s[11:19]
case core.Date: case core.Date:
v = t.Format("2006-01-02") 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") v = t.Format("2006-01-02 15:04:05")
case core.TimeStampz: case core.TimeStampz:
if engine.dialect.DBType() == core.MSSQL { if engine.dialect.DBType() == core.MSSQL {

11
time_test.go
View File

@ -255,10 +255,12 @@ func TestTimeUserDeleted(t *testing.T) {
assert.NoError(t, prepareEngine()) assert.NoError(t, prepareEngine())
type UserDeleted struct { type UserDeleted struct {
Id string Id string
CreatedAt time.Time `xorm:"created"` CreatedAt time.Time `xorm:"created"`
UpdatedAt time.Time `xorm:"updated"` UpdatedAt time.Time `xorm:"updated"`
DeletedAt time.Time `xorm:"deleted"` DeletedAt time.Time `xorm:"deleted"`
CreatedAtStr string `xorm:"datetime created"`
UpdatedAtStr string `xorm:"datetime updated"`
} }
assertSync(t, new(UserDeleted)) assertSync(t, new(UserDeleted))
@ -282,6 +284,7 @@ func TestTimeUserDeleted(t *testing.T) {
assert.EqualValues(t, formatTime(user.UpdatedAt), formatTime(user2.UpdatedAt)) assert.EqualValues(t, formatTime(user.UpdatedAt), formatTime(user2.UpdatedAt))
assert.True(t, isTimeZero(user2.DeletedAt)) assert.True(t, isTimeZero(user2.DeletedAt))
fmt.Println("user2", user2.CreatedAt, user2.UpdatedAt, user2.DeletedAt) fmt.Println("user2", user2.CreatedAt, user2.UpdatedAt, user2.DeletedAt)
fmt.Println("user2 str", user2.CreatedAtStr, user2.UpdatedAtStr)
var user3 UserDeleted var user3 UserDeleted
cnt, err = testEngine.Where("id = ?", "lunny").Delete(&user3) cnt, err = testEngine.Where("id = ?", "lunny").Delete(&user3)