Merged from MOODLE_14_STABLE: Indexes for resource and version bump (honoring partial...

diff --git a/mod/resource/db/mysql.php b/mod/resource/db/mysql.php
index 064724759f7cb5662bbc97f449b98f363832b2b3..b306a4122b20d2f2e77c60317fae534ce6079899 100644 (file)
--- a/mod/resource/db/mysql.php
+++ b/mod/resource/db/mysql.php
@@ -53,6 +53,12 @@ function resource_upgrade($oldversion) {
         rebuild_course_cache();
     }
 
+    if ($oldversion < 2004111200) { //drop first to avoid conflicts when upgrading
+        execute_sql("ALTER TABLE {$CFG->prefix}resource DROP INDEX course;",false);
+
+        modify_database('','ALTER TABLE prefix_resource ADD INDEX course (course);');
+    }
+
     return true;
 }
 

diff --git a/mod/resource/db/mysql.sql b/mod/resource/db/mysql.sql
index 12cc8b9ed2cdd01badfac81573bf675919ec7062..87a8367ea8a031ce43aaf668cd44b186f7c0aa68 100755 (executable)
--- a/mod/resource/db/mysql.sql
+++ b/mod/resource/db/mysql.sql
@@ -26,7 +26,8 @@ CREATE TABLE prefix_resource (
   options varchar(255) NOT NULL default '',\r
   timemodified int(10) unsigned NOT NULL default '0',\r
   PRIMARY KEY  (id),\r
-  UNIQUE KEY id (id)\r
+  UNIQUE KEY id (id),\r
+  KEY `course` (`course`)\r
 ) TYPE=MyISAM;\r
 \r
 \r

diff --git a/mod/resource/db/postgres7.php b/mod/resource/db/postgres7.php
index 9392f337ea3d429182140805874f1e4309585821..96310d7fda85a2e3c297ebd7405b0a7a383bafbd 100644 (file)
--- a/mod/resource/db/postgres7.php
+++ b/mod/resource/db/postgres7.php
@@ -49,6 +49,12 @@ function resource_upgrade($oldversion) {
         rebuild_course_cache();
     }
 
+    if ($oldversion < 2004111200) {//drop first to avoid conflicts when upgrading
+        execute_sql("DROP INDEX {$CFG->prefix}resource_course_idx;",false);
+
+        modify_database('','CREATE INDEX prefix_resource_course_idx ON prefix_resource (course);');
+    }
+    
     return true;
 }
 

diff --git a/mod/resource/db/postgres7.sql b/mod/resource/db/postgres7.sql
index 8c1286f01aab7916bedc60b7bb011697f7946598..2a619077e931295d9146239147a301cf36af141d 100644 (file)
--- a/mod/resource/db/postgres7.sql
+++ b/mod/resource/db/postgres7.sql
@@ -27,6 +27,7 @@ CREATE TABLE prefix_resource (
   timemodified integer NOT NULL default '0'
 );
 
+CREATE INDEX prefix_resource_course_idx ON prefix_resource (course);
 
 #
 # Dumping data for table `log_display`

diff --git a/mod/resource/version.php b/mod/resource/version.php
index 120987655b7e9e04b489f18fd775b14583b7a26f..615270d86c883b908cec3ad188855cee7775cf91 100644 (file)
--- a/mod/resource/version.php
+++ b/mod/resource/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2004110200;
+$module->version  = 2004111200;
 $module->requires = 2004110200;  // Requires this Moodle version
 $module->cron     = 0;