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

LibraryElements: Delete invalid connections before deleting element (#50519)

Browse Source
This commit is contained in:
kay delaney 2022-06-29 13:56:40 +01:00 committed by GitHub
parent 7ef21662f9
commit 189b7f9c0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/services/libraryelements/database.go
View File

@ -27,6 +27,8 @@ SELECT DISTINCT
, (SELECT COUNT(connection_id) FROM ` + models.LibraryElementConnectionTableName + ` WHERE element_id = le.id AND kind=1) AS connected_dashboards` , (SELECT COUNT(connection_id) FROM ` + models.LibraryElementConnectionTableName + ` WHERE element_id = le.id AND kind=1) AS connected_dashboards`
) )
const deleteInvalidConnections = "DELETE FROM library_element_connection WHERE connection_id IN (SELECT connection_id as id FROM library_element_connection WHERE element_id=? EXCEPT SELECT id from dashboard)"
func getFromLibraryElementDTOWithMeta(dialect migrator.Dialect) string { func getFromLibraryElementDTOWithMeta(dialect migrator.Dialect) string {
user := dialect.Quote("user") user := dialect.Quote("user")
userJoin := ` userJoin := `
@ -179,6 +181,12 @@ func (l *LibraryElementService) deleteLibraryElement(c context.Context, signedIn
if err := l.requireEditPermissionsOnFolder(c, signedInUser, element.FolderID); err != nil { if err := l.requireEditPermissionsOnFolder(c, signedInUser, element.FolderID); err != nil {
return err return err
} }
// Delete any hanging/invalid connections
if _, err = session.Exec(deleteInvalidConnections, element.ID); err != nil {
return err
}
var connectionIDs []struct { var connectionIDs []struct {
ConnectionID int64 `xorm:"connection_id"` ConnectionID int64 `xorm:"connection_id"`
} }