Skip to content

Commit b46673b

Browse files
author
Rochet2
committed
Merge TrinityCore 3.3.5 to ElunaTrinityWotlk [skip ci]
2 parents 7cfb62c + b18ba61 commit b46673b

File tree

2 files changed

+31
-10
lines changed

2 files changed

+31
-10
lines changed

sql/base/auth_database.sql

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2347,7 +2347,7 @@ CREATE TABLE `realmlist` (
23472347
`flag` tinyint unsigned NOT NULL DEFAULT '2',
23482348
`timezone` tinyint unsigned NOT NULL DEFAULT '0',
23492349
`allowedSecurityLevel` tinyint unsigned NOT NULL DEFAULT '0',
2350-
`population` float unsigned NOT NULL DEFAULT '0',
2350+
`population` float NOT NULL DEFAULT '0',
23512351
`gamebuild` int unsigned NOT NULL DEFAULT '12340',
23522352
PRIMARY KEY (`id`),
23532353
UNIQUE KEY `idx_name` (`name`)
@@ -2529,7 +2529,8 @@ INSERT INTO `updates` VALUES
25292529
('2024_04_10_00_auth.sql','CE8BD4D6DF6DE85DBF892507B1B18B746FE4A71D','ARCHIVED','2024-04-10 16:07:02',0),
25302530
('2024_08_17_00_auth.sql','B6D7D00D5573958EE84321B029D869C52793F924','ARCHIVED','2024-08-17 22:26:12',0),
25312531
('2024_08_28_01_auth.sql','BC5D74553AF2D92606F55C1C462D2700FE73BD34','RELEASED','2024-08-28 14:55:05',0),
2532-
('2024_08_30_00_auth.sql','BD76942F1C29AAA2450E051E7CA552672B5E331B','RELEASED','2024-08-30 19:24:30',0);
2532+
('2024_08_30_00_auth.sql','BD76942F1C29AAA2450E051E7CA552672B5E331B','RELEASED','2024-08-30 19:24:30',0),
2533+
('2024_09_26_00_auth.sql','E37C3997FD7851EA360774AC568912846C448272','RELEASED','2024-09-26 18:27:26',0);
25332534
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
25342535
UNLOCK TABLES;
25352536

@@ -2631,11 +2632,11 @@ SET character_set_client = @saved_cs_client;
26312632
/*!50001 SET @saved_cs_client = @@character_set_client */;
26322633
/*!50001 SET @saved_cs_results = @@character_set_results */;
26332634
/*!50001 SET @saved_col_connection = @@collation_connection */;
2634-
/*!50001 SET character_set_client = utf8mb3 */;
2635-
/*!50001 SET character_set_results = utf8mb3 */;
2636-
/*!50001 SET collation_connection = utf8mb3_general_ci */;
2635+
/*!50001 SET character_set_client = utf8mb4 */;
2636+
/*!50001 SET character_set_results = utf8mb4 */;
2637+
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
26372638
/*!50001 CREATE ALGORITHM=UNDEFINED */
2638-
/*!50013 */
2639+
/*!50013 SQL SECURITY INVOKER */
26392640
/*!50001 VIEW `vw_log_history` AS select from_unixtime(min(`logs`.`time`)) AS `First Logged`,from_unixtime(max(`logs`.`time`)) AS `Last Logged`,count(0) AS `Occurrences`,`realmlist`.`name` AS `Realm`,`logs`.`type` AS `type`,`logs`.`level` AS `level`,`logs`.`string` AS `string` from (`logs` left join `realmlist` on((`logs`.`realm` = `realmlist`.`id`))) group by `logs`.`string`,`logs`.`type`,`logs`.`realm` */;
26402641
/*!50001 SET character_set_client = @saved_cs_client */;
26412642
/*!50001 SET character_set_results = @saved_cs_results */;
@@ -2649,11 +2650,11 @@ SET character_set_client = @saved_cs_client;
26492650
/*!50001 SET @saved_cs_client = @@character_set_client */;
26502651
/*!50001 SET @saved_cs_results = @@character_set_results */;
26512652
/*!50001 SET @saved_col_connection = @@collation_connection */;
2652-
/*!50001 SET character_set_client = utf8mb3 */;
2653-
/*!50001 SET character_set_results = utf8mb3 */;
2654-
/*!50001 SET collation_connection = utf8mb3_general_ci */;
2653+
/*!50001 SET character_set_client = utf8mb4 */;
2654+
/*!50001 SET character_set_results = utf8mb4 */;
2655+
/*!50001 SET collation_connection = utf8mb4_unicode_ci */;
26552656
/*!50001 CREATE ALGORITHM=UNDEFINED */
2656-
/*!50013 */
2657+
/*!50013 SQL SECURITY INVOKER */
26572658
/*!50001 VIEW `vw_rbac` AS select `t1`.`linkedId` AS `Permission ID`,`t1`.`id` AS `Permission Group`,ifnull(`t2`.`secId`,'linked') AS `Security Level`,`t3`.`name` AS `Permission` from ((`rbac_linked_permissions` `t1` left join `rbac_default_permissions` `t2` on((`t1`.`id` = `t2`.`permissionId`))) left join `rbac_permissions` `t3` on((`t1`.`linkedId` = `t3`.`id`))) */;
26582659
/*!50001 SET character_set_client = @saved_cs_client */;
26592660
/*!50001 SET character_set_results = @saved_cs_results */;
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
2+
ALTER TABLE `realmlist` MODIFY `population` float NOT NULL DEFAULT '0';
3+
4+
SET NAMES 'utf8mb4' COLLATE 'utf8mb4_unicode_ci'; -- views do not have explicit charset/collation options but record whatever the connection settings were as their own (visible in mysqldump)
5+
6+
DROP VIEW IF EXISTS `vw_log_history`;
7+
DROP VIEW IF EXISTS `vw_rbac`;
8+
9+
CREATE SQL SECURITY INVOKER VIEW `vw_log_history` AS (SELECT FROM_UNIXTIME(MIN(`logs`.`time`)) AS `First Logged` ,FROM_UNIXTIME(MAX(`logs`.`time`)) AS `Last Logged` ,COUNT(*) AS `Occurrences` ,`realmlist`.`name` AS `Realm` ,`logs`.`type` ,`logs`.`level` ,`logs`.`string` FROM `logs` LEFT JOIN realmlist ON `logs`.`realm` = `realmlist`.`id` GROUP BY `logs`.`string`, `logs`.`type`, `logs`.`realm`);
10+
11+
CREATE SQL SECURITY INVOKER VIEW `vw_rbac` AS
12+
(
13+
SELECT `t1`.`linkedId` AS `Permission ID`,
14+
`t1`.`id` AS `Permission Group`,
15+
IFNULL(`t2`.`secId`, 'linked') AS `Security Level`,
16+
`t3`.`name` AS `Permission`
17+
FROM `rbac_linked_permissions` `t1`
18+
LEFT JOIN `rbac_default_permissions` `t2` ON `t1`.`id` = `t2`.`permissionId`
19+
LEFT JOIN `rbac_permissions` `t3` ON `t1`.`linkedId` = `t3`.`id`
20+
);

0 commit comments

Comments
 (0)