diff options
| author | Nyeriah <sarah.trysan@live.com> | 2014-11-22 00:30:24 -0200 |
|---|---|---|
| committer | Nyeriah <sarah.trysan@live.com> | 2014-12-10 18:43:14 -0200 |
| commit | c79af3f16f84d0d26bd69b5d06dd8754643ddc7f (patch) | |
| tree | fdada41736758a2366d28d6548c4cbe667039ba3 /sql | |
| parent | ef6772b896363da024108864786326b0197f8b8f (diff) | |
Core/RBAC: Allow setting different default security level roles to different realms
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/base/auth_database.sql | 5 | ||||
| -rw-r--r-- | sql/updates/auth/2014_12_10_00_auth.sql | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index 095669b2d12..844b76eac5b 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -334,7 +334,8 @@ DROP TABLE IF EXISTS `rbac_default_permissions`; CREATE TABLE `rbac_default_permissions` ( `secId` int(10) unsigned NOT NULL COMMENT 'Security Level id', `permissionId` int(10) unsigned NOT NULL COMMENT 'permission id', - PRIMARY KEY (`secId`,`permissionId`), + `realmId` int(11) NOT NULL DEFAULT '-1' COMMENT 'Realm Id, -1 means all', + PRIMARY KEY (`secId`,`permissionId`, `realmId`), KEY `fk__rbac_default_permissions__rbac_permissions` (`permissionId`), CONSTRAINT `fk__rbac_default_permissions__rbac_permissions` FOREIGN KEY (`permissionId`) REFERENCES `rbac_permissions` (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Default permission to assign to different account security levels'; @@ -346,7 +347,7 @@ CREATE TABLE `rbac_default_permissions` ( LOCK TABLES `rbac_default_permissions` WRITE; /*!40000 ALTER TABLE `rbac_default_permissions` DISABLE KEYS */; -INSERT INTO `rbac_default_permissions` VALUES (3,192),(2,193),(1,194),(0,195); +INSERT INTO `rbac_default_permissions` VALUES (3,192, -1),(2,193, -1),(1,194, -1),(0,195, -1); /*!40000 ALTER TABLE `rbac_default_permissions` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/updates/auth/2014_12_10_00_auth.sql b/sql/updates/auth/2014_12_10_00_auth.sql new file mode 100644 index 00000000000..8068fd3c459 --- /dev/null +++ b/sql/updates/auth/2014_12_10_00_auth.sql @@ -0,0 +1,3 @@ +ALTER TABLE `rbac_default_permissions` +ADD COLUMN `realmId` INT(11) NOT NULL DEFAULT '-1' COMMENT 'Realm Id, -1 means all', +DROP PRIMARY KEY, ADD PRIMARY KEY (`secId`, `permissionId`, `realmId`); |