From ae101bf935f13fb39464f9cee753977a51ae4b49 Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
Date: Wed, 3 Aug 2022 18:41:18 +0300
Subject: [PATCH] Alerting: Fix migration (#53253)

---
 pkg/services/sqlstore/migrations/ualert/permissions.go | 2 ++
 pkg/services/sqlstore/migrations/ualert/ualert.go      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/services/sqlstore/migrations/ualert/permissions.go b/pkg/services/sqlstore/migrations/ualert/permissions.go
index 2a74694657c..ad12c35bdd2 100644
--- a/pkg/services/sqlstore/migrations/ualert/permissions.go
+++ b/pkg/services/sqlstore/migrations/ualert/permissions.go
@@ -45,6 +45,8 @@ type dashboardACL struct {
 	Updated time.Time
 }
 
+func (p dashboardACL) TableName() string { return "dashboard_acl" }
+
 type folderHelper struct {
 	sess *xorm.Session
 	mg   *migrator.Migrator
diff --git a/pkg/services/sqlstore/migrations/ualert/ualert.go b/pkg/services/sqlstore/migrations/ualert/ualert.go
index 348e8035587..ca98d5ad292 100644
--- a/pkg/services/sqlstore/migrations/ualert/ualert.go
+++ b/pkg/services/sqlstore/migrations/ualert/ualert.go
@@ -315,7 +315,7 @@ func (m *migration) Exec(sess *xorm.Session, mg *migrator.Migrator) error {
 				err = folderHelper.setACL(f.OrgId, f.Id, permissions)
 				if err != nil {
 					return MigrationError{
-						Err:     fmt.Errorf("failed to set folder %d under organisation %d permissions: %w", folder.Id, folder.OrgId, err),
+						Err:     fmt.Errorf("failed to set folder %d under organisation %d permissions: %w", f.Id, f.OrgId, err),
 						AlertId: da.Id,
 					}
 				}