From: Peter Smit <peter@smitmail.eu>
Date: Thu, 22 Jan 2015 12:56:50 +0000 (+0200)
Subject: Clean up migrations code
X-Git-Tag: v0.9.99~1530^2^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2a70d6b7235a124027ebc446d8559b4596cb6dcd;p=gitea.git

Clean up migrations code
---

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