From: Michael Friedrich Date: Wed, 23 Jul 2014 16:06:57 +0000 (+0200) Subject: Fix customvariables in DB IDO MySQL are not case sensitive X-Git-Tag: v2.0.2~46 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e4ddc2a1aa45690cb7a4730103780aecaf887fb;p=icinga2 Fix customvariables in DB IDO MySQL are not case sensitive fixes #6608 --- diff --git a/ChangeLog b/ChangeLog index 06644b94f..0a961b00b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,12 @@ Please check doc/1-about.md. ## What's New +### What's New in Version 2.0.2 + +#### Changes + +* DB IDO schema upgrade required (new schema version: 1.11.6) + ### What's New in Version 2.0.1 * Bug #6316: application fails to start on wrong log file permissions but does not tell about it diff --git a/components/db_ido_mysql/idomysqlconnection.cpp b/components/db_ido_mysql/idomysqlconnection.cpp index 664a648c8..088ce25bf 100644 --- a/components/db_ido_mysql/idomysqlconnection.cpp +++ b/components/db_ido_mysql/idomysqlconnection.cpp @@ -33,7 +33,7 @@ using namespace icinga; -#define SCHEMA_VERSION "1.11.3" +#define SCHEMA_VERSION "1.11.6" REGISTER_TYPE(IdoMysqlConnection); REGISTER_STATSFUNCTION(IdoMysqlConnectionStats, &IdoMysqlConnection::StatsFunc); diff --git a/components/db_ido_mysql/schema/mysql.sql b/components/db_ido_mysql/schema/mysql.sql index bf97f3138..e8d7698bb 100644 --- a/components/db_ido_mysql/schema/mysql.sql +++ b/components/db_ido_mysql/schema/mysql.sql @@ -337,7 +337,7 @@ CREATE TABLE IF NOT EXISTS icinga_customvariables ( object_id bigint unsigned default 0, config_type smallint default 0, has_been_modified smallint default 0, - varname varchar(255) character set latin1 default '', + varname varchar(255) character set latin1 collate latin1_general_cs default NULL, varvalue TEXT character set latin1 default '', PRIMARY KEY (customvariable_id), UNIQUE KEY object_id_2 (object_id,config_type,varname), @@ -356,7 +356,7 @@ CREATE TABLE IF NOT EXISTS icinga_customvariablestatus ( object_id bigint unsigned default 0, status_update_time timestamp default '0000-00-00 00:00:00', has_been_modified smallint default 0, - varname varchar(255) character set latin1 default '', + varname varchar(255) character set latin1 collate latin1_general_cs default NULL, varvalue TEXT character set latin1 default '', PRIMARY KEY (customvariablestatus_id), UNIQUE KEY object_id_2 (object_id,varname), @@ -1600,6 +1600,6 @@ CREATE INDEX commenthistory_delete_idx ON icinga_commenthistory (instance_id, co -- ----------------------------------------- -- set dbversion -- ----------------------------------------- -INSERT INTO icinga_dbversion (name, version, create_time, modify_time) VALUES ('idoutils', '1.11.3', NOW(), NOW()) ON DUPLICATE KEY UPDATE version='1.11.3', modify_time=NOW(); +INSERT INTO icinga_dbversion (name, version, create_time, modify_time) VALUES ('idoutils', '1.11.6', NOW(), NOW()) ON DUPLICATE KEY UPDATE version='1.11.6', modify_time=NOW(); diff --git a/components/db_ido_mysql/schema/upgrade/2.0.2.sql b/components/db_ido_mysql/schema/upgrade/2.0.2.sql index 8bd871b1a..1e9b428cb 100644 --- a/components/db_ido_mysql/schema/upgrade/2.0.2.sql +++ b/components/db_ido_mysql/schema/upgrade/2.0.2.sql @@ -8,3 +8,13 @@ -- ----------------------------------------- UPDATE icinga_objects SET name2 = NULL WHERE name2 = ''; + +ALTER TABLE `icinga_customvariables` MODIFY COLUMN `varname` varchar(255) character set latin1 collate latin1_general_cs default NULL; +ALTER TABLE `icinga_customvariablestatus` MODIFY COLUMN `varname` varchar(255) character set latin1 collate latin1_general_cs default NULL; + +-- ----------------------------------------- +-- update dbversion +-- ----------------------------------------- + +INSERT INTO icinga_dbversion (name, version, create_time, modify_time) VALUES ('idoutils', '1.11.6', NOW(), NOW()) ON DUPLICATE KEY UPDATE version='1.11.6', modify_time=NOW(); + diff --git a/components/db_ido_pgsql/idopgsqlconnection.cpp b/components/db_ido_pgsql/idopgsqlconnection.cpp index 917569fcf..530e837e9 100644 --- a/components/db_ido_pgsql/idopgsqlconnection.cpp +++ b/components/db_ido_pgsql/idopgsqlconnection.cpp @@ -34,7 +34,7 @@ using namespace icinga; -#define SCHEMA_VERSION "1.11.3" +#define SCHEMA_VERSION "1.11.6" REGISTER_TYPE(IdoPgsqlConnection); diff --git a/components/db_ido_pgsql/schema/pgsql.sql b/components/db_ido_pgsql/schema/pgsql.sql index dd1789f8a..516c67132 100644 --- a/components/db_ido_pgsql/schema/pgsql.sql +++ b/components/db_ido_pgsql/schema/pgsql.sql @@ -1629,5 +1629,5 @@ CREATE INDEX commenthistory_delete_idx ON icinga_commenthistory (instance_id, co -- set dbversion -- ----------------------------------------- -SELECT updatedbversion('1.11.3'); +SELECT updatedbversion('1.11.6'); diff --git a/components/db_ido_pgsql/schema/upgrade/2.0.2.sql b/components/db_ido_pgsql/schema/upgrade/2.0.2.sql index 8bd871b1a..c58300587 100644 --- a/components/db_ido_pgsql/schema/upgrade/2.0.2.sql +++ b/components/db_ido_pgsql/schema/upgrade/2.0.2.sql @@ -8,3 +8,10 @@ -- ----------------------------------------- UPDATE icinga_objects SET name2 = NULL WHERE name2 = ''; + +-- ----------------------------------------- +-- update dbversion +-- ----------------------------------------- + +SELECT updatedbversion('1.11.6'); + diff --git a/doc/1-about.md b/doc/1-about.md index 0f3bbd66d..2acf57b4c 100644 --- a/doc/1-about.md +++ b/doc/1-about.md @@ -46,6 +46,12 @@ Icinga 2 is available as [Vagrant Demo VM](#vagrant). ## What's new +### What's New in Version 2.0.2 + +#### Changes + +* DB IDO schema upgrade required (new schema version: 1.11.6) + ### What's New in Version 2.0.1 * Bug #6316: application fails to start on wrong log file permissions but does not tell about it diff --git a/doc/2-getting-started.md b/doc/2-getting-started.md index 03d8e7cf2..fb01fab74 100644 --- a/doc/2-getting-started.md +++ b/doc/2-getting-started.md @@ -451,9 +451,11 @@ by a number of projects including Icinga Web 1.x, Reporting or Icinga Web 2. There is a separate module for each database back-end. At present support for both MySQL and PostgreSQL is implemented. -Icinga 2 uses the Icinga 1.x IDOUtils database schema starting with version -`1.11.3`. Icinga 2 requires additional features not yet released with older -Icinga 1.x versions. +Icinga 2 uses the Icinga 1.x IDOUtils database schema. Icinga 2 requires additional +features not yet released with older Icinga 1.x versions. + +* Current required schema version: `1.11.6`. + > **Tip** >