From e4bfb4898d312097e4c0364d17d31211006138cd Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Thu, 15 Jul 2021 11:16:13 +0200 Subject: [PATCH] IDO MySQL: support larger host and service names refs #7472 --- lib/db_ido_mysql/idomysqlconnection.cpp | 2 +- lib/db_ido_mysql/schema/mysql.sql | 4 ++-- lib/db_ido_mysql/schema/upgrade/2.13.0.sql | 23 ++++++++++++++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 lib/db_ido_mysql/schema/upgrade/2.13.0.sql diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp index c5c1f8e28..9b3774656 100644 --- a/lib/db_ido_mysql/idomysqlconnection.cpp +++ b/lib/db_ido_mysql/idomysqlconnection.cpp @@ -23,7 +23,7 @@ REGISTER_STATSFUNCTION(IdoMysqlConnection, &IdoMysqlConnection::StatsFunc); const char * IdoMysqlConnection::GetLatestSchemaVersion() const noexcept { - return "1.15.0"; + return "1.15.1"; } const char * IdoMysqlConnection::GetCompatSchemaVersion() const noexcept diff --git a/lib/db_ido_mysql/schema/mysql.sql b/lib/db_ido_mysql/schema/mysql.sql index d75b85aa3..59e59a7d3 100644 --- a/lib/db_ido_mysql/schema/mysql.sql +++ b/lib/db_ido_mysql/schema/mysql.sql @@ -866,8 +866,8 @@ CREATE TABLE IF NOT EXISTS icinga_objects ( object_id bigint(20) unsigned NOT NULL AUTO_INCREMENT, instance_id bigint unsigned default 0, objecttype_id bigint unsigned default 0, - name1 varchar(128) character set latin1 collate latin1_general_cs default '', - name2 varchar(128) character set latin1 collate latin1_general_cs default NULL, + name1 varchar(255) character set latin1 collate latin1_general_cs default '', + name2 varchar(255) character set latin1 collate latin1_general_cs default NULL, is_active smallint default 0, PRIMARY KEY (object_id), KEY objecttype_id (objecttype_id,name1,name2) diff --git a/lib/db_ido_mysql/schema/upgrade/2.13.0.sql b/lib/db_ido_mysql/schema/upgrade/2.13.0.sql new file mode 100644 index 000000000..462be6f4e --- /dev/null +++ b/lib/db_ido_mysql/schema/upgrade/2.13.0.sql @@ -0,0 +1,23 @@ +-- ----------------------------------------- +-- upgrade path for Icinga 2.13.0 +-- +-- ----------------------------------------- +-- Icinga 2 | (c) 2021 Icinga GmbH | GPLv2+ +-- +-- Please check https://docs.icinga.com for upgrading information! +-- ----------------------------------------- + +SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; + +-- ---------------------------------------- +-- #7472 Support hosts with >128 characters +-- ---------------------------------------- + +ALTER TABLE icinga_objects + MODIFY COLUMN name1 varchar(255) character set latin1 collate latin1_general_cs default '', + MODIFY COLUMN name2 varchar(255) character set latin1 collate latin1_general_cs default NULL; + +-- ------------- +-- set dbversion +-- ------------- +INSERT INTO icinga_dbversion (name, version, create_time, modify_time) VALUES ('idoutils', '1.15.1', NOW(), NOW()) ON DUPLICATE KEY UPDATE version='1.15.1', modify_time=NOW();