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

diff --git a/mod/survey/db/mysql.php b/mod/survey/db/mysql.php
index b92616ec14837d748cdd60c4e690ffd1690e09a1..d5000bb77032632a0667425fe4c0e368fc40fa24 100644 (file)
--- a/mod/survey/db/mysql.php
+++ b/mod/survey/db/mysql.php
@@ -177,6 +177,22 @@ function survey_upgrade($oldversion) {
         modify_database("", "INSERT INTO prefix_log_display VALUES ('survey', 'update', 'survey', 'name');");
     }
 
+    if ($oldversion < 2004111200) {
+        execute_sql("ALTER TABLE {$CFG->prefix}survey DROP INDEX course;",false);
+        execute_sql("ALTER TABLE {$CFG->prefix}survey_analysis DROP INDEX survey;",false);
+        execute_sql("ALTER TABLE {$CFG->prefix}survey_analysis DROP INDEX userid;",false);
+        execute_sql("ALTER TABLE {$CFG->prefix}survey_answers DROP INDEX userid;",false); 
+        execute_sql("ALTER TABLE {$CFG->prefix}survey_answers DROP INDEX survey;",false); 
+        execute_sql("ALTER TABLE {$CFG->prefix}survey_answers DROP INDEX question;",false);
+
+        modify_database('','ALTER TABLE prefix_survey ADD INDEX course (course);');
+        modify_database('','ALTER TABLE prefix_survey_analysis ADD INDEX survey (survey);');
+        modify_database('','ALTER TABLE prefix_survey_analysis ADD INDEX userid (userid);');
+        modify_database('','ALTER TABLE prefix_survey_answers ADD INDEX userid (userid);');
+        modify_database('','ALTER TABLE prefix_survey_answers ADD INDEX survey (survey);');
+        modify_database('','ALTER TABLE prefix_survey_answers ADD INDEX question (question);');
+    }
+
     return true;
 }
 

diff --git a/mod/survey/db/mysql.sql b/mod/survey/db/mysql.sql
index 16f73eb24c1a1177f50539626b8f7eaa2ba86399..92e8fd610b7f83b0ec0dd8c57ea3288c262c88b9 100755 (executable)
--- a/mod/survey/db/mysql.sql
+++ b/mod/survey/db/mysql.sql
@@ -24,7 +24,8 @@ CREATE TABLE prefix_survey (
   name varchar(255) NOT NULL default '',\r
   intro text,\r
   questions varchar(255) default NULL,\r
-  PRIMARY KEY  (id)\r
+  PRIMARY KEY  (id), \r
+  KEY `course` (`course`)\r
 ) TYPE=MyISAM COMMENT='all surveys';\r
 \r
 #\r
@@ -49,7 +50,9 @@ CREATE TABLE prefix_survey_analysis (
   userid int(10) unsigned NOT NULL default '0',\r
   notes text NOT NULL,\r
   PRIMARY KEY  (id),\r
-  UNIQUE KEY id (id)\r
+  UNIQUE KEY id (id),\r
+  KEY survey (survey),\r
+  KEY userid (userid)\r
 ) TYPE=MyISAM;\r
 \r
 #\r
@@ -71,7 +74,10 @@ CREATE TABLE prefix_survey_answers (
   answer1 text default NULL,\r
   answer2 text default NULL,\r
   PRIMARY KEY  (id),\r
-  UNIQUE KEY id (id)\r
+  UNIQUE KEY id (id),\r
+  KEY userid (userid),\r
+  KEY survey (survey),\r
+  KEY question (question)\r
 ) TYPE=MyISAM;\r
 \r
 #\r

diff --git a/mod/survey/db/postgres7.php b/mod/survey/db/postgres7.php
index 52fe958f930257552f6a27986d9cee657b95eaad..c4a9a28cafb69d5175fc3773e188b69838b5f816 100644 (file)
--- a/mod/survey/db/postgres7.php
+++ b/mod/survey/db/postgres7.php
@@ -24,6 +24,21 @@ function survey_upgrade($oldversion) {
         modify_database("", "INSERT INTO prefix_log_display VALUES ('survey', 'update', 'survey', 'name');");
     }
 
+    if ($oldversion < 2004111200) { 
+        execute_sql("DROP INDEX {$CFG->prefix}survey_course_idx;",false);
+        execute_sql("DROP INDEX {$CFG->prefix}survey_analysis_survey_idx;",false); 
+        execute_sql("DROP INDEX {$CFG->prefix}survey_analysis_userid_idx;",false); 
+        execute_sql("DROP INDEX {$CFG->prefix}survey_answers_userid_idx;",false);
+        execute_sql("DROP INDEX {$CFG->prefix}survey_answers_survey_idx;",false); 
+        execute_sql("DROP INDEX {$CFG->prefix}survey_answers_question_idx;",false);
+
+        modify_database('','CREATE INDEX prefix_survey_course_idx ON prefix_survey (course);');
+        modify_database('','CREATE INDEX prefix_survey_analysis_survey_idx ON prefix_survey_analysis (survey);');
+        modify_database('','CREATE INDEX prefix_survey_analysis_userid_idx ON prefix_survey_analysis (userid);');
+        modify_database('','CREATE INDEX prefix_survey_answers_userid_idx ON prefix_survey_answers (userid);');
+        modify_database('','CREATE INDEX prefix_survey_answers_survey_idx ON prefix_survey_answers (survey);');
+        modify_database('','CREATE INDEX prefix_survey_answers_question_idx ON prefix_survey_answers (question);');
+    }
     return true;
 }
 

diff --git a/mod/survey/db/postgres7.sql b/mod/survey/db/postgres7.sql
index e86549ce8d32c91ae374d7f5882b9cef0a5c29b6..cdd9c727f51c899c9c72b7a537ee47aea41d1d87 100755 (executable)
--- a/mod/survey/db/postgres7.sql
+++ b/mod/survey/db/postgres7.sql
@@ -26,6 +26,8 @@ CREATE TABLE prefix_survey (
   questions varchar(255) default NULL
 );
 
+CREATE INDEX prefix_survey_course_idx ON prefix_survey (course);
+
 #
 # Dumping data for table survey
 #
@@ -49,6 +51,9 @@ CREATE TABLE prefix_survey_analysis (
   notes text NOT NULL default ''
 );
 
+CREATE INDEX prefix_survey_analysis_survey_idx ON prefix_survey_analysis (survey);
+CREATE INDEX prefix_survey_analysis_userid_idx ON prefix_survey_analysis (userid);
+
 #
 # Dumping data for table survey_analysis
 #
@@ -69,6 +74,10 @@ CREATE TABLE prefix_survey_answers (
   answer2 text default NULL
 );
 
+CREATE INDEX prefix_survey_answers_userid_idx ON prefix_survey_answers (userid);
+CREATE INDEX prefix_survey_answers_survey_idx ON prefix_survey_answers (survey);
+CREATE INDEX prefix_survey_answers_question_idx ON prefix_survey_answers (question);
+
 #
 # Dumping data for table survey_answers
 #

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