From dd0a2ab59085cfc0d9733d438dd40caed49e5bee Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Sun, 26 Oct 2014 19:57:16 +0100 Subject: [PATCH] DB IDO: Drop invalid schema changes from 1.x IDOUtils in #6060 --- lib/db_ido_mysql/schema/upgrade/2.2.0.sql | 7 +++++++ lib/db_ido_pgsql/schema/upgrade/2.2.0.sql | 7 +++++++ 2 files changed, 14 insertions(+) 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 dd77f77f2..05e6a8545 100644 --- 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 f27bc5bcf..737513e4c 100644 --- 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 -- -----------------------------------------