MDL-10990 2) added event table index for calendar block/view ; merged from MOODLE_19_...

diff --git a/lib/db/install.xml b/lib/db/install.xml
index cba90b8e2dc5bff3a4cf12ef612577edd1c00196..35c6a378dccf3fe2ea72c55df836eabfff95af54 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="20080220" COMMENT="XMLDB file for core Moodle tables"
+<XMLDB PATH="lib/db" VERSION="20080226" COMMENT="XMLDB file for core Moodle tables"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../../lib/xmldb/xmldb.xsd"
 >
@@ -234,7 +234,8 @@
         <INDEX NAME="courseid" UNIQUE="false" FIELDS="courseid" NEXT="userid"/>
         <INDEX NAME="userid" UNIQUE="false" FIELDS="userid" PREVIOUS="courseid" NEXT="timestart"/>
         <INDEX NAME="timestart" UNIQUE="false" FIELDS="timestart" PREVIOUS="userid" NEXT="timeduration"/>
-        <INDEX NAME="timeduration" UNIQUE="false" FIELDS="timeduration" PREVIOUS="timestart"/>
+        <INDEX NAME="timeduration" UNIQUE="false" FIELDS="timeduration" PREVIOUS="timestart" NEXT="groupid-courseid-visible-userid"/>
+        <INDEX NAME="groupid-courseid-visible-userid" UNIQUE="false" FIELDS="groupid, courseid, visible, userid" COMMENT="used for calendar view" PREVIOUS="timeduration"/>
       </INDEXES>
     </TABLE>
     <TABLE NAME="cache_filters" COMMENT="For keeping information about cached data" PREVIOUS="event" NEXT="cache_text">
@@ -1681,4 +1682,4 @@
       </SENTENCES>
     </STATEMENT>
   </STATEMENTS>
-</XMLDB>
+</XMLDB>
\ No newline at end of file

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 0af4b0cd108112c36e4b396feb1167ff25144428..b921c92f02a72495aed57c6b1d5120b51f4d8490 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2873,6 +2873,22 @@ function xmldb_main_upgrade($oldversion=0) {
         upgrade_main_savepoint($result, 2007101508.05);
     }
 
+    if ($result && $oldversion < 2007101508.06) {
+
+    /// Define index groupid-courseid-visible-userid (not unique) to be added to event
+        $table = new XMLDBTable('event');
+        $index = new XMLDBIndex('groupid-courseid-visible-userid');
+        $index->setAttributes(XMLDB_INDEX_NOTUNIQUE, array('groupid', 'courseid', 'visible', 'userid'));
+
+    /// Launch add index groupid-courseid-visible-userid
+        if (!index_exists($table, $index)) {
+            $result = $result && add_index($table, $index);
+        }
+
+    /// Main savepoint reached
+        upgrade_main_savepoint($result, 2007101508.06);
+    }
+
 
     return $result;
 }

diff --git a/version.php b/version.php
index a768acc9df2fca3281f1f3985ecdfa99f57e578e..76a5d4bacd5bd8b08abcc70941a7223fd3cb0b04 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2007101508.05;  // YYYYMMDD   = date of the 1.9 branch (don't change)
+    $version = 2007101508.06;  // YYYYMMDD   = date of the 1.9 branch (don't change)
                             //         X  = release number 1.9.[0,1,2,3...]
                             //          Y = micro-increments between releases