From ebac051e7207181ac3d7bbe288536bf2224c9c0e Mon Sep 17 00:00:00 2001 From: David Schneiderbauer Date: Sun, 8 Oct 2017 13:08:18 +0200 Subject: Rewrite migrations to not depend on future code changes (#2604) * v38 migration used an outdated version of RepoUnit model (#2602) * change repoUnit model in migration * fix v16 migration repo_unit table * fix lint error * move type definition inside function Signed-off-by: David Schneiderbauer * fix lint error Signed-off-by: David Schneiderbauer * Fix time tracking migration * Refactor code * Fix migration from Gogs * v38 migration used an outdated version of RepoUnit model (#2602) * change repoUnit model in migration * fix v16 migration repo_unit table * fix lint error * move type definition inside function Signed-off-by: David Schneiderbauer * fix lint error Signed-off-by: David Schneiderbauer * Fix time tracking migration * Refactor code * Fix migration from Gogs * add error check Signed-off-by: David Schneiderbauer * Additiomal fixes for migrations * Fix timetracking migration * Add back nil check --- models/migrations/v16.go | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'models/migrations/v16.go') diff --git a/models/migrations/v16.go b/models/migrations/v16.go index 8ce37ea7db..5b8ec19d32 100644 --- a/models/migrations/v16.go +++ b/models/migrations/v16.go @@ -13,17 +13,6 @@ import ( "github.com/go-xorm/xorm" ) -// RepoUnit describes all units of a repository -type RepoUnit struct { - ID int64 - RepoID int64 `xorm:"INDEX(s)"` - Type int `xorm:"INDEX(s)"` - Index int - Config map[string]interface{} `xorm:"JSON"` - CreatedUnix int64 `xorm:"INDEX CREATED"` - Created time.Time `xorm:"-"` -} - // Enumerate all the unit types const ( V16UnitTypeCode = iota + 1 // 1 code @@ -37,14 +26,25 @@ const ( V16UnitTypeExternalTracker // 9 ExternalTracker ) -// Repo describes a repository -type Repo struct { - ID int64 - EnableWiki, EnableExternalWiki, EnableIssues, EnableExternalTracker, EnablePulls bool - ExternalWikiURL, ExternalTrackerURL, ExternalTrackerFormat, ExternalTrackerStyle string -} - func addUnitsToTables(x *xorm.Engine) error { + // RepoUnit describes all units of a repository + type RepoUnit struct { + ID int64 + RepoID int64 `xorm:"INDEX(s)"` + Type int `xorm:"INDEX(s)"` + Index int + Config map[string]interface{} `xorm:"JSON"` + CreatedUnix int64 `xorm:"INDEX CREATED"` + Created time.Time `xorm:"-"` + } + + // Repo describes a repository + type Repo struct { + ID int64 + EnableWiki, EnableExternalWiki, EnableIssues, EnableExternalTracker, EnablePulls bool + ExternalWikiURL, ExternalTrackerURL, ExternalTrackerFormat, ExternalTrackerStyle string + } + var repos []Repo err := x.Table("repository").Select("*").Find(&repos) if err != nil { -- cgit v1.2.3