Merge pull request #1 from geigi/fix-db-migration

Fix migration of the postgres DB
sipgate · Jul 15, 2021 · a6d0d57 · a6d0d57
2 parents 7b0bbdb + 56aa413
commit a6d0d57
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/migrations/1_initial.go b/migrations/1_initial.go
@@ -9,11 +9,11 @@ type user struct {
 	ID              int
 	Username        string            `sql:"username,notnull,unique"`
 	Token           string            `sql:"token"`
-	ExtraProperties map[string]string `sql:"extraProperties,hstore"`
+	ExtraProperties map[string]string `sql:"extraProperties" pg:"hstore"`
 }
 
 func init() {
-	migrations.Register(func(db migrations.DB) error {
+	migrations.RegisterTx(func(db migrations.DB) error {
 		err := orm.CreateTable(db, &user{}, &orm.CreateTableOptions{
 			Temp:        false,
 			IfNotExists: true,

diff --git a/migrations/2_user_lastquery.go b/migrations/2_user_lastquery.go
@@ -5,7 +5,7 @@ import (
 )
 
 func init() {
-	migrations.Register(func(db migrations.DB) error {
+	migrations.RegisterTx(func(db migrations.DB) error {
 		_, err := db.Exec(`ALTER TABLE users ADD lastquery timestamptz`)
 		return err
 	}, func(db migrations.DB) error {

diff --git a/migrations/migrate.go b/migrations/migrate.go
@@ -10,10 +10,7 @@ import (
 func EnsureCurrentSchema(db *pg.DB) error {
 	var oldVersion, newVersion int64
 
-	err := db.RunInTransaction(func(tx *pg.Tx) (err error) {
-		oldVersion, newVersion, err = migrations.Run(tx, "")
-		return
-	})
+	oldVersion, newVersion, err := migrations.Run(db, "up")
 	if err != nil {
 		return err
 	}