public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: Bump golangci-lint to 2.0.2 (#103572)

Browse Source
This commit is contained in:
Mariell Hoversholm
2025-04-10 14:42:23 +02:00
committed by GitHub
parent b58b6e828e
commit 757be6365a
291 changed files with 1948 additions and 1835 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/migrations/accesscontrol/seed_assignment.go
+3 -2
View File
@@ -63,10 +63,11 @@ func (m *seedAssignmentPrimaryKeyMigrator) SQL(dialect migrator.Dialect) string
func (m *seedAssignmentPrimaryKeyMigrator) Exec(sess *xorm.Session, mig *migrator.Migrator) error {
driver := mig.Dialect.DriverName()
if driver == migrator.MySQL {
switch driver {
case migrator.MySQL:
_, err := sess.Exec("ALTER TABLE seed_assignment ADD id INT NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (id)")
return err
} else if driver == migrator.Postgres {
case migrator.Postgres:
_, err := sess.Exec("ALTER TABLE seed_assignment ADD COLUMN id SERIAL PRIMARY KEY")
return err
}
pkg/services/sqlstore/migrations/dashboard_mig.go
+3 -2
View File
@@ -289,14 +289,15 @@ func RunDashboardTagMigrations(sess *xorm.Session, driverName string) error {
WHERE
(dashboard_uid IS NULL OR org_id IS NULL)
AND EXISTS (SELECT 1 FROM dashboard WHERE dashboard.id = dashboard_tag.dashboard_id);`
if driverName == Postgres {
switch driverName {
case Postgres:
sql = `UPDATE dashboard_tag
SET dashboard_uid = dashboard.uid,
org_id = dashboard.org_id
FROM dashboard
WHERE dashboard_tag.dashboard_id = dashboard.id
AND (dashboard_tag.dashboard_uid IS NULL OR dashboard_tag.org_id IS NULL);`
} else if driverName == MySQL {
case MySQL:
sql = `UPDATE dashboard_tag
LEFT JOIN dashboard ON dashboard_tag.dashboard_id = dashboard.id
SET dashboard_tag.dashboard_uid = dashboard.uid,
pkg/services/sqlstore/migrations/star_mig.go
+4 -3
View File
@@ -66,7 +66,8 @@ func RunStarMigrations(sess *xorm.Session, driverName string) error {
WHERE
(dashboard_uid IS NULL OR org_id IS NULL)
AND EXISTS (SELECT 1 FROM dashboard WHERE dashboard.id = star.dashboard_id);`
if driverName == Postgres {
switch driverName {
case Postgres:
sql = `UPDATE star
SET dashboard_uid = dashboard.uid,
org_id = dashboard.org_id,
@@ -74,14 +75,14 @@ func RunStarMigrations(sess *xorm.Session, driverName string) error {
FROM dashboard
WHERE star.dashboard_id = dashboard.id
AND (star.dashboard_uid IS NULL OR star.org_id IS NULL);`
} else if driverName == MySQL {
case MySQL:
sql = `UPDATE star
LEFT JOIN dashboard ON star.dashboard_id = dashboard.id
SET star.dashboard_uid = dashboard.uid,
star.org_id = dashboard.org_id,
star.updated = NOW()
WHERE star.dashboard_uid IS NULL OR star.org_id IS NULL;`
} else if driverName == Spanner {
case Spanner:
sql = `UPDATE star
SET
dashboard_uid = (SELECT uid FROM dashboard WHERE dashboard.id = star.dashboard_id),