DB IDO: Drop invalid schema changes from 1.x IDOUtils in #6060

diff --git a/lib/db_ido_mysql/schema/upgrade/2.2.0.sql b/lib/db_ido_mysql/schema/upgrade/2.2.0.sql
index dd77f77f2656ce1e9cee9a6a58470b723255aa50..05e6a8545f705064bfd714296d7948b0c7dcdc99 100644 (file)
--- a/lib/db_ido_mysql/schema/upgrade/2.2.0.sql
+++ b/lib/db_ido_mysql/schema/upgrade/2.2.0.sql
@@ -12,6 +12,13 @@ ALTER TABLE `icinga_programstatus` ADD COLUMN `program_version` varchar(64) char
 ALTER TABLE icinga_contacts MODIFY alias TEXT character set latin1  default '';
 ALTER TABLE icinga_hosts MODIFY alias TEXT character set latin1  default '';
 
+ALTER TABLE icinga_hostgroups DROP COLUMN action_url;
+ALTER TABLE icinga_hostgroups DROP COLUMN notes_url;
+ALTER TABLE icinga_hostgroups DROP COLUMN notes;
+ALTER TABLE icinga_servicegroups DROP COLUMN action_url;
+ALTER TABLE icinga_servicegroups DROP COLUMN notes_url;
+ALTER TABLE icinga_servicegroups DROP COLUMN notes;
+
 -- -----------------------------------------
 -- update dbversion
 -- -----------------------------------------

diff --git a/lib/db_ido_pgsql/schema/upgrade/2.2.0.sql b/lib/db_ido_pgsql/schema/upgrade/2.2.0.sql
index f27bc5bcf7115ab5ba7bd8227e7678b3840abe16..737513e4c206ef0019d70e2cb0e6a8942c0f4c4c 100644 (file)
--- a/lib/db_ido_pgsql/schema/upgrade/2.2.0.sql
+++ b/lib/db_ido_pgsql/schema/upgrade/2.2.0.sql
@@ -9,6 +9,13 @@
 
 ALTER TABLE icinga_programstatus ADD COLUMN program_version TEXT default NULL;
 
+ALTER TABLE icinga_hostgroups DROP COLUMN action_url;
+ALTER TABLE icinga_hostgroups DROP COLUMN notes_url;
+ALTER TABLE icinga_hostgroups DROP COLUMN notes;
+ALTER TABLE icinga_servicegroups DROP COLUMN action_url;
+ALTER TABLE icinga_servicegroups DROP COLUMN notes_url;
+ALTER TABLE icinga_servicegroups DROP COLUMN notes;
+
 -- -----------------------------------------
 -- update dbversion
 -- -----------------------------------------