From fa0898f98c30018b408650c8c2c74321260a2e17 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Tue, 14 Jun 2016 11:38:10 +0800 Subject: [PATCH 1/2] assume Yes to remove --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a23fba418..79be997af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ before_install: install: - sudo apt-get update && sudo apt-get install -y libldap2-dev - - sudo apt-get remove mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5 + - sudo apt-get remove -y mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5 - sudo apt-get autoremove - sudo apt-get install libaio1 - wget -O mysql-5.6.14.deb http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.14-debian6.0-x86_64.deb/from/http://cdn.mysql.com/ From df4766b43e21dd0fd7b965b6bc93cc9862d72c16 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Tue, 14 Jun 2016 11:59:44 +0800 Subject: [PATCH 2/2] add primary key annotation to models --- .travis.yml | 4 ++-- models/accesslog.go | 2 +- models/project.go | 2 +- models/user.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 79be997af..4b204162e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,8 +37,8 @@ before_install: install: - sudo apt-get update && sudo apt-get install -y libldap2-dev - sudo apt-get remove -y mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5 - - sudo apt-get autoremove - - sudo apt-get install libaio1 + - sudo apt-get autoremove -y + - sudo apt-get install -y libaio1 - wget -O mysql-5.6.14.deb http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.14-debian6.0-x86_64.deb/from/http://cdn.mysql.com/ - sudo dpkg -i mysql-5.6.14.deb - sudo cp /opt/mysql/server-5.6/support-files/mysql.server /etc/init.d/mysql.server diff --git a/models/accesslog.go b/models/accesslog.go index 336e7bd08..defc7e37d 100644 --- a/models/accesslog.go +++ b/models/accesslog.go @@ -21,7 +21,7 @@ import ( // AccessLog holds information about logs which are used to record the actions that user take to the resourses. type AccessLog struct { - LogID int `orm:"column(log_id)" json:"log_id"` + LogID int `orm:"pk;column(log_id)" json:"log_id"` UserID int `orm:"column(user_id)" json:"user_id"` ProjectID int64 `orm:"column(project_id)" json:"project_id"` RepoName string `orm:"column(repo_name)" json:"repo_name"` diff --git a/models/project.go b/models/project.go index 7f5d54c25..e16f0ce5f 100644 --- a/models/project.go +++ b/models/project.go @@ -21,7 +21,7 @@ import ( // Project holds the details of a project. type Project struct { - ProjectID int64 `orm:"column(project_id)" json:"project_id"` + ProjectID int64 `orm:"pk;column(project_id)" json:"project_id"` OwnerID int `orm:"column(owner_id)" json:"owner_id"` Name string `orm:"column(name)" json:"name"` CreationTime time.Time `orm:"column(creation_time)" json:"creation_time"` diff --git a/models/user.go b/models/user.go index 241a25549..1b8b2ae86 100644 --- a/models/user.go +++ b/models/user.go @@ -21,7 +21,7 @@ import ( // User holds the details of a user. type User struct { - UserID int `orm:"column(user_id)" json:"user_id"` + UserID int `orm:"pk;column(user_id)" json:"user_id"` Username string `orm:"column(username)" json:"username"` Email string `orm:"column(email)" json:"email"` Password string `orm:"column(password)" json:"password"`