From b19c15bd68dd9e384d1e6604dbffc875a2d33d22 Mon Sep 17 00:00:00 2001 From: carlossa Date: Wed, 28 Jun 2023 12:28:25 +0200 Subject: [PATCH] refs #5660 rol fix and inherits rol --- db/changes/232801/00-changeRole.sql | 1 - db/changes/232801/01-deliveryAssistantACL.sql | 14 ++++++-------- .../232801/02-deliveryAssistantInheritRole.sql | 5 ----- 3 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 db/changes/232801/00-changeRole.sql delete mode 100644 db/changes/232801/02-deliveryAssistantInheritRole.sql diff --git a/db/changes/232801/00-changeRole.sql b/db/changes/232801/00-changeRole.sql deleted file mode 100644 index 3c8c81edb8..0000000000 --- a/db/changes/232801/00-changeRole.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE account.`role` MODIFY COLUMN name varchar(79) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL COMMENT 'MySQL doesn''t support more than 14 chars for proxied user names'; diff --git a/db/changes/232801/01-deliveryAssistantACL.sql b/db/changes/232801/01-deliveryAssistantACL.sql index 5ee8a566ff..22ee9d796d 100644 --- a/db/changes/232801/01-deliveryAssistantACL.sql +++ b/db/changes/232801/01-deliveryAssistantACL.sql @@ -2,22 +2,20 @@ INSERT INTO `account`.`role` (name,description) VALUES ('deliveryAssistant','Asistencia de envios'); -INSERT INTO `account`.`roleInherit` +INSERT INTO `account`.`roleInherit` (role,inheritsFrom) SELECT (SELECT id FROM account.role r WHERE r.name = 'deliveryAssistant'), ri.inheritsFrom FROM account.roleInherit ri JOIN account.role r ON r.id = ri.`role` WHERE r.name = 'deliveryBoss'; -DELETE FROM roleInherit WHERE role = 57; +DELETE FROM `account`.`roleInherit` WHERE role = 57; -INSERT INTO `account`.`roleInherit` - SELECT (SELECT id FROM account.role r WHERE r.name = 'deliveryBoss'), ri.inheritsFrom - FROM account.roleInherit ri - JOIN account.role r ON r.id = ri.`role` - WHERE - +INSERT INTO `account`.`roleInherit` (role, inheritsFrom) + SELECT (SELECT id FROM account.role WHERE name = 'deliveryBoss') role, + (SELECT id FROM account.role WHERE name = 'deliveryAssistant') roleInherit; +CALL account.role_syncPrivileges(); diff --git a/db/changes/232801/02-deliveryAssistantInheritRole.sql b/db/changes/232801/02-deliveryAssistantInheritRole.sql deleted file mode 100644 index 403ea5cdc2..0000000000 --- a/db/changes/232801/02-deliveryAssistantInheritRole.sql +++ /dev/null @@ -1,5 +0,0 @@ -INSERT INTO account.roleInherit(role,inheritsFrom) - SELECT (SELECT id FROM account.role r WHERE r.name = 'deliveryAssistant') role, ri.inheritsFrom - FROM account.roleInherit ri - JOIN account.role r ON r.id = ri.`role` - WHERE r.name = 'deliveryBoss'; \ No newline at end of file