More updates, but wiki is still working only partical.

diff --git a/mod/wiki/db/postgres7.php b/mod/wiki/db/postgres7.php
index b6e7a1b7e574fff5a8cae017d7f36050d4db5aad..b3db1fafc92f7d0eedb76b227e25e106b46048bf 100644 (file)
--- a/mod/wiki/db/postgres7.php
+++ b/mod/wiki/db/postgres7.php
@@ -12,7 +12,12 @@ function wiki_upgrade($oldversion) {
        modify_database("", "ALTER TABLE ONLY prefix_wiki_pages 
                             ADD CONSTRAINT id PRIMARY KEY (pagename, \"version\");"); 
     }    
+    if ($oldversion < 2004073001) {
 
+       modify_database("", "ALTER TABLE prefix_wiki_pages DROP CONSTRAINT id;"); 
+       modify_database("", "ALTER TABLE ONLY prefix_wiki_pages 
+                            ADD CONSTRAINT id PRIMARY KEY (pagename, \"version\", wiki);"); 
+    }
     return true;
 }
 

diff --git a/mod/wiki/db/postgres7.sql b/mod/wiki/db/postgres7.sql
index 7ed97cdc64e4b642f4572f0d0fa241a8d0704b30..2cf8eb4450fac188e5368356793222cb8b205748 100644 (file)
--- a/mod/wiki/db/postgres7.sql
+++ b/mod/wiki/db/postgres7.sql
@@ -55,6 +55,6 @@ CREATE TABLE prefix_wiki_pages (
 ) ;
 
 ALTER TABLE ONLY prefix_wiki_pages
-    ADD CONSTRAINT id PRIMARY KEY (pagename, "version");
+    ADD CONSTRAINT id PRIMARY KEY (pagename, version, wiki);
 
 CREATE INDEX prefix_wiki_pages_pagename_version_wiki_idx ON prefix_wiki_pages (pagename, version, wiki) ;

diff --git a/mod/wiki/version.php b/mod/wiki/version.php
index 930081f2883c0f7b0dc28b983c1944f2891cdf14..65719e4ddbe55875da3886897facbaf4911aaf6a 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  = 2004073000;  // The current module version (Date: YYYYMMDDXX)
+$module->version  = 2004073001;  // The current module version (Date: YYYYMMDDXX)
 $module->cron     = 0;           // Period for cron to check this module (secs)
 
 ?>