name should be unique key, and should be length 255

diff --git a/lib/db/migrate2utf8.xml b/lib/db/migrate2utf8.xml
index 7811e61f20abec9b024055a07fadda7cdcf7ef12..433ab2493f5db525dde08a219cca9c9960896467 100755 (executable)
--- a/lib/db/migrate2utf8.xml
+++ b/lib/db/migrate2utf8.xml
@@ -40,7 +40,7 @@
     
        <TABLE name="capabilities">
          <FIELDS>
-           <FIELD name="name" method="NO_CONV" type="varchar" length="255" dropindex="name" addindex ="name(name(150))" />
+           <FIELD name="name" method="NO_CONV" type="varchar" length="255" dropindex="name" adduniqueindex ="name(name(255))" />
                <FIELD name="captype" method="NO_CONV" type="varchar" length="50" />
                <FIELD name="component" method="NO_CONV" type="varchar" length="100" />         
       </FIELDS>

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 56117a1167fcceadb0aec7fedbb7c25089a2b343..f00004054c70a9c1ab577614636333acd0184bd6 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -2094,7 +2094,7 @@ function main_upgrade($oldversion=0) {
         execute_sql("ALTER TABLE `{$CFG->prefix}role_deny_grant` ADD INDEX `unviewableroleid` (`unviewableroleid`)",true);    
         execute_sql("ALTER TABLE `{$CFG->prefix}role_deny_grant` ADD UNIQUE INDEX `roleid-unviewableroleid` (`roleid`, `unviewableroleid`)",true);         
        
-        execute_sql("ALTER TABLE `{$CFG->prefix}capabilities` ADD INDEX `name` (`name`)",true); 
+        execute_sql("ALTER TABLE `{$CFG->prefix}capabilities` ADD UNIQUE INDEX `name` (`name`)",true); 
                              
         execute_sql("ALTER TABLE `{$CFG->prefix}role_names` ADD INDEX `roleid` (`roleid`)",true);                         
         execute_sql("ALTER TABLE `{$CFG->prefix}role_names` ADD INDEX `contextid` (`contextid`)",true); 

diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 7737809e858d133d8212628c7268a6f46e1f5ba4..bbb1cc415d33ff231516b60a613a24bf083aa503 100644 (file)
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -972,7 +972,7 @@ CREATE TABLE prefix_capabilities (
   `captype` varchar(50) NOT NULL default '', 
   `contextlevel` int(10) unsigned NOT NULL default '0', 
   `component` varchar(100) NOT NULL default '', 
-  KEY `name` (`name`),
+  UNIQUE KEY `name` (`name`),
   PRIMARY KEY (`id`) 
 ) TYPE=MYISAM COMMENT ='this defines all capabilities';
 

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index ab36a4c56a1dede3c14999577b15f096e05037ea..586249f976b1a27c8ccf8642071cbce29699b60e 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -1696,7 +1696,7 @@ function main_upgrade($oldversion=0) {
         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);");
         modify_database('',"CREATE UNIQUE INDEX prefix_role_deny_grant_roleidunviewableroleid_idx ON prefix_role_deny_grant (roleid, unviewableroleid);");
-        modify_database('',"CREATE INDEX prefix_capabilities_name_idx ON prefix_capabilities (name);");
+        modify_database('',"CREATE UNIQUE INDEX prefix_capabilities_name_idx ON prefix_capabilities (name);");
         modify_database('',"CREATE INDEX prefix_role_names_roleid_idx ON prefix_role_names (roleid);");
         modify_database('',"CREATE INDEX prefix_role_names_contextid_idx ON prefix_role_names (contextid);");
         modify_database('',"CREATE UNIQUE INDEX prefix_role_names_roleidcontextid_idx ON prefix_role_names (roleid, contextid);");     

diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index 320081a5e710dbc058c8b07747bb4ceacf8f179d..9575112309973a5fea3ea8fffeca25dff56ad8f6 100644 (file)
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -736,7 +736,7 @@ CREATE TABLE prefix_capabilities (
   contextlevel integer NOT NULL default 0,   
   component varchar(100) NOT NULL default ''     
 );         
-CREATE INDEX prefix_capabilities_name_idx ON prefix_capabilities (name);
+CREATE UNIQUE INDEX prefix_capabilities_name_idx ON prefix_capabilities (name);
 
 CREATE TABLE prefix_role_names (     
   id SERIAL PRIMARY KEY,