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

diff --git a/mod/journal/db/mysql.php b/mod/journal/db/mysql.php
index 3a04c46bf1ab0bb54d0fecf39e896f6ae4c9a4dd..18943707b4172b5d067b7bea85f9701cc0553d68 100644 (file)
--- a/mod/journal/db/mysql.php
+++ b/mod/journal/db/mysql.php
@@ -47,6 +47,15 @@ function journal_upgrade($oldversion) {
         table_column("journal", "", "introformat", "integer", "2", "", "1", "not null", "intro");
     }
 
+    if ($oldversion < 2004111200) {
+        execute_sql("ALTER TABLE {$CFG->prefix}journal DROP INDEX course;",false);
+        execute_sql("ALTER TABLE {$CFG->prefix}journal_entries DROP INDEX journal;",false);
+        execute_sql("ALTER TABLE {$CFG->prefix}journal_entries DROP INDEX userid;",false); 
+
+        modify_database('','ALTER TABLE prefix_journal ADD INDEX course (course);');
+        modify_database('','ALTER TABLE prefix_journal_entries ADD INDEX journal (journal);');
+        modify_database('','ALTER TABLE prefix_journal_entries ADD INDEX userid (userid);');
+    }
     
     return $result;
 }

diff --git a/mod/journal/db/mysql.sql b/mod/journal/db/mysql.sql
index e1c259aa4f24265b8d21341366eaf8a764822fe1..09af26dbd56c82910ab93d3f2797180b4b5c3d2a 100755 (executable)
--- a/mod/journal/db/mysql.sql
+++ b/mod/journal/db/mysql.sql
@@ -23,7 +23,8 @@ CREATE TABLE prefix_journal (
   days smallint(5) unsigned NOT NULL default '7',\r
   assessed int(10) NOT NULL default '0',\r
   timemodified int(10) unsigned NOT NULL default '0',\r
-  PRIMARY KEY  (id)\r
+  PRIMARY KEY  (id),\r
+  KEY course (course)\r
 ) TYPE=MyISAM;\r
 # --------------------------------------------------------\r
 \r
@@ -43,7 +44,9 @@ CREATE TABLE prefix_journal_entries (
   teacher int(10) unsigned NOT NULL default '0',\r
   timemarked int(10) unsigned NOT NULL default '0',\r
   mailed int(1) unsigned NOT NULL default '0',\r
-  PRIMARY KEY  (id)\r
+  PRIMARY KEY  (id), \r
+  KEY journal (journal),\r
+  KEY userid (userid)\r
 ) TYPE=MyISAM COMMENT='All the journal entries of all people';\r
 \r
 #\r

diff --git a/mod/journal/db/postgres7.php b/mod/journal/db/postgres7.php
index ae35336ac1c34e4d9991627f1f4dc406e2fa20a7..1bcb635b47f9f75e545e62a0e6df76b375a0f0f3 100644 (file)
--- a/mod/journal/db/postgres7.php
+++ b/mod/journal/db/postgres7.php
@@ -30,6 +30,15 @@ function journal_upgrade($oldversion) {
         table_column("journal", "", "introformat", "integer", "2", "", "1", "not null", "intro");
     }
 
+    if ($oldversion < 2004111200) {
+        execute_sql("DROP INDEX {$CFG->prefix}journal_course_idx;",false);
+        execute_sql("DROP INDEX {$CFG->prefix}journal_entries_journal_idx;",false);
+        execute_sql("DROP INDEX {$CFG->prefix}journal_entries_userid_idx;",false);
+
+        modify_database('','CREATE INDEX prefix_journal_course_idx ON prefix_journal (course);');
+        modify_database('','CREATE INDEX prefix_journal_entries_journal_idx ON prefix_journal_entries (journal);');
+        modify_database('','CREATE INDEX prefix_journal_entries_userid_idx ON prefix_journal_entries (userid);');
+    }
 
     return $result;
 }

diff --git a/mod/journal/db/postgres7.sql b/mod/journal/db/postgres7.sql
index 8b5dbecc6b054bcb115765fba23d2aed59a18618..b740ff7a3c3761ea242ad5af2035219d623330eb 100755 (executable)
--- a/mod/journal/db/postgres7.sql
+++ b/mod/journal/db/postgres7.sql
@@ -24,6 +24,9 @@ CREATE TABLE prefix_journal (
   assessed integer NOT NULL default '0',
   timemodified integer NOT NULL default '0'
 );
+
+CREATE INDEX prefix_journal_course_idx ON prefix_journal (course);
+
 # --------------------------------------------------------
 
 #
@@ -44,6 +47,9 @@ CREATE TABLE prefix_journal_entries (
   mailed integer NOT NULL default '0'
 );
 
+CREATE INDEX prefix_journal_entries_journal_idx ON prefix_journal_entries (journal);
+CREATE INDEX prefix_journal_entries_userid_idx ON prefix_journal_entries (userid);
+
 #
 # Dumping data for table `log_display`
 #

diff --git a/mod/journal/version.php b/mod/journal/version.php
index c0e8b819c70172629a2a308250d481c15feb6d51..7160d69fd501f23f5e89f48fb05202c9ed198084 100644 (file)
--- a/mod/journal/version.php
+++ b/mod/journal/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     = 60;