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

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

diff --git a/mod/journal/db/mysql.php b/mod/journal/db/mysql.php
index 3a04c46bf1..18943707b4 100644
--- 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 e1c259aa4f..09af26dbd5 100755
--- 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',
   assessed int(10) NOT NULL default '0',
   timemodified int(10) unsigned NOT NULL default '0',
-  PRIMARY KEY  (id)
+  PRIMARY KEY  (id),
+  KEY course (course)
 ) TYPE=MyISAM;
 # --------------------------------------------------------
 
@@ -43,7 +44,9 @@ CREATE TABLE prefix_journal_entries (
   teacher int(10) unsigned NOT NULL default '0',
   timemarked int(10) unsigned NOT NULL default '0',
   mailed int(1) unsigned NOT NULL default '0',
-  PRIMARY KEY  (id)
+  PRIMARY KEY  (id), 
+  KEY journal (journal),
+  KEY userid (userid)
 ) TYPE=MyISAM COMMENT='All the journal entries of all people';
 
 #
diff --git a/mod/journal/db/postgres7.php b/mod/journal/db/postgres7.php
index ae35336ac1..1bcb635b47 100644
--- 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 8b5dbecc6b..b740ff7a3c 100755
--- 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 c0e8b819c7..7160d69fd5 100644
--- 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;