MDL-11888 Added unique constraint.

diff --git a/lib/db/install.xml b/lib/db/install.xml
index 69b53b2f7fbd53d6f4b97bfba55c78278ad0bb84..ab9b8c55b432185658cb12f2b8cb2b8ff949175d 100644 (file)
--- a/lib/db/install.xml
+++ b/lib/db/install.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="lib/db" VERSION="20080229" COMMENT="XMLDB file for core Moodle tables"
+<XMLDB PATH="lib/db" VERSION="20080307" COMMENT="XMLDB file for core Moodle tables"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../../lib/xmldb/xmldb.xsd"
 >
@@ -1617,7 +1617,7 @@
         <KEY NAME="primary" TYPE="primary" FIELDS="id"/>
       </KEYS>
       <INDEXES>
-        <INDEX NAME="contextid-lowerboundary" UNIQUE="false" FIELDS="contextid, lowerboundary" COMMENT="index used when fetching context letters"/>
+        <INDEX NAME="contextid-lowerboundary-letter" UNIQUE="true" FIELDS="contextid, lowerboundary, letter" COMMENT="index used when fetching context letters"/>
       </INDEXES>
     </TABLE>
     <TABLE NAME="cache_flags" COMMENT="Cache of time-sensitive flags" PREVIOUS="grade_letters" NEXT="grade_settings">

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 40d5fa16cf13b5991f5af09ba106058e0ff2d504..0ceac471e9f372442ba4101621d99fd392d548c4 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2950,6 +2950,31 @@ function xmldb_main_upgrade($oldversion=0) {
         set_field('grade_items', 'needsupdate', 1, 'needsupdate', 0);
     }
 
+    if ($result && $oldversion < 2008030700) {
+
+    /// Define index contextid-lowerboundary (not unique) to be dropped form grade_letters
+        $table = new XMLDBTable('grade_letters');
+        $index = new XMLDBIndex('contextid-lowerboundary');
+        $index->setAttributes(XMLDB_INDEX_NOTUNIQUE, array('contextid', 'lowerboundary'));
+
+    /// Launch drop index contextid-lowerboundary
+        $result = $result && drop_index($table, $index);
+
+    /// Main savepoint reached
+        upgrade_main_savepoint($result, 2008030700); 
+
+    /// Define index contextid-lowerboundary-letter (unique) to be added to grade_letters
+        $table = new XMLDBTable('grade_letters');
+        $index = new XMLDBIndex('contextid-lowerboundary-letter');
+        $index->setAttributes(XMLDB_INDEX_UNIQUE, array('contextid', 'lowerboundary', 'letter'));
+
+    /// Launch add index contextid-lowerboundary-letter
+        $result = $result && add_index($table, $index);
+
+    /// Main savepoint reached
+        upgrade_main_savepoint($result, 2008030700); 
+    }    
+
     return $result;
 }
 

diff --git a/version.php b/version.php
index 4ec03ecbf35f07c4611c66edc94dfa0d94c92ae4..6b67499ee5b3360a9ebbbd05a6ecead9a702a428 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,9 +6,9 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2008030500;  // YYYYMMDD   = date of the last version bump
+    $version = 2008030700;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
-    $release = '2.0 dev (Build: 20080305)';  // Human-friendly version name
+    $release = '2.0 dev (Build: 20080307)';  // Human-friendly version name
 
 ?>