tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#10793 fixed collation in sql

This commit is contained in:
Daniel Cebrian 2023-03-23 16:25:08 +01:00
parent 044bd0e54d
commit d3408442d3
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/extras/mr/62.sql
View File

@ -105,7 +105,7 @@ CREATE TABLE IF NOT EXISTS `twelcome_tip` (
`url` VARCHAR(255) NULL, `url` VARCHAR(255) NULL,
`enable` TINYINT NOT NULL, `enable` TINYINT NOT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
CREATE TABLE IF NOT EXISTS `twelcome_tip_file` ( CREATE TABLE IF NOT EXISTS `twelcome_tip_file` (
`id` INT NOT NULL AUTO_INCREMENT, `id` INT NOT NULL AUTO_INCREMENT,
@ -117,7 +117,7 @@ CREATE TABLE IF NOT EXISTS `twelcome_tip_file` (
FOREIGN KEY (`twelcome_tip_file`) FOREIGN KEY (`twelcome_tip_file`)
REFERENCES `twelcome_tip` (`id`) REFERENCES `twelcome_tip` (`id`)
ON DELETE CASCADE ON UPDATE CASCADE ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
INSERT INTO `twelcome_tip` VALUES INSERT INTO `twelcome_tip` VALUES
(1,'es',0,'¿Sabías que puedes monitorizar webs?','De manera sencilla a través de chequeos HTTP estándar o transaccional mediante transacciones centralizadas WUX, o descentralizadas con el plugin UX de agente.','https://pandorafms.com/manual/es/documentation/03_monitoring/06_web_monitoring','1'), (1,'es',0,'¿Sabías que puedes monitorizar webs?','De manera sencilla a través de chequeos HTTP estándar o transaccional mediante transacciones centralizadas WUX, o descentralizadas con el plugin UX de agente.','https://pandorafms.com/manual/es/documentation/03_monitoring/06_web_monitoring','1'),

2
pandora_console/include/class/TipsWindow.class.php
View File

@ -581,7 +581,7 @@ class TipsWindow
$sql = sprintf( $sql = sprintf(
'SELECT id, name AS language, title, text, url, enable 'SELECT id, name AS language, title, text, url, enable
FROM twelcome_tip t FROM twelcome_tip t
LEFT JOIN tlanguage l ON t.id_lang = l.id_language LEFT JOIN tlanguage l ON t.id_lang = l.id_language COLLATE utf8mb4_0900_ai_ci
%s %s %s', %s %s %s',
$filter, $filter,
$order, $order,

4
pandora_console/pandoradb.sql
View File

@ -4240,7 +4240,7 @@ CREATE TABLE IF NOT EXISTS `twelcome_tip` (
`url` VARCHAR(255) NULL, `url` VARCHAR(255) NULL,
`enable` TINYINT NOT NULL, `enable` TINYINT NOT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
CREATE TABLE IF NOT EXISTS `twelcome_tip_file` ( CREATE TABLE IF NOT EXISTS `twelcome_tip_file` (
@ -4253,7 +4253,7 @@ CREATE TABLE IF NOT EXISTS `twelcome_tip_file` (
FOREIGN KEY (`twelcome_tip_file`) FOREIGN KEY (`twelcome_tip_file`)
REFERENCES `twelcome_tip` (`id`) REFERENCES `twelcome_tip` (`id`)
ON DELETE CASCADE ON UPDATE CASCADE ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
-- --------------------------------------------------------------------- -- ---------------------------------------------------------------------
-- Table `tfavmenu_user` -- Table `tfavmenu_user`