From 6926deae8ddbcc03d42ade4ae73f7b0fc745b27c Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 11:21:55 +0200 Subject: [PATCH] [v11.2.x] Migration: Remove table aliasing in delete statement to make it work for mariadb (#95231) Migration: Remove table aliasing in delete statement to make it work for mariadb (#95226) Migration: remove table aliasing in delete statement to make it work in mariadb (cherry picked from commit 6f7528f896aedcc05a33b059168bbad2bb6659f2) Co-authored-by: Karl Persson --- pkg/services/sqlstore/migrations/accesscontrol/orphaned.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/sqlstore/migrations/accesscontrol/orphaned.go b/pkg/services/sqlstore/migrations/accesscontrol/orphaned.go index e96f966c862..ae02cf3a18b 100644 --- a/pkg/services/sqlstore/migrations/accesscontrol/orphaned.go +++ b/pkg/services/sqlstore/migrations/accesscontrol/orphaned.go @@ -86,7 +86,7 @@ func (m *orphanedServiceAccountPermissions) exec(sess *xorm.Session, mg *migrato } // delete all orphaned permissions - rawDelete := "DELETE FROM permission AS p WHERE p.kind = 'serviceaccounts' AND p.identifier IN(?" + strings.Repeat(",?", len(orphaned)-1) + ")" + rawDelete := "DELETE FROM permission WHERE kind = 'serviceaccounts' AND identifier IN(?" + strings.Repeat(",?", len(orphaned)-1) + ")" deleteArgs := make([]any, 0, len(orphaned)+1) deleteArgs = append(deleteArgs, rawDelete) for _, id := range orphaned {