Merge from MOODLE_14_STABLE

Additional fixes for indexes in postgres. A few unique indexes may have been created non-unique. Still deferring the version bump -- please review the patch!

Merge of patchsets
 arch-eduforge@catalyst.net.nz--2004/moodle--eduforge--1.3.3--patch-423
 arch-eduforge@catalyst.net.nz--2004/moodle--eduforge--1.3.3--patch-425

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index e2e454322ba2d04f703ca56851a8ef55506526e8..acf7e94db3daf0236455ef639f4c5eba2f5795d4 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -735,10 +735,10 @@ function main_upgrade($oldversion=0) {
         }
         flush();
 
-       // drop some indexes quietly -- they may or may not exist depending on what version 
-       // the user upgrades from 
+        // drop some indexes quietly -- they may or may not exist depending on what version 
+        // the user upgrades from 
         execute_sql("DROP INDEX {$CFG->prefix}user_students_courseuserid_idx ", false);
-       execute_sql("DROP INDEX {$CFG->prefix}user_students_courseuserid_uk  ", false);        
+        execute_sql("DROP INDEX {$CFG->prefix}user_students_courseuserid_uk  ", false);        
         modify_database('','CREATE UNIQUE INDEX prefix_user_students_courseuserid_uk ON prefix_user_students (course,userid);');        
 
         /// Delete duplicate teacher enrolments 
@@ -752,13 +752,27 @@ function main_upgrade($oldversion=0) {
         }
         flush();
 
-       // drop some indexes quietly -- they may or may not exist depending on what version 
-       // the user upgrades from 
+        // drop some indexes quietly -- they may or may not exist depending on what version 
+        // the user upgrades from 
         execute_sql("DROP INDEX {$CFG->prefix}user_teachers_courseuserid_idx ", false);
-       execute_sql("DROP INDEX {$CFG->prefix}user_teachers_courseuserid_uk  ", false);
+        execute_sql("DROP INDEX {$CFG->prefix}user_teachers_courseuserid_uk  ", false);
         modify_database('','CREATE UNIQUE INDEX prefix_user_teachers_courseuserid_uk ON prefix_user_teachers (course,userid);');        
     } 
     
+    if ($oldversion < 2004112401) {
+        // some postgres databases may have a non-unique index mislabeled unique.
+        fix_course_sortorder(0,0,1);
+        execute_sql("DROP INDEX {$CFG->prefix}course_category_sortorder_uk  ", false);
+        execute_sql("DROP INDEX {$CFG->prefix}course_category_idx  ", false);
+        modify_database('', "CREATE UNIQUE INDEX prefix_course_category_sortorder_uk ON prefix_course(category,sortorder);");
+        
+        // odd! username was missing its unique index!
+        // first silently drop it just in case...
+        execute_sql("DROP INDEX {$CFG->prefix}user_username_uk", false);
+        modify_database('', "CREATE UNIQUE INDEX prefix_user_username_uk ON prefix_user (username);");
+        
+    } 
+    
     return $result;
 }
 

diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index 824de0bf3f91c05c79e4d22c9d370fbbfed7b48c..e928974090483122848f371da12e322f15136525 100644 (file)
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -39,7 +39,7 @@ CREATE TABLE prefix_course (
    timemodified integer NOT NULL default '0'
 );
 
-CREATE INDEX prefix_course_category_idx ON prefix_course (category);
+CREATE UNIQUE INDEX prefix_course_category_sortorder_uk ON prefix_course (category,sortorder);
 CREATE INDEX prefix_course_idnumber_idx ON prefix_course (idnumber);
 CREATE INDEX prefix_course_shortname_idx ON prefix_course (shortname);
 
@@ -259,6 +259,7 @@ CREATE TABLE prefix_user (
    CONSTRAINT prefix_user_username_uk UNIQUE (username)
 );
 
+CREATE UNIQUE INDEX prefix_user_username_uk ON prefix_user (username);
 CREATE INDEX prefix_user_idnumber_idx ON prefix_user (idnumber);
 CREATE INDEX prefix_user_auth_idx ON prefix_user (auth);
 CREATE INDEX prefix_user_deleted_idx ON prefix_user (deleted);