summaryrefslogtreecommitdiffstats
path: root/models/user.go
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2017-09-13 13:18:22 +0800
committerLauris BH <lauris@nix.lv>2017-09-13 08:18:22 +0300
commit005900baead84d02b276a2179dee10f00d4d251b (patch)
tree35df8555141a235720ea7013ebb1ba2da62a343e /models/user.go
parent4c2b1be3a4bc0479927922f12b0c71b2404d073f (diff)
downloadgitea-005900baead84d02b276a2179dee10f00d4d251b.tar.gz
gitea-005900baead84d02b276a2179dee10f00d4d251b.zip
Use created & updated instead BeforeInsert & BeforeUpdate (#2482)
* use created & updated instead BeforeInsert & BeforeUpdate * fix vendor checksum * only show generated SQL when development mode * remove extra update column updated_unix * remove trace config
Diffstat (limited to 'models/user.go')
-rw-r--r--models/user.go12
1 files changed, 2 insertions, 10 deletions
diff --git a/models/user.go b/models/user.go
index 1e2502ebc0..f6d7051013 100644
--- a/models/user.go
+++ b/models/user.go
@@ -94,9 +94,9 @@ type User struct {
Salt string `xorm:"VARCHAR(10)"`
Created time.Time `xorm:"-"`
- CreatedUnix int64 `xorm:"INDEX"`
+ CreatedUnix int64 `xorm:"INDEX created"`
Updated time.Time `xorm:"-"`
- UpdatedUnix int64 `xorm:"INDEX"`
+ UpdatedUnix int64 `xorm:"INDEX updated"`
LastLogin time.Time `xorm:"-"`
LastLoginUnix int64 `xorm:"INDEX"`
@@ -135,18 +135,11 @@ type User struct {
DiffViewStyle string `xorm:"NOT NULL DEFAULT ''"`
}
-// BeforeInsert is invoked from XORM before inserting an object of this type.
-func (u *User) BeforeInsert() {
- u.CreatedUnix = time.Now().Unix()
- u.UpdatedUnix = u.CreatedUnix
-}
-
// BeforeUpdate is invoked from XORM before updating this object.
func (u *User) BeforeUpdate() {
if u.MaxRepoCreation < -1 {
u.MaxRepoCreation = -1
}
- u.UpdatedUnix = time.Now().Unix()
}
// SetLastLogin set time to last login
@@ -897,7 +890,6 @@ func UpdateUserCols(u *User, cols ...string) error {
u.Website = base.TruncateString(u.Website, 255)
u.Description = base.TruncateString(u.Description, 255)
- cols = append(cols, "updated_unix")
_, err := x.Id(u.ID).Cols(cols...).Update(u)
return err
}