IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Nested folders: Enable folder migration (#61936)

Browse Source
This commit is contained in:
Sofia Papagiannaki 2023-01-30 12:17:40 +02:00 committed by GitHub
parent 7eb01b1813
commit a502a2d1f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/services/sqlstore/migrations/folder_mig.go
View File

@ -4,7 +4,6 @@ import (
"github.com/grafana/grafana/pkg/services/sqlstore/migrator" "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
) )
// nolint:unused // this is temporarily unused during feature development
func addFolderMigrations(mg *migrator.Migrator) { func addFolderMigrations(mg *migrator.Migrator) {
mg.AddMigration("create folder table", migrator.NewAddTableMigration(folderv1())) 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 { func folderv1() migrator.Table {
// Do not make any changes to this schema; introduce new migrations for further changes
return migrator.Table{ return migrator.Table{
Name: "folder", Name: "folder",
Columns: []*migrator.Column{ Columns: []*migrator.Column{

7
pkg/services/sqlstore/migrations/migrations.go
View File

@ -107,12 +107,7 @@ func (*OSSMigrations) AddMigration(mg *Migrator) {
AddExternalAlertmanagerToDatasourceMigration(mg) AddExternalAlertmanagerToDatasourceMigration(mg)
// TODO: This migration will be enabled later in the nested folder feature addFolderMigrations(mg)
// 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)
} }
func addMigrationLogMigrations(mg *Migrator) { func addMigrationLogMigrations(mg *Migrator) {