From: Michael Friedrich <michael.friedrich@gmail.com>
Date: Sun, 26 Oct 2014 18:46:51 +0000 (+0100)
Subject: DB IDO: Import schema fixes from 1.12.0
X-Git-Tag: v2.2.0~258
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56222ca90b25287588d7f52d3a2cd5e241a22e18;p=icinga2

DB IDO: Import schema fixes from 1.12.0
---

diff --git a/lib/db_ido_mysql/schema/mysql.sql b/lib/db_ido_mysql/schema/mysql.sql
index c6941aa9e..52ba3736a 100644
--- a/lib/db_ido_mysql/schema/mysql.sql
+++ b/lib/db_ido_mysql/schema/mysql.sql
@@ -247,7 +247,7 @@ CREATE TABLE IF NOT EXISTS icinga_contacts (
   instance_id bigint unsigned default 0,
   config_type smallint default 0,
   contact_object_id bigint unsigned default 0,
-  alias varchar(64) character set latin1  default '',
+  alias TEXT character set latin1  default '',
   email_address varchar(255) character set latin1  default '',
   pager_address varchar(64) character set latin1  default '',
   host_timeperiod_object_id bigint unsigned default 0,
@@ -632,7 +632,7 @@ CREATE TABLE IF NOT EXISTS icinga_hosts (
   instance_id bigint unsigned default 0,
   config_type smallint default 0,
   host_object_id bigint unsigned default 0,
-  alias varchar(64) character set latin1  default '',
+  alias TEXT character set latin1  default '',
   display_name varchar(255) character set latin1 collate latin1_general_cs  default '',
   address varchar(128) character set latin1  default '',
   address6 varchar(128) character set latin1  default '',
@@ -1408,7 +1408,6 @@ ALTER TABLE icinga_servicechecks ADD COLUMN endpoint_object_id bigint default NU
 ALTER TABLE icinga_statehistory ADD COLUMN endpoint_object_id bigint default NULL;
 ALTER TABLE icinga_systemcommands ADD COLUMN endpoint_object_id bigint default NULL;
 
-
 -- -----------------------------------------
 -- add index (delete)
 -- -----------------------------------------
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 5c9a38241..dd77f77f2 100644
--- a/lib/db_ido_mysql/schema/upgrade/2.2.0.sql
+++ b/lib/db_ido_mysql/schema/upgrade/2.2.0.sql
@@ -9,6 +9,9 @@
 
 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 '';
+
 -- -----------------------------------------
 -- update dbversion
 -- -----------------------------------------