From: mjollnir_ <mjollnir_>
Date: Fri, 19 Nov 2004 05:00:40 +0000 (+0000)
Subject: Merged from MOODLE_14_STABLE: Indexes for resource and version bump (honoring partial... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a5e2b34dac72a5480220e4d84ce7e12500dbddad;p=moodle.git

Merged from MOODLE_14_STABLE: Indexes for resource and version bump (honoring partial freeze)
---

diff --git a/mod/resource/db/mysql.php b/mod/resource/db/mysql.php
index 064724759f..b306a4122b 100644
--- 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 12cc8b9ed2..87a8367ea8 100755
--- 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 '',
   timemodified int(10) unsigned NOT NULL default '0',
   PRIMARY KEY  (id),
-  UNIQUE KEY id (id)
+  UNIQUE KEY id (id),
+  KEY `course` (`course`)
 ) TYPE=MyISAM;
 
 
diff --git a/mod/resource/db/postgres7.php b/mod/resource/db/postgres7.php
index 9392f337ea..96310d7fda 100644
--- 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 8c1286f01a..2a619077e9 100644
--- 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 120987655b..615270d86c 100644
--- 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;