tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-25 23:04:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

sql: Change charset to utf8mb4

Browse Source 
fixes https://github.com/Icinga/icingaweb2/issues/4680
This commit is contained in:
Sukhwinder Dhillon 2022-05-02 12:08:59 +02:00 committed by Johannes Meyer
parent 1dec3426c9
commit 1b1eb3436f
10 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/80-Upgrading.md
View File

@ -7,6 +7,12 @@ v2.6 to v2.8 requires to follow the instructions for v2.7 too.
* The Vagrant file and all its assets have been removed. * The Vagrant file and all its assets have been removed.
**Database Schema**
* Please apply the `v2.11.0.sql` upgrade script depending on your database vendor.
In package installations this file can be found in `/usr/share/doc/icingaweb2/schema/*-upgrades/`
(Debian/Ubuntu: `/usr/share/icingaweb2/etc/schema/*-upgrades/`).
## Upgrading to Icinga Web 2 2.10.x ## Upgrading to Icinga Web 2 2.10.x
**General** **General**

16
etc/schema/mysql-upgrades/2.11.0.sql Normal file
View File

@ -0,0 +1,16 @@
ALTER TABLE `icingaweb_group` CONVERT TO CHARACTER SET utf8mb4;
ALTER TABLE `icingaweb_group_membership` CONVERT TO CHARACTER SET utf8mb4;
ALTER TABLE `icingaweb_user` CONVERT TO CHARACTER SET utf8mb4;
ALTER TABLE `icingaweb_user_preference` CONVERT TO CHARACTER SET utf8mb4;
ALTER TABLE `icingaweb_group`
MODIFY COLUMN `name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL;
ALTER TABLE `icingaweb_group_membership`
MODIFY COLUMN `username` varchar(254) COLLATE utf8mb4_unicode_ci NOT NULL;
ALTER TABLE `icingaweb_user`
MODIFY COLUMN `name` varchar(254) COLLATE utf8mb4_unicode_ci NOT NULL;
ALTER TABLE `icingaweb_user_preference`
MODIFY COLUMN `username` varchar(254) COLLATE utf8mb4_unicode_ci NOT NULL,
MODIFY COLUMN `section` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
MODIFY COLUMN `name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL;

20
etc/schema/mysql.schema.sql
View File

