From: mjollnir_ <mjollnir_>
Date: Sun, 21 Nov 2004 20:43:27 +0000 (+0000)
Subject: Merged from MOODLE_14_STABLE: Indexes for survey and version bump (honoring partial... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=5417b5b07a55137c34a160f627a6b34613ac03f6;p=moodle.git

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

diff --git a/mod/survey/db/mysql.php b/mod/survey/db/mysql.php
index b92616ec14..d5000bb770 100644
--- 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 16f73eb24c..92e8fd610b 100755
--- 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 '',
   intro text,
   questions varchar(255) default NULL,
-  PRIMARY KEY  (id)
+  PRIMARY KEY  (id), 
+  KEY `course` (`course`)
 ) TYPE=MyISAM COMMENT='all surveys';
 
 #
@@ -49,7 +50,9 @@ CREATE TABLE prefix_survey_analysis (
   userid int(10) unsigned NOT NULL default '0',
   notes text NOT NULL,
   PRIMARY KEY  (id),
-  UNIQUE KEY id (id)
+  UNIQUE KEY id (id),
+  KEY survey (survey),
+  KEY userid (userid)
 ) TYPE=MyISAM;
 
 #
@@ -71,7 +74,10 @@ CREATE TABLE prefix_survey_answers (
   answer1 text default NULL,
   answer2 text default NULL,
   PRIMARY KEY  (id),
-  UNIQUE KEY id (id)
+  UNIQUE KEY id (id),
+  KEY userid (userid),
+  KEY survey (survey),
+  KEY question (question)
 ) TYPE=MyISAM;
 
 #
diff --git a/mod/survey/db/postgres7.php b/mod/survey/db/postgres7.php
index 52fe958f93..c4a9a28caf 100644
--- 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 e86549ce8d..cdd9c727f5 100755
--- 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 eb88dbacf5..d5c7b29cd3 100644
--- 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;