From 2a70d6b7235a124027ebc446d8559b4596cb6dcd Mon Sep 17 00:00:00 2001 From: Peter Smit Date: Thu, 22 Jan 2015 14:56:50 +0200 Subject: [PATCH] Clean up migrations code --- models/migrations/migrations.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 0b52708172..e51bc3c876 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -2,6 +2,7 @@ package migrations import ( "errors" + "github.com/go-xorm/xorm" ) @@ -9,7 +10,7 @@ type migration func(*xorm.Engine) error // The version table. Should have only one row with id==1 type Version struct { - Id int64 `xorm:"pk"` + Id int64 Version int64 } @@ -25,9 +26,10 @@ func Migrate(x *xorm.Engine) error { has, err := x.Get(currentVersion) if err != nil { return err - } - if !has { - _, err = x.InsertOne(currentVersion) + } else if !has { + if _, err = x.InsertOne(currentVersion); err != nil { + return err + } } v := currentVersion.Version