@ -2,7 +2,7 @@
CREATE TABLE `icingaweb_group`( CREATE TABLE `icingaweb_group`(
`id` int(10) unsigned NOT NULL AUTO_INCREMENT, `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`name` varchar(64) COLLATE utf8_unicode_ci NOT NULL, `name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
`parent` int(10) unsigned NULL DEFAULT NULL, `parent` int(10) unsigned NULL DEFAULT NULL,
`ctime` timestamp NULL DEFAULT NULL, `ctime` timestamp NULL DEFAULT NULL,
`mtime` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, `mtime` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
@ -10,36 +10,36 @@ CREATE TABLE `icingaweb_group`(
UNIQUE KEY `idx_name` (`name`), UNIQUE KEY `idx_name` (`name`),
CONSTRAINT `fk_icingaweb_group_parent_id` FOREIGN KEY (`parent`) CONSTRAINT `fk_icingaweb_group_parent_id` FOREIGN KEY (`parent`)
REFERENCES `icingaweb_group` (`id`) REFERENCES `icingaweb_group` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE `icingaweb_group_membership`( CREATE TABLE `icingaweb_group_membership`(
`group_id` int(10) unsigned NOT NULL, `group_id` int(10) unsigned NOT NULL,
`username` varchar(254) COLLATE utf8_unicode_ci NOT NULL, `username` varchar(254) COLLATE utf8mb4_unicode_ci NOT NULL,
`ctime` timestamp NULL DEFAULT NULL, `ctime` timestamp NULL DEFAULT NULL,
`mtime` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, `mtime` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`group_id`,`username`), PRIMARY KEY (`group_id`,`username`),
CONSTRAINT `fk_icingaweb_group_membership_icingaweb_group` FOREIGN KEY (`group_id`) CONSTRAINT `fk_icingaweb_group_membership_icingaweb_group` FOREIGN KEY (`group_id`)
REFERENCES `icingaweb_group` (`id`) REFERENCES `icingaweb_group` (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE `icingaweb_user`( CREATE TABLE `icingaweb_user`(
`name` varchar(254) COLLATE utf8_unicode_ci NOT NULL, `name` varchar(254) COLLATE utf8mb4_unicode_ci NOT NULL,
`active` tinyint(1) NOT NULL, `active` tinyint(1) NOT NULL,
`password_hash` varbinary(255) NOT NULL, `password_hash` varbinary(255) NOT NULL,
`ctime` timestamp NULL DEFAULT NULL, `ctime` timestamp NULL DEFAULT NULL,
`mtime` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, `mtime` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`name`) PRIMARY KEY (`name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE `icingaweb_user_preference`( CREATE TABLE `icingaweb_user_preference`(
`username` varchar(254) COLLATE utf8_unicode_ci NOT NULL, `username` varchar(254) COLLATE utf8mb4_unicode_ci NOT NULL,
`section` varchar(64) COLLATE utf8_unicode_ci NOT NULL, `section` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
`name` varchar(64) COLLATE utf8_unicode_ci NOT NULL, `name` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL,
`value` varchar(255) NOT NULL, `value` varchar(255) NOT NULL,
`ctime` timestamp NULL DEFAULT NULL, `ctime` timestamp NULL DEFAULT NULL,
`mtime` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, `mtime` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`username`,`section`,`name`) PRIMARY KEY (`username`,`section`,`name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE `icingaweb_rememberme`( CREATE TABLE `icingaweb_rememberme`(
id int(10) unsigned NOT NULL AUTO_INCREMENT, id int(10) unsigned NOT NULL AUTO_INCREMENT,

2
library/Icinga/Authentication/User/DbUserBackend.php
View File

@ -21,7 +21,7 @@ class DbUserBackend extends DbRepository implements UserBackendInterface, Inspec
*/ */
protected $queryColumns = array( protected $queryColumns = array(
'user' => array( 'user' => array(
'user' => 'name COLLATE utf8_general_ci', 'user' => 'name COLLATE utf8mb4_general_ci',
'user_name' => 'name', 'user_name' => 'name',
'is_active' => 'active', 'is_active' => 'active',
'created_at' => 'UNIX_TIMESTAMP(ctime)', 'created_at' => 'UNIX_TIMESTAMP(ctime)',

2
library/Icinga/Authentication/User/UserBackend.php
View File

@ -225,7 +225,7 @@ class UserBackend implements ConfigAwareFactory
$resourceConfig = ResourceFactory::getResourceConfig($backendConfig->resource); $resourceConfig = ResourceFactory::getResourceConfig($backendConfig->resource);
if ($backendType === 'db' && $resourceConfig->db === 'mysql') { if ($backendType === 'db' && $resourceConfig->db === 'mysql') {
$resourceConfig->charset = 'utf8'; $resourceConfig->charset = 'utf8mb4';
} }
$resource = ResourceFactory::createResource($resourceConfig); $resource = ResourceFactory::createResource($resourceConfig);

4
library/Icinga/Authentication/UserGroup/DbUserGroupBackend.php
View File

@ -22,7 +22,7 @@ class DbUserGroupBackend extends DbRepository implements Inspectable, UserGroupB
protected $queryColumns = array( protected $queryColumns = array(
'group' => array( 'group' => array(
'group_id' => 'g.id', 'group_id' => 'g.id',
'group' => 'g.name COLLATE utf8_general_ci', 'group' => 'g.name COLLATE utf8mb4_general_ci',
'group_name' => 'g.name', 'group_name' => 'g.name',
'parent' => 'g.parent', 'parent' => 'g.parent',
'created_at' => 'UNIX_TIMESTAMP(g.ctime)', 'created_at' => 'UNIX_TIMESTAMP(g.ctime)',
@ -30,7 +30,7 @@ class DbUserGroupBackend extends DbRepository implements Inspectable, UserGroupB
), ),
'group_membership' => array( 'group_membership' => array(
'group_id' => 'gm.group_id', 'group_id' => 'gm.group_id',
'user' => 'gm.username COLLATE utf8_general_ci', 'user' => 'gm.username COLLATE utf8mb4_general_ci',
'user_name' => 'gm.username', 'user_name' => 'gm.username',
'created_at' => 'UNIX_TIMESTAMP(gm.ctime)', 'created_at' => 'UNIX_TIMESTAMP(gm.ctime)',
'last_modified' => 'UNIX_TIMESTAMP(gm.mtime)' 'last_modified' => 'UNIX_TIMESTAMP(gm.mtime)'

2
library/Icinga/Authentication/UserGroup/UserGroupBackend.php
View File

@ -167,7 +167,7 @@ class UserGroupBackend
$resourceConfig = ResourceFactory::getResourceConfig($backendConfig->resource); $resourceConfig = ResourceFactory::getResourceConfig($backendConfig->resource);
if ($backendType === 'db' && $resourceConfig->db === 'mysql') { if ($backendType === 'db' && $resourceConfig->db === 'mysql') {
$resourceConfig->charset = 'utf8'; $resourceConfig->charset = 'utf8mb4';
} }
$resource = ResourceFactory::createResource($resourceConfig); $resource = ResourceFactory::createResource($resourceConfig);

2
library/Icinga/User/Preferences/PreferencesStore.php
View File

@ -132,7 +132,7 @@ abstract class PreferencesStore
} elseif ($type === 'Db') { } elseif ($type === 'Db') {
$resourceConfig = ResourceFactory::getResourceConfig($config->resource); $resourceConfig = ResourceFactory::getResourceConfig($config->resource);
if ($resourceConfig->db === 'mysql') { if ($resourceConfig->db === 'mysql') {
$resourceConfig->charset = 'utf8'; $resourceConfig->charset = 'utf8mb4';
} }
$config->connection = ResourceFactory::createResource($resourceConfig); $config->connection = ResourceFactory::createResource($resourceConfig);

2
modules/migrate/application/clicommands/PreferencesCommand.php
View File

@ -38,7 +38,7 @@ class PreferencesCommand extends Command
$resourceConfig = ResourceFactory::getResourceConfig($resource); $resourceConfig = ResourceFactory::getResourceConfig($resource);
if ($resourceConfig->db === 'mysql') { if ($resourceConfig->db === 'mysql') {
$resourceConfig->charset = 'utf8'; $resourceConfig->charset = 'utf8mb4';
} }
$connection = ResourceFactory::createResource($resourceConfig); $connection = ResourceFactory::createResource($resourceConfig);

6
modules/migrate/library/Migrate/Config/UserDomainMigration.php
View File

@ -208,7 +208,7 @@ class UserDomainMigration
case 'db': case 'db':
$resourceConfig = ResourceFactory::getResourceConfig($config->get('global', 'config_resource')); $resourceConfig = ResourceFactory::getResourceConfig($config->get('global', 'config_resource'));
if ($resourceConfig->db === 'mysql') { if ($resourceConfig->db === 'mysql') {
$resourceConfig->charset = 'utf8'; $resourceConfig->charset = 'utf8mb4';
} }
/** @var DbConnection $conn */ /** @var DbConnection $conn */
@ -295,7 +295,7 @@ class UserDomainMigration
$resourceConfig = ResourceFactory::getResourceConfig($config->resource); $resourceConfig = ResourceFactory::getResourceConfig($config->resource);
if ($resourceConfig->db === 'mysql') { if ($resourceConfig->db === 'mysql') {
$resourceConfig->charset = 'utf8'; $resourceConfig->charset = 'utf8mb4';
} }
/** @var DbConnection $conn */ /** @var DbConnection $conn */
@ -348,7 +348,7 @@ class UserDomainMigration
$resourceConfig = ResourceFactory::getResourceConfig($config->resource); $resourceConfig = ResourceFactory::getResourceConfig($config->resource);
if ($resourceConfig->db === 'mysql') { if ($resourceConfig->db === 'mysql') {
$resourceConfig->charset = 'utf8'; $resourceConfig->charset = 'utf8mb4';
} }
/** @var DbConnection $conn */ /** @var DbConnection $conn */