Merged from MOODLE_14_STABLE: Indexes and version bump for choice

diff --git a/mod/choice/db/mysql.php b/mod/choice/db/mysql.php
index 5a5449d04b6dd158f26d0fd80721fad51b4d251c..68438233dbb8ef119443dc6e7a425e670e19c498 100644 (file)
--- a/mod/choice/db/mysql.php
+++ b/mod/choice/db/mysql.php
@@ -43,6 +43,15 @@ function choice_upgrade($oldversion) {
         modify_database("", "UPDATE prefix_choice SET publish = publish - 1 WHERE publish > 0;");
     }
 
+    if ($oldversion < 2004111200){  // drop first to avoid conflicts when upgrading from 1.4+
+        execute_sql('ALTER TABLE prefix_choice DROP INDEX course;',false);
+        execute_sql('ALTER TABLE prefix_choice_answers DROP INDEX choice;',false);
+        execute_sql('ALTER TABLE prefix_choice_answers DROP INDEX userid;',false);
+
+        modify_database('','ALTER TABLE prefix_choice ADD INDEX course (course);');
+        modify_database('','ALTER TABLE prefix_choice_answers ADD INDEX choice (choice);');
+        modify_database('','ALTER TABLE prefix_choice_answers ADD INDEX userid (userid);');
+    }
 
     return true;
 }

diff --git a/mod/choice/db/mysql.sql b/mod/choice/db/mysql.sql
index 8c2cbea7453eb873ba34fa3ae6352769f80f38cf..40640e38062b6633a73677265811022a11feb068 100755 (executable)
--- a/mod/choice/db/mysql.sql
+++ b/mod/choice/db/mysql.sql
@@ -34,7 +34,8 @@ CREATE TABLE prefix_choice (
   timeclose int(10) unsigned NOT NULL default '0',\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 COMMENT='Available choices are stored here.';\r
 \r
 \r
@@ -51,7 +52,9 @@ CREATE TABLE prefix_choice_answers (
   answer tinyint(4) NOT NULL default '0',\r
   timemodified int(10) NOT NULL default '0',\r
   PRIMARY KEY  (id),\r
-  UNIQUE KEY id (id)\r
+  UNIQUE KEY id (id),\r
+  KEY userid (userid),\r
+  KEY choice (choice)\r
 ) TYPE=MyISAM;\r
 \r
 #\r

diff --git a/mod/choice/db/postgres7.php b/mod/choice/db/postgres7.php
index 75440914f50186c0e4a6b7ed5ffdc7e80c383be6..4c126e2d9c8247fd318d876e0cb8879379fbae87 100644 (file)
--- a/mod/choice/db/postgres7.php
+++ b/mod/choice/db/postgres7.php
@@ -29,6 +29,16 @@ function choice_upgrade($oldversion) {
         modify_database("", "UPDATE prefix_choice SET publish = publish - 1 WHERE publish > 0;");
     }
 
+    if ($oldversion < 2004111200) { // drop first to avoid conflicts when upgrading from 1.4+
+        execute_sql('DROP INDEX prefix_choice_course_idx;',false);
+        execute_sql('DROP INDEX prefix_choice_answers_choice_idx;',false);
+        execute_sql('DROP INDEX prefix_choice_answers_userid_idx;',false);
+
+        modify_database('','CREATE INDEX prefix_choice_course_idx ON prefix_choice (course);');
+        modify_database('','CREATE INDEX prefix_choice_answers_choice_idx ON prefix_choice_answers (choice);');
+        modify_database('','CREATE INDEX prefix_choice_answers_userid_idx ON prefix_choice_answers (userid);');
+    }
+
     return true;
 }
 

diff --git a/mod/choice/db/postgres7.sql b/mod/choice/db/postgres7.sql
index 114425c294a4c78a8d700c54a2544f595e8f1b29..8243254f733dca2dbfe1acef764b3ba40cee27a5 100755 (executable)
--- a/mod/choice/db/postgres7.sql
+++ b/mod/choice/db/postgres7.sql
@@ -35,6 +35,7 @@ CREATE TABLE prefix_choice (
   timemodified integer NOT NULL default '0'
 );
 
+CREATE INDEX prefix_choice_course_idx ON prefix_choice (course);
 
 # --------------------------------------------------------
 
@@ -50,6 +51,9 @@ CREATE TABLE prefix_choice_answers (
   timemodified integer NOT NULL default '0'
 );
 
+CREATE INDEX prefix_choice_answers_choice_idx ON prefix_choice_answers (choice);
+CREATE INDEX prefix_choice_answers_userid_idx ON prefix_choice_answers (userid);
+
 #
 # Dumping data for table `log_display`
 #

diff --git a/mod/choice/version.php b/mod/choice/version.php
index 29f584bf035c3e4b25adec571a72a14cde873e7b..d5c7b29cd34dfeed255daef03b2ecced9f1b0376 100644 (file)
--- a/mod/choice/version.php
+++ b/mod/choice/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2004070102;
+$module->version  = 2004111200;
 $module->requires = 2004052505;  // Requires this Moodle version
 $module->cron     = 0;