diff --git a/pkg/services/sqlstore/migrations/accesscontrol/permission_migrator.go b/pkg/services/sqlstore/migrations/accesscontrol/permission_migrator.go index 992cf45867d..7f17ecc13cd 100644 --- a/pkg/services/sqlstore/migrations/accesscontrol/permission_migrator.go +++ b/pkg/services/sqlstore/migrations/accesscontrol/permission_migrator.go @@ -49,7 +49,7 @@ func (m *permissionMigrator) bulkCreateRoles(allRoles []*accesscontrol.Role) ([] // bulk role creations err := batch(len(allRoles), batchSize, func(start, end int) error { roles := allRoles[start:end] - createdRoles, err := createRoles(roles, start, end) + createdRoles, err := createRoles(roles) if err != nil { return err } @@ -128,7 +128,7 @@ func (m *permissionMigrator) bulkAssignRoles(allRoles []*accesscontrol.Role) err } // createRoles creates a list of roles and returns their id, orgID, name in a single query -func (m *permissionMigrator) createRoles(roles []*accesscontrol.Role, start int, end int) ([]*accesscontrol.Role, error) { +func (m *permissionMigrator) createRoles(roles []*accesscontrol.Role) ([]*accesscontrol.Role, error) { ts := time.Now() createdRoles := make([]*accesscontrol.Role, 0, len(roles)) valueStrings := make([]string, len(roles)) @@ -155,7 +155,7 @@ func (m *permissionMigrator) createRoles(roles []*accesscontrol.Role, start int, } // createRolesMySQL creates a list of roles then fetches them -func (m *permissionMigrator) createRolesMySQL(roles []*accesscontrol.Role, start int, end int) ([]*accesscontrol.Role, error) { +func (m *permissionMigrator) createRolesMySQL(roles []*accesscontrol.Role) ([]*accesscontrol.Role, error) { ts := time.Now() createdRoles := make([]*accesscontrol.Role, 0, len(roles)) diff --git a/pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go b/pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go index 715161380d5..19f63024ff0 100644 --- a/pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go +++ b/pkg/services/sqlstore/migrations/accesscontrol/test/ac_test.go @@ -203,18 +203,12 @@ func setupTestDB(t *testing.T) *xorm.Engine { t.Helper() testDB := sqlutil.SQLite3TestDB() - const query = `select count(*) as count from migration_log` - result := struct{ Count int }{} - x, err := xorm.NewEngine(testDB.DriverName, testDB.ConnStr) require.NoError(t, err) err = migrator.NewDialect(x).CleanDB() require.NoError(t, err) - _, err = x.SQL(query).Get(&result) - require.Error(t, err) - mg := migrator.NewMigrator(x, &setting.Cfg{ IsFeatureToggleEnabled: func(key string) bool { return key == "accesscontrol" }, })