From 2364299a8c61e9ea2b18d010a194458c4c285415 Mon Sep 17 00:00:00 2001 From: Matthew Jacobson Date: Mon, 18 Nov 2024 15:51:45 -0500 Subject: [PATCH] Alerting: Fix annotation state migration to retain nullability on MySQL (#96640) --- pkg/services/sqlstore/migrations/annotation_mig.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/services/sqlstore/migrations/annotation_mig.go b/pkg/services/sqlstore/migrations/annotation_mig.go index c11ab34dd13..3e2a18787c9 100644 --- a/pkg/services/sqlstore/migrations/annotation_mig.go +++ b/pkg/services/sqlstore/migrations/annotation_mig.go @@ -184,13 +184,13 @@ func addAnnotationMig(mg *Migrator) { Postgres("ALTER TABLE annotation ALTER COLUMN tags TYPE VARCHAR(4096);"). Mysql("ALTER TABLE annotation MODIFY tags VARCHAR(4096);")) - mg.AddMigration("Increase prev_state column to length 40", NewRawSQLMigration(""). - Postgres("ALTER TABLE annotation ALTER COLUMN prev_state TYPE VARCHAR(40);"). - Mysql("ALTER TABLE annotation MODIFY prev_state VARCHAR(40);")) + mg.AddMigration("Increase prev_state column to length 40 not null", NewRawSQLMigration(""). + Postgres("ALTER TABLE annotation ALTER COLUMN prev_state TYPE VARCHAR(40);"). // Does not modify nullability. + Mysql("ALTER TABLE annotation MODIFY prev_state VARCHAR(40) NOT NULL;")) - mg.AddMigration("Increase new_state column to length 40", NewRawSQLMigration(""). - Postgres("ALTER TABLE annotation ALTER COLUMN new_state TYPE VARCHAR(40);"). - Mysql("ALTER TABLE annotation MODIFY new_state VARCHAR(40);")) + mg.AddMigration("Increase new_state column to length 40 not null", NewRawSQLMigration(""). + Postgres("ALTER TABLE annotation ALTER COLUMN new_state TYPE VARCHAR(40);"). // Does not modify nullability. + Mysql("ALTER TABLE annotation MODIFY new_state VARCHAR(40) NOT NULL;")) } type AddMakeRegionSingleRowMigration struct {