ido/mysql: Fix IDO upgrade compliance against MySQL 5.7

refs #4950

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 50d44aa72978ca003a7b572df8cc9dff797d810c..155264f412003f8f2b5986dcd7544c8340e5e34a 100644 (file)
--- a/lib/db_ido_mysql/schema/upgrade/2.2.0.sql
+++ b/lib/db_ido_mysql/schema/upgrade/2.2.0.sql
@@ -9,8 +9,8 @@
 
 ALTER TABLE `icinga_programstatus` ADD COLUMN `program_version` varchar(64) character set latin1 collate latin1_general_cs default NULL;
 
-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_contacts MODIFY alias TEXT character set latin1;
+ALTER TABLE icinga_hosts MODIFY alias TEXT character set latin1;
 
 ALTER TABLE icinga_customvariables ADD COLUMN is_json smallint default 0;
 ALTER TABLE icinga_customvariablestatus ADD COLUMN is_json smallint default 0;

diff --git a/lib/db_ido_mysql/schema/upgrade/2.4.0.sql b/lib/db_ido_mysql/schema/upgrade/2.4.0.sql
index 315fdc6de705a77b9085a48830c2808533d0a3e1..2a540e5fb7224cd84ba39a8e0fc9fd6e17bb9140 100644 (file)
--- a/lib/db_ido_mysql/schema/upgrade/2.4.0.sql
+++ b/lib/db_ido_mysql/schema/upgrade/2.4.0.sql
@@ -28,7 +28,7 @@ CREATE TABLE IF NOT EXISTS icinga_zonestatus (
   zonestatus_id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
   instance_id bigint unsigned default 0,
   zone_object_id bigint(20) unsigned DEFAULT '0',
-  status_update_time timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  status_update_time timestamp NOT NULL,
   parent_zone_object_id bigint(20) unsigned DEFAULT '0',
   PRIMARY KEY  (zonestatus_id)
 ) ENGINE=InnoDB COMMENT='Zone status';

diff --git a/lib/db_ido_mysql/schema/upgrade/2.6.0.sql b/lib/db_ido_mysql/schema/upgrade/2.6.0.sql
index 6e0eda814a939365c957d41c5f0e4a714213f827..cb117b2c8f76cf096dd04d91502b47ce6177c986 100644 (file)
--- a/lib/db_ido_mysql/schema/upgrade/2.6.0.sql
+++ b/lib/db_ido_mysql/schema/upgrade/2.6.0.sql
@@ -12,137 +12,137 @@
 -- -----------------------------------------
 
 ALTER TABLE icinga_acknowledgements
-  MODIFY COLUMN entry_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN end_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN entry_time timestamp NULL,
+  MODIFY COLUMN end_time timestamp NULL;
 
 ALTER TABLE icinga_commenthistory
-  MODIFY COLUMN entry_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN comment_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN expiration_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN deletion_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN entry_time timestamp NULL,
+  MODIFY COLUMN comment_time timestamp NULL,
+  MODIFY COLUMN expiration_time timestamp NULL,
+  MODIFY COLUMN deletion_time timestamp NULL;
 
 ALTER TABLE icinga_comments
-  MODIFY COLUMN entry_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN comment_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN expiration_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN entry_time timestamp NULL,
+  MODIFY COLUMN comment_time timestamp NULL,
+  MODIFY COLUMN expiration_time timestamp NULL;
 
 ALTER TABLE icinga_conninfo
-  MODIFY COLUMN connect_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN disconnect_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_checkin_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN data_start_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN data_end_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN connect_time timestamp NULL,
+  MODIFY COLUMN disconnect_time timestamp NULL,
+  MODIFY COLUMN last_checkin_time timestamp NULL,
+  MODIFY COLUMN data_start_time timestamp NULL,
+  MODIFY COLUMN data_end_time timestamp NULL;
 
 ALTER TABLE icinga_contactnotificationmethods
-  MODIFY COLUMN start_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN end_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN start_time timestamp NULL,
+  MODIFY COLUMN end_time timestamp NULL;
 
 ALTER TABLE icinga_contactnotifications
-  MODIFY COLUMN start_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN end_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN start_time timestamp NULL,
+  MODIFY COLUMN end_time timestamp NULL;
 
 ALTER TABLE icinga_contactstatus
-  MODIFY COLUMN status_update_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_host_notification timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_service_notification timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN status_update_time timestamp NULL,
+  MODIFY COLUMN last_host_notification timestamp NULL,
+  MODIFY COLUMN last_service_notification timestamp NULL;
 
 ALTER TABLE icinga_customvariablestatus
-  MODIFY COLUMN status_update_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN status_update_time timestamp NULL;
 
 ALTER TABLE icinga_dbversion
-  MODIFY COLUMN create_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN modify_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN create_time timestamp NULL,
+  MODIFY COLUMN modify_time timestamp NULL;
 
 ALTER TABLE icinga_downtimehistory
-  MODIFY COLUMN entry_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN scheduled_start_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN scheduled_end_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN actual_start_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN actual_end_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN trigger_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN entry_time timestamp NULL,
+  MODIFY COLUMN scheduled_start_time timestamp NULL,
+  MODIFY COLUMN scheduled_end_time timestamp NULL,
+  MODIFY COLUMN actual_start_time timestamp NULL,
+  MODIFY COLUMN actual_end_time timestamp NULL,
+  MODIFY COLUMN trigger_time timestamp NULL;
 
 ALTER TABLE icinga_eventhandlers
-  MODIFY COLUMN start_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN end_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN start_time timestamp NULL,
+  MODIFY COLUMN end_time timestamp NULL;
 
 ALTER TABLE icinga_externalcommands
-  MODIFY COLUMN entry_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN entry_time timestamp NULL;
 
 ALTER TABLE icinga_flappinghistory
-  MODIFY COLUMN event_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN comment_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN event_time timestamp NULL,
+  MODIFY COLUMN comment_time timestamp NULL;
 
 ALTER TABLE icinga_hostchecks
-  MODIFY COLUMN start_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN end_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN start_time timestamp NULL,
+  MODIFY COLUMN end_time timestamp NULL;
 
 ALTER TABLE icinga_hoststatus
-  MODIFY COLUMN status_update_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_check timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN next_check timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_state_change timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_hard_state_change timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_time_up timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_time_down timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_time_unreachable timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_notification timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN next_notification timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN status_update_time timestamp NULL,
+  MODIFY COLUMN last_check timestamp NULL,
+  MODIFY COLUMN next_check timestamp NULL,
+  MODIFY COLUMN last_state_change timestamp NULL,
+  MODIFY COLUMN last_hard_state_change timestamp NULL,
+  MODIFY COLUMN last_time_up timestamp NULL,
+  MODIFY COLUMN last_time_down timestamp NULL,
+  MODIFY COLUMN last_time_unreachable timestamp NULL,
+  MODIFY COLUMN last_notification timestamp NULL,
+  MODIFY COLUMN next_notification timestamp NULL;
 
 ALTER TABLE icinga_logentries
-  MODIFY COLUMN logentry_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN entry_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN logentry_time timestamp NULL,
+  MODIFY COLUMN entry_time timestamp NULL;
 
 ALTER TABLE icinga_notifications
-  MODIFY COLUMN start_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN end_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN start_time timestamp NULL,
+  MODIFY COLUMN end_time timestamp NULL;
 
 ALTER TABLE icinga_processevents
-  MODIFY COLUMN event_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN event_time timestamp NULL;
 
 ALTER TABLE icinga_programstatus
-  MODIFY COLUMN status_update_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN program_start_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN program_end_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_command_check timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_log_rotation timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN disable_notif_expire_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN status_update_time timestamp NULL,
+  MODIFY COLUMN program_start_time timestamp NULL,
+  MODIFY COLUMN program_end_time timestamp NULL,
+  MODIFY COLUMN last_command_check timestamp NULL,
+  MODIFY COLUMN last_log_rotation timestamp NULL,
+  MODIFY COLUMN disable_notif_expire_time timestamp NULL;
 
 ALTER TABLE icinga_scheduleddowntime
-  MODIFY COLUMN entry_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN scheduled_start_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN scheduled_end_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN actual_start_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN trigger_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN entry_time timestamp NULL,
+  MODIFY COLUMN scheduled_start_time timestamp NULL,
+  MODIFY COLUMN scheduled_end_time timestamp NULL,
+  MODIFY COLUMN actual_start_time timestamp NULL,
+  MODIFY COLUMN trigger_time timestamp NULL;
 
 ALTER TABLE icinga_servicechecks
-  MODIFY COLUMN start_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN end_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN start_time timestamp NULL,
+  MODIFY COLUMN end_time timestamp NULL;
 
 ALTER TABLE icinga_servicestatus
-  MODIFY COLUMN status_update_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_check timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN next_check timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_state_change timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_hard_state_change timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_time_ok timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_time_warning timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_time_unknown timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_time_critical timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN last_notification timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN next_notification timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN status_update_time timestamp NULL,
+  MODIFY COLUMN last_check timestamp NULL,
+  MODIFY COLUMN next_check timestamp NULL,
+  MODIFY COLUMN last_state_change timestamp NULL,
+  MODIFY COLUMN last_hard_state_change timestamp NULL,
+  MODIFY COLUMN last_time_ok timestamp NULL,
+  MODIFY COLUMN last_time_warning timestamp NULL,
+  MODIFY COLUMN last_time_unknown timestamp NULL,
+  MODIFY COLUMN last_time_critical timestamp NULL,
+  MODIFY COLUMN last_notification timestamp NULL,
+  MODIFY COLUMN next_notification timestamp NULL;
 
 ALTER TABLE icinga_statehistory
-  MODIFY COLUMN state_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN state_time timestamp NULL;
 
 ALTER TABLE icinga_systemcommands
-  MODIFY COLUMN start_time timestamp NULL DEFAULT NULL,
-  MODIFY COLUMN end_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN start_time timestamp NULL,
+  MODIFY COLUMN end_time timestamp NULL;
 
 ALTER TABLE icinga_endpointstatus
-  MODIFY COLUMN status_update_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN status_update_time timestamp NULL;
 
 ALTER TABLE icinga_zonestatus
-  MODIFY COLUMN status_update_time timestamp NULL DEFAULT NULL;
+  MODIFY COLUMN status_update_time timestamp NULL;
 
 -- -----------------------------------------
 -- set dbversion