fix(be): migration 2.8.26 for postgres

db/Migration.go

@@ -52,6 +52,7 @@ func GetMigrations() []Migration {
 		{Version: "2.8.25"},
 		{Version: "2.8.26"},
 		{Version: "2.8.36"},
+		{Version: "2.8.38"},
 	}
 }
 

db/bolt/migrations/v2.8.26.go → db/bolt/Migration_2_8_28.go

@@ -1,4 +1,4 @@
-package migrations
+package bolt
 
 import (
 	"encoding/json"

db/bolt/Migration_2_8_28_test.go

@@ -2,7 +2,6 @@ package bolt
 
 import (
 	"encoding/json"
-	"github.com/ansible-semaphore/semaphore/db/bolt/migrations"
 	"go.etcd.io/bbolt"
 	"testing"
 )
@@ -36,7 +35,7 @@ func TestMigration_2_8_28_Apply(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	err = migrations.Migration_2_8_28{DB: store.db}.Apply()
+	err = Migration_2_8_28{DB: store.db}.Apply()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -78,7 +77,7 @@ func TestMigration_2_8_28_Apply2(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	err = migrations.Migration_2_8_28{DB: store.db}.Apply()
+	err = Migration_2_8_28{DB: store.db}.Apply()
 	if err != nil {
 		t.Fatal(err)
 	}

db/bolt/migration.go

@@ -3,7 +3,6 @@ package bolt
 import (
 	"encoding/json"
 	"github.com/ansible-semaphore/semaphore/db"
-	"github.com/ansible-semaphore/semaphore/db/bolt/migrations"
 	"go.etcd.io/bbolt"
 )
 
@@ -37,7 +36,7 @@ func (d *BoltDb) IsMigrationApplied(migration db.Migration) (bool, error) {
 func (d *BoltDb) ApplyMigration(migration db.Migration) (err error) {
 	switch migration.Version {
 	case "2.8.26":
-		err = migrations.Migration_2_8_28{DB: d.db}.Apply()
+		err = Migration_2_8_28{DB: d.db}.Apply()
 	}
 
 	if err != nil {

db/sql/Migration_2_8_28.go

@@ -0,0 +1,53 @@
+package sql
+
+import (
+	"github.com/go-gorp/gorp/v3"
+	"strings"
+)
+
+type Migration_2_8_26 struct {
+	DB *SqlDb
+}
+
+func (m Migration_2_8_26) Apply(tx *gorp.Transaction) error {
+	rows, err := tx.Query(m.DB.PrepareQuery("SELECT id, git_url FROM project__repository"))
+	if err != nil {
+		return err
+	}
+
+	repoUrls := make(map[string]string)
+
+	for rows.Next() {
+		var id, url string
+
+		err3 := rows.Scan(&id, &url)
+		if err3 != nil {
+			continue
+		}
+
+		repoUrls[id] = url
+	}
+
+	err = rows.Close()
+	if err != nil {
+		return err
+	}
+
+	for id, url := range repoUrls {
+		branch := "master"
+		parts := strings.Split(url, "#")
+		if len(parts) > 1 {
+			url, branch = parts[0], parts[1]
+		}
+		q := m.DB.PrepareQuery("UPDATE project__repository " +
+			"SET git_url = ?, git_branch = ? " +
+			"WHERE id = ?")
+		_, err = tx.Exec(q, url, branch, id)
+
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

db/sql/SqlDb.go

@@ -91,7 +91,7 @@ func (d *SqlDb) prepareQueryWithDialect(query string, dialect gorp.Dialect) stri
 	return query
 }
 
-func (d *SqlDb) prepareQuery(query string) string {
+func (d *SqlDb) PrepareQuery(query string) string {
 	return d.prepareQueryWithDialect(query, d.sql.Dialect)
 }
 
@@ -102,7 +102,7 @@ func (d *SqlDb) insert(primaryKeyColumnName string, query string, args ...interf
 	case gorp.PostgresDialect:
 		query += " returning " + primaryKeyColumnName
 
-		err := d.sql.QueryRow(d.prepareQuery(query), args...).Scan(&insertId)
+		err := d.sql.QueryRow(d.PrepareQuery(query), args...).Scan(&insertId)
 
 		if err != nil {
 			return 0, err
@@ -125,16 +125,16 @@ func (d *SqlDb) insert(primaryKeyColumnName string, query string, args ...interf
 }
 
 func (d *SqlDb) exec(query string, args ...interface{}) (sql.Result, error) {
-	q := d.prepareQuery(query)
+	q := d.PrepareQuery(query)
 	return d.sql.Exec(q, args...)
 }
 
 func (d *SqlDb) selectOne(holder interface{}, query string, args ...interface{}) error {
-	return d.sql.SelectOne(holder, d.prepareQuery(query), args...)
+	return d.sql.SelectOne(holder, d.PrepareQuery(query), args...)
 }
 
 func (d *SqlDb) selectAll(i interface{}, query string, args ...interface{}) ([]interface{}, error) {
-	q := d.prepareQuery(query)
+	q := d.PrepareQuery(query)
 	return d.sql.Select(i, q, args...)
 }
 
@@ -343,6 +343,6 @@ func (d *SqlDb) Sql() *gorp.DbMap {
 }
 
 func (d *SqlDb) IsInitialized() (bool, error) {
-	_, err := d.sql.SelectInt(d.prepareQuery("select count(1) from migrations"))
+	_, err := d.sql.SelectInt(d.PrepareQuery("select count(1) from migrations"))
 	return err == nil, nil
 }

db/sql/migration.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	log "github.com/Sirupsen/logrus"
 	"github.com/ansible-semaphore/semaphore/db"
-	"github.com/ansible-semaphore/semaphore/db/sql/migrations"
 	"github.com/go-gorp/gorp/v3"
 	"regexp"
 	"strings"
@@ -73,7 +72,7 @@ func (d *SqlDb) IsMigrationApplied(migration db.Migration) (bool, error) {
 	}
 
 	exists, err := d.sql.SelectInt(
-		d.prepareQuery("select count(1) as ex from migrations where version = ?"),
+		d.PrepareQuery("select count(1) as ex from migrations where version = ?"),
 		migration.Version)
 
 	if err != nil {
@@ -123,15 +122,15 @@ func (d *SqlDb) ApplyMigration(migration db.Migration) error {
 		}
 	}
 
-	_, err = tx.Exec(d.prepareQuery("insert into migrations(version, upgraded_date) values (?, ?)"), migration.Version, time.Now())
+	_, err = tx.Exec(d.PrepareQuery("insert into migrations(version, upgraded_date) values (?, ?)"), migration.Version, time.Now())
 	if err != nil {
 		handleRollbackError(tx.Rollback())
 		return err
 	}
 
 	switch migration.Version {
 	case "2.8.26":
-		err = migrations.Migration_2_8_26{Sql: d.sql}.Apply()
+		err = Migration_2_8_26{DB: d}.Apply(tx)
 	}
 
 	if err != nil {

db/sql/migrations/v2.8.38.sql

@@ -0,0 +1,39 @@
+delete
+from project__schedule
+where template_id is null;
+
+delete
+from project__schedule
+where (select count(*) from project__template where project__template.id = project__schedule.template_id) = 0;
+
+delete
+from project__schedule
+where (select count(*) from project where project.id = project__schedule.project_id) = 0;
+
+update project__schedule
+set repository_id = null
+where repository_id is not null
+  and (select count(*) from project__repository where project__repository.id = project__schedule.repository_id) = 0;
+
+alter table `project__schedule`
+    rename to `project__schedule_backup_8436583`;
+
+create table project__schedule
+(
+    id               integer primary key autoincrement,
+    template_id      int          not null,
+    project_id       int          not null,
+    cron_format      varchar(255) not null,
+    repository_id    int          null,
+    last_commit_hash varchar(40)  null,
+
+    foreign key (`template_id`) references project__template(`id`) on delete cascade,
+    foreign key (`project_id`) references project(`id`) on delete cascade,
+    foreign key (`repository_id`) references project__repository(`id`)
+);
+
+insert into project__schedule
+select *
+from project__schedule_backup_8436583;
+
+drop table project__schedule_backup_8436583;

db/sql/project.go

@@ -72,7 +72,7 @@ func (d *SqlDb) DeleteProject(projectID int) error {
 	}
 
 	for _, statement := range statements {
-		_, err = tx.Exec(d.prepareQuery(statement), projectID)
+		_, err = tx.Exec(d.PrepareQuery(statement), projectID)
 
 		if err != nil {
 			err = tx.Rollback()

db/sql/session.go

@@ -18,7 +18,7 @@ func (d *SqlDb) CreateAPIToken(token db.APIToken) (db.APIToken, error) {
 }
 
 func (d *SqlDb) GetAPIToken(tokenID string) (token db.APIToken, err error) {
-	err = d.selectOne(&token, d.prepareQuery("select * from user__token where id=? and expired=false"), tokenID)
+	err = d.selectOne(&token, d.PrepareQuery("select * from user__token where id=? and expired=false"), tokenID)
 
 	if err == sql.ErrNoRows {
 		err = db.ErrNotFound
@@ -56,12 +56,11 @@ func (d *SqlDb) TouchSession(userID int, sessionID int) error {
 }
 
 func (d *SqlDb) GetAPITokens(userID int) (tokens []db.APIToken, err error) {
-	_, err = d.selectAll(&tokens, d.prepareQuery("select * from user__token where user_id=?"), userID)
+	_, err = d.selectAll(&tokens, d.PrepareQuery("select * from user__token where user_id=?"), userID)
 
 	if err == sql.ErrNoRows {
 		err = db.ErrNotFound
 	}
 
 	return
 }
-

db/sql/user.go

@@ -206,7 +206,7 @@ func (d *SqlDb) GetUsers(params db.RetrieveQueryParams) (users []db.User, err er
 func (d *SqlDb) GetUserByLoginOrEmail(login string, email string) (existingUser db.User, err error) {
 	err = d.selectOne(
 		&existingUser,
-		d.prepareQuery("select * from `user` where email=? or username=?"),
+		d.PrepareQuery("select * from `user` where email=? or username=?"),
 		email, login)
 
 	if err == sql.ErrNoRows {