From ecb95882d6a5f0924c09f4cbcd9fbdb32875691e Mon Sep 17 00:00:00 2001 From: Gregory Eremin Date: Fri, 20 Mar 2015 22:32:26 +0700 Subject: [PATCH] Remove created at field from most models --- db/org.go | 5 ++--- db/repo.go | 10 +++++++--- db/team.go | 5 ++--- db/user.go | 5 ++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/db/org.go b/db/org.go index c8acf0a..41a749f 100644 --- a/db/org.go +++ b/db/org.go @@ -9,15 +9,14 @@ type Org struct { Login string `json:"login"` Company string `json:"company"` AvatarURL string `json:"avatar_url" db:"avatar_url"` - CreatedAt time.Time `json:"created_at" db:"created_at"` UpdatedAt time.Time `json:"updated_at" db:"updated_at"` } func (o *Org) Save() { defer measure("SaveOrg", time.Now()) mustExecN(` - insert into orgs (id, login, company, avatar_url, created_at, updated_at) - values (:id, :login, :company, :avatar_url, now(), now()) + insert into orgs (id, login, company, avatar_url, updated_at) + values (:id, :login, :company, :avatar_url, now()) on duplicate key update login = values(login), company = values(company), diff --git a/db/repo.go b/db/repo.go index af5b403..c481e1f 100644 --- a/db/repo.go +++ b/db/repo.go @@ -11,16 +11,20 @@ type Repo struct { Description string `json:"description"` IsPrivate bool `json:"is_private"` IsFork bool `json:"is_fork"` - CreatedAt time.Time `json:"created_at"` UpdatedAt time.Time `json:"updated_at"` } func (r *Repo) Save() { defer measure("SaveRepo", time.Now()) mustExecN(` - insert into repos (owner, name, updated_at) - values (:owner, :name, now()) + insert into repos (org_id, name, description, is_private, is_fork, updated_at) + values (:org_id, :name, :description, :is_private, :is_fork, now()) on duplicate key update + org_id = values(org_id), + name = values(name), + description = values(description), + is_private = values(is_private), + is_fork = values(is_fork), updated_at = now() `, r) } diff --git a/db/team.go b/db/team.go index 95635c7..3563b3a 100644 --- a/db/team.go +++ b/db/team.go @@ -10,15 +10,14 @@ type Team struct { Slug string `json:"slug"` Name string `json:"name"` Permission string `json:"permission"` - CreatedAt time.Time `json:"created_at" db:"created_at"` UpdatedAt time.Time `json:"updated_at" db:"updated_at"` } func (t *Team) Save() { defer measure("SaveTeam", time.Now()) mustExecN(` - insert into teams (id, org_id, slug, name, permission, created_at, updated_at) - values (:id, :org_id, :slug, :name, :permission, now(), now()) + insert into teams (id, org_id, slug, name, permission, updated_at) + values (:id, :org_id, :slug, :name, :permission, now()) on duplicate key update slug = values(slug), name = values(name), diff --git a/db/user.go b/db/user.go index 9e18184..7abd602 100644 --- a/db/user.go +++ b/db/user.go @@ -9,15 +9,14 @@ type User struct { Login string `json:"login"` Name string `json:"name"` AvatarURL string `json:"avatar_url" db:"avatar_url"` - CreatedAt time.Time `json:"created_at" db:"created_at"` UpdatedAt time.Time `json:"updated_at" db:"updated_at"` } func (u *User) Save() { defer measure("SaveUser", time.Now()) mustExecN(` - insert into users (id, login, name, avatar_url, created_at, updated_at) - values (:id, :login, :name, :avatar_url, now(), now()) + insert into users (id, login, name, avatar_url, updated_at) + values (:id, :login, :name, :avatar_url, now()) on duplicate key update login = values(login), name = values(name),