From a502a2d1f85e757c638c2e5d4de20495e22e8102 Mon Sep 17 00:00:00 2001
From: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
Date: Mon, 30 Jan 2023 12:17:40 +0200
Subject: [PATCH] Nested folders: Enable folder migration (#61936)

---
 pkg/services/sqlstore/migrations/folder_mig.go | 3 +--
 pkg/services/sqlstore/migrations/migrations.go | 7 +------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkg/services/sqlstore/migrations/folder_mig.go b/pkg/services/sqlstore/migrations/folder_mig.go
index 4ef08d198e8..faf74c64ed0 100644
--- a/pkg/services/sqlstore/migrations/folder_mig.go
+++ b/pkg/services/sqlstore/migrations/folder_mig.go
@@ -4,7 +4,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 )
 
-// nolint:unused // this is temporarily unused during feature development
 func addFolderMigrations(mg *migrator.Migrator) {
 	mg.AddMigration("create folder table", migrator.NewAddTableMigration(folderv1()))
 
@@ -23,8 +22,8 @@ func addFolderMigrations(mg *migrator.Migrator) {
 	}))
 }
 
-// nolint:unused // this is temporarily unused during feature development
 func folderv1() migrator.Table {
+	// Do not make any changes to this schema; introduce new migrations for further changes
 	return migrator.Table{
 		Name: "folder",
 		Columns: []*migrator.Column{
diff --git a/pkg/services/sqlstore/migrations/migrations.go b/pkg/services/sqlstore/migrations/migrations.go
index 30b08f96067..6084dacba03 100644
--- a/pkg/services/sqlstore/migrations/migrations.go
+++ b/pkg/services/sqlstore/migrations/migrations.go
@@ -107,12 +107,7 @@ func (*OSSMigrations) AddMigration(mg *Migrator) {
 
 	AddExternalAlertmanagerToDatasourceMigration(mg)
 
-	// TODO: This migration will be enabled later in the nested folder feature
-	// implementation process. It is on hold so we can continue working on the
-	// store implementation without impacting any grafana instances built off
-	// main.
-	//
-	// addFolderMigrations(mg)
+	addFolderMigrations(mg)
 }
 
 func addMigrationLogMigrations(mg *Migrator) {