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

diff --git a/mod/wiki/db/mysql.php b/mod/wiki/db/mysql.php
index 9104d2b88029692981b47e9a4deb91f5bffeeb7f..ec9a2079814533afde55802bbd4502eeddb9d7f4 100644 (file)
--- a/mod/wiki/db/mysql.php
+++ b/mod/wiki/db/mysql.php
@@ -71,6 +71,22 @@ function wiki_upgrade($oldversion) {
         }
     }
 
+    if ($oldversion < 2004111200) {
+        execute_sql("ALTER TABLE {$CFG->prefix}wiki DROP INDEX course;",false);
+        execute_sql("ALTER TABLE {$CFG->prefix}wiki_entries DROP INDEX course;",false); 
+        execute_sql("ALTER TABLE {$CFG->prefix}wiki_entries DROP INDEX userid;",false); 
+        execute_sql("ALTER TABLE {$CFG->prefix}wiki_entries DROP INDEX groupid;",false);
+        execute_sql("ALTER TABLE {$CFG->prefix}wiki_entries DROP INDEX wikiid;",false); 
+        execute_sql("ALTER TABLE {$CFG->prefix}wiki_entries DROP INDEX pagename;",false);
+
+        modify_database('','ALTER TABLE prefix_wiki ADD INDEX course (course);');
+        modify_database('','ALTER TABLE prefix_wiki_entries ADD INDEX course (course);');
+        modify_database('','ALTER TABLE prefix_wiki_entries ADD INDEX userid (userid);');
+        modify_database('','ALTER TABLE prefix_wiki_entries ADD INDEX groupid (groupid);');
+        modify_database('','ALTER TABLE prefix_wiki_entries ADD INDEX wikiid (wikiid);');
+        modify_database('','ALTER TABLE prefix_wiki_entries ADD INDEX pagename (pagename);');
+    }
+
     return true;
 }
 

diff --git a/mod/wiki/db/mysql.sql b/mod/wiki/db/mysql.sql
index cb6e0885b185f54119b28c217240e28d0be6a124..2a9cd06e03d68f3e7bb246029824f31f06ba8b3e 100644 (file)
--- a/mod/wiki/db/mysql.sql
+++ b/mod/wiki/db/mysql.sql
@@ -22,7 +22,8 @@ CREATE TABLE `prefix_wiki` (
   `revertchanges` tinyint(4) NOT NULL default '1',
   `initialcontent` varchar(255) default NULL,
   `timemodified` int(10) NOT NULL default '0',
-  PRIMARY KEY  (`id`)
+  PRIMARY KEY  (`id`),
+  KEY `course` (`course`)
 ) TYPE=MyISAM COMMENT='Main wiki table';
 
 
@@ -38,7 +39,12 @@ CREATE TABLE `prefix_wiki_entries` (
   `userid` int(10) NOT NULL default '0',
   `pagename` varchar(255) NOT NULL default '',
   `timemodified` int(10) NOT NULL default '0',
-  PRIMARY KEY  (`id`)
+  PRIMARY KEY  (`id`),
+  KEY `wikiid` (`wikiid`),
+  KEY `course` (`course`),
+  KEY `gropuid` (`groupid`),
+  KEY `userid` (`userid`),
+  KEY `pagename` (`pagename`)
 ) TYPE=MyISAM COMMENT='Holds entries for each wiki start instance.';
 
 

diff --git a/mod/wiki/db/postgres7.php b/mod/wiki/db/postgres7.php
index 3d8d2bf9946aaf58f6affee7986a175829c7f0c6..e9b0089809dcca703ed0c159fd0888c6cb410570 100644 (file)
--- a/mod/wiki/db/postgres7.php
+++ b/mod/wiki/db/postgres7.php
@@ -36,6 +36,23 @@ function wiki_upgrade($oldversion) {
             }
         }
     }
+    
+    if ($oldversion < 2004111200) {
+        execute_sql("DROP INDEX {$CFG->prefix}wiki_course_idx;",false);
+        execute_sql("DROP INDEX {$CFG->prefix}wiki_entries_wikiid_idx;",false); 
+        execute_sql("DROP INDEX {$CFG->prefix}wiki_entries_userid_idx;",false); 
+        execute_sql("DROP INDEX {$CFG->prefix}wiki_entries_groupid_idx;",false);
+        execute_sql("DROP INDEX {$CFG->prefix}wiki_entries_course_idx;",false); 
+        execute_sql("DROP INDEX {$CFG->prefix}wiki_entries_pagename_idx;",false);
+
+        modify_database('','CREATE INDEX prefix_wiki_course_idx ON prefix_wiki (course);');
+        modify_database('','CREATE INDEX prefix_wiki_entries_wikiid_idx ON prefix_wiki_entries (wikiid);');
+        modify_database('','CREATE INDEX prefix_wiki_entries_userid_idx ON prefix_wiki_entries (userid);');
+        modify_database('','CREATE INDEX prefix_wiki_entries_groupid_idx ON prefix_wiki_entries (groupid);');
+        modify_database('','CREATE INDEX prefix_wiki_entries_course_idx ON prefix_wiki_entries (course);');
+        modify_database('','CREATE INDEX prefix_wiki_entries_pagename_idx ON prefix_wiki_entries (pagename);');
+    }
+    
     return true;
 }
 

diff --git a/mod/wiki/db/postgres7.sql b/mod/wiki/db/postgres7.sql
index 4f66660cdae7f716aed5c53eb3066b996311097d..3a14eead5bc796a96198544d096253704dcf1ea6 100644 (file)
--- a/mod/wiki/db/postgres7.sql
+++ b/mod/wiki/db/postgres7.sql
@@ -24,6 +24,7 @@ CREATE TABLE prefix_wiki (
   timemodified INT8 NOT NULL default '0'
 ) ;
 
+CREATE INDEX prefix_wiki_course_idx ON prefix_wiki (course);
 
 #
 # Table structure for table mdl_wiki_entries
@@ -39,6 +40,12 @@ CREATE TABLE prefix_wiki_entries (
   timemodified INT8 NOT NULL default '0'
 ) ;
 
+CREATE INDEX prefix_wiki_entries_wikiid_idx ON prefix_wiki_entries (wikiid);
+CREATE INDEX prefix_wiki_entries_userid_idx ON prefix_wiki_entries (userid);
+CREATE INDEX prefix_wiki_entries_groupid_idx ON prefix_wiki_entries (groupid);
+CREATE INDEX prefix_wiki_entries_course_idx ON prefix_wiki_entries (course);
+CREATE INDEX prefix_wiki_entries_pagename_idx ON prefix_wiki_entries (pagename);
+
 
 CREATE TABLE prefix_wiki_pages (
   pagename VARCHAR(160) NOT NULL,

diff --git a/mod/wiki/version.php b/mod/wiki/version.php
index 63c258e4db8887dd1e9ea94e463ada6463754aa9..c2936d3c85ea3951579e353fd995022f423cf8a8 100644 (file)
--- a/mod/wiki/version.php
+++ b/mod/wiki/version.php
@@ -5,7 +5,7 @@
 ///  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 /////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2004110200;  // The current module version (Date: YYYYMMDDXX)
+$module->version  = 2004111200;  // The current module version (Date: YYYYMMDDXX)
 $module->requires = 2004110200;  // The current module version (Date: YYYYMMDDXX)
 $module->cron     = 0;           // Period for cron to check this module (secs)