From: toyomoyo <toyomoyo>
Date: Mon, 30 Jul 2007 02:42:17 +0000 (+0000)
Subject: merged fix for MDL_10640, adding missing index for mdl_role_capabilities table during... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=1cf124a7de72fbefc9f3e6d86ec32074be95a73d;p=moodle.git

merged fix for MDL_10640, adding missing index for mdl_role_capabilities table during upgrade
---

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 3ef47adfe4..756ada2664 100644
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -2074,9 +2074,11 @@ function main_upgrade($oldversion=0) {
         execute_sql("ALTER TABLE `{$CFG->prefix}role_assignments` ADD UNIQUE INDEX `contextid-roleid-userid` (`contextid`, `roleid`, `userid`)",true);
         execute_sql("ALTER TABLE `{$CFG->prefix}role_assignments` ADD INDEX `sortorder` (`sortorder`)",true);
 
-        execute_sql("ALTER TABLE `{$CFG->prefix}role_capabilities` ADD INDEX `roleid` (`roleid`)",true);  
+        execute_sql("ALTER TABLE `{$CFG->prefix}role_capabilities` ADD INDEX `roleid` (`roleid`)",true);
         execute_sql("ALTER TABLE `{$CFG->prefix}role_capabilities` ADD INDEX `contextid` (`contextid`)",true); 
-        execute_sql("ALTER TABLE `{$CFG->prefix}role_capabilities` ADD INDEX `modifierid` (`modifierid`)",true); 
+        execute_sql("ALTER TABLE `{$CFG->prefix}role_capabilities` ADD INDEX `modifierid` (`modifierid`)",true);                
+        // MDL-10640  adding missing index from upgrade
+        execute_sql("ALTER TABLE `{$CFG->prefix}role_capabilities` ADD INDEX `capability` (`capability`)",true);   
         execute_sql("ALTER TABLE `{$CFG->prefix}role_capabilities` ADD UNIQUE INDEX `roleid-contextid-capability` (`roleid`, `contextid`, `capability`)",true);         
                         
         execute_sql("ALTER TABLE `{$CFG->prefix}role_deny_grant` ADD INDEX `roleid` (`roleid`)",true);
diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 850d1ac148..2884a86c32 100644
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -1683,6 +1683,8 @@ function main_upgrade($oldversion=0) {
         modify_database('',"CREATE INDEX prefix_role_capabilities_roleid_idx ON prefix_role_capabilities (roleid);");
         modify_database('',"CREATE INDEX prefix_role_capabilities_contextid_idx ON prefix_role_capabilities (contextid);");
         modify_database('',"CREATE INDEX prefix_role_capabilities_modifierid_idx ON prefix_role_capabilities (modifierid);");
+        // MDL-10640  adding missing index from upgrade
+        modify_database('',"CREATE INDEX prefix_role_capabilities_capability_idx ON prefix_role_capabilities (capability);");
         modify_database('',"CREATE UNIQUE INDEX prefix_role_capabilities_roleidcontextidcapability_idx ON prefix_role_capabilities (roleid, contextid, capability);"); 
         modify_database('',"CREATE INDEX prefix_role_deny_grant_roleid_idx ON prefix_role_deny_grant (roleid);");
         modify_database('',"CREATE INDEX prefix_role_deny_grant_unviewableroleid_idx ON prefix_role_deny_grant (unviewableroleid);");