Core/RBAC: Correction to last sqls and update base/auth_database.sql

10 files changed, 21 insertions, 18 deletions

diff --git a/sql/updates/auth/2013_02_25_00_auth_misc.sql b/sql/updates/auth/2013_02_25_00_auth_misc.sql
index 5531252037a..3cce3c0d5ce 100644
--- a/sql/updates/auth/2013_02_25_00_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_00_auth_misc.sql
@@ -1,3 +1,6 @@
+ALTER TABLE `rbac_roles` MODIFY COLUMN `name` varchar(100) NOT NULL COMMENT 'Role name';
+ALTER TABLE `rbac_roles` MODIFY COLUMN `name` varchar(100) NOT NULL COMMENT 'Group name';
+
 -- Add new permission
 DELETE FROM `rbac_permissions` WHERE `id` = 11;
 INSERT INTO `rbac_permissions` (`id`, `name`) VALUES (11, 'Log GM trades');
diff --git a/sql/updates/auth/2013_02_25_03_auth_misc.sql b/sql/updates/auth/2013_02_25_03_auth_misc.sql
index ab2c6e0692c..5f290ebf0cd 100644
--- a/sql/updates/auth/2013_02_25_03_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_03_auth_misc.sql
@@ -20,7 +20,7 @@ INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
 (13, 38);
 
 -- Add it to all GM+ groups
-DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (11, 12, 13);
+DELETE FROM `rbac_group_roles` WHERE `roleId` IN (11, 12, 13);
 INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
 (2, 11),
 (3, 11),
diff --git a/sql/updates/auth/2013_02_25_04_auth_misc.sql b/sql/updates/auth/2013_02_25_04_auth_misc.sql
index faaee3582ea..bf42990a1bd 100644
--- a/sql/updates/auth/2013_02_25_04_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_04_auth_misc.sql
@@ -17,7 +17,7 @@ INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
 (15, 37);
 
 -- Add it to all GM+ groups
-DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (14, 15);
+DELETE FROM `rbac_group_roles` WHERE `roleId` IN (14, 15);
 INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
 (2, 14),
 (3, 14),
diff --git a/sql/updates/auth/2013_02_25_07_auth_misc.sql b/sql/updates/auth/2013_02_25_07_auth_misc.sql
index 2416f08280c..4c6dadf4eaa 100644
--- a/sql/updates/auth/2013_02_25_07_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_07_auth_misc.sql
@@ -15,7 +15,7 @@ INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
 (18, 42),
 (18, 43);
 
--- Add it to all GM+ groups
-DELETE FROM `rbac_role_permissions` WHERE `roleId` = 18;
+-- Add it to admins groups
+DELETE FROM `rbac_group_roles` WHERE `roleId` = 18;
 INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
 (4, 18);
diff --git a/sql/updates/auth/2013_02_25_09_auth_misc.sql b/sql/updates/auth/2013_02_25_09_auth_misc.sql
index f2affe05b70..6297bf7427a 100644
--- a/sql/updates/auth/2013_02_25_09_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_09_auth_misc.sql
@@ -17,7 +17,7 @@ INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
 (21, 47);
 
 -- Add it to all GM+ groups
-DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (20, 21);
+DELETE FROM `rbac_group_roles` WHERE `roleId` IN (20, 21);
 INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
 (2, 20),
 (3, 20),
diff --git a/sql/updates/auth/2013_02_25_10_auth_misc.sql b/sql/updates/auth/2013_02_25_10_auth_misc.sql
index 4255bdac8ba..ccca7c74f06 100644
--- a/sql/updates/auth/2013_02_25_10_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_10_auth_misc.sql
@@ -26,7 +26,7 @@ INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
 (26, 41);
 
 -- Add it to all GM+ groups
-DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (22, 23, 24, 25, 26);
+DELETE FROM `rbac_group_roles` WHERE `roleId` IN (22, 23, 24, 25, 26);
 INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
 (2, 22),
 (3, 22),
diff --git a/sql/updates/auth/2013_02_25_11_auth_misc.sql b/sql/updates/auth/2013_02_25_11_auth_misc.sql
index 9c2897394e5..90c19526b06 100644
--- a/sql/updates/auth/2013_02_25_11_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_11_auth_misc.sql
@@ -20,7 +20,7 @@ INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
 (29, 36);
 
 -- Add it to all GM+ groups
-DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (27, 28, 29);
+DELETE FROM `rbac_group_roles` WHERE `roleId` IN (27, 28, 29);
 INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
 (2, 27),
 (3, 27),
diff --git a/sql/updates/auth/2013_02_25_12_auth_misc.sql b/sql/updates/auth/2013_02_25_12_auth_misc.sql
index 2b394dc9bcb..30e203ea4b3 100644
--- a/sql/updates/auth/2013_02_25_12_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_12_auth_misc.sql
@@ -20,7 +20,7 @@ INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
 (32, 46);
 
 -- Add it to all GM+ groups
-DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (30, 31, 32);
+DELETE FROM `rbac_group_roles` WHERE `roleId` IN (30, 31, 32);
 INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
 (1, 30),
 (2, 30),
diff --git a/sql/updates/auth/2013_02_25_13_auth_misc.sql b/sql/updates/auth/2013_02_25_13_auth_misc.sql
index 82247ecd07d..9a7806ede68 100644
--- a/sql/updates/auth/2013_02_25_13_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_13_auth_misc.sql
@@ -1,18 +1,18 @@
 -- Add new permissions
 DELETE FROM `rbac_permissions` WHERE `id` IN (14, 15, 16, 17, 18, 24);
 INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
-(14, 'Skips character creation team mask check'),
-(15, 'Skips character creation class mask check'),
-(16, 'Skips character creation race mask check'),
-(17, 'Skips character creation reserved name check'),
-(18, 'Skips character creation heroic min level check'),
-(24, 'Creation of two side faction characters in same account');
+(14, 'Skip character creation team mask check'),
+(15, 'Skip character creation class mask check'),
+(16, 'Skip character creation race mask check'),
+(17, 'Skip character creation reserved name check'),
+(18, 'Skip character creation heroic min level check'),
+(24, 'Two side faction characters on the same account');
 
 -- Add new role
 DELETE FROM `rbac_roles` WHERE `id` IN (33, 34);
 INSERT INTO `rbac_roles` (`id`, `name`) VALUES
-(33, 'Skips character creation checks'),
-(34, 'Creation of two side faction characters in same account');
+(33, 'Skip character creation checks'),
+(34, 'Two side faction characters on the same account');
 
 -- Add the permission to the role
 DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (33, 34);
@@ -25,7 +25,7 @@ INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
 (34, 24);
 
 -- Add it to all groups
-DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (33, 34);
+DELETE FROM `rbac_group_roles` WHERE `roleId` IN (33, 34);
 INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
 (2, 33),
 (3, 33),
diff --git a/sql/updates/auth/2013_02_25_14_auth_misc.sql b/sql/updates/auth/2013_02_25_14_auth_misc.sql
index c02b600b12f..f88280feae7 100644
--- a/sql/updates/auth/2013_02_25_14_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_14_auth_misc.sql
@@ -23,7 +23,7 @@ INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
 (38, 40);
 
 -- Add it to all groups
-DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (35, 36, 37, 38);
+DELETE FROM `rbac_group_roles` WHERE `roleId` IN (35, 36, 37, 38);
 INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
 (2, 35),
 (3, 35),