Fixed uncorrect primary key for postgresql.

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

diff --git a/mod/wiki/db/postgres7.sql b/mod/wiki/db/postgres7.sql
index 4a80df806f8b77217726d8179b9d58b60d315777..7ed97cdc64e4b642f4572f0d0fa241a8d0704b30 100644 (file)
--- a/mod/wiki/db/postgres7.sql
+++ b/mod/wiki/db/postgres7.sql
@@ -41,7 +41,6 @@ CREATE TABLE prefix_wiki_entries (
 
 
 CREATE TABLE prefix_wiki_pages (
-  id SERIAL PRIMARY KEY,
   pagename VARCHAR(160) NOT NULL,
   version INTEGER  NOT NULL DEFAULT 0,
   flags INTEGER  DEFAULT 0,
@@ -55,4 +54,7 @@ CREATE TABLE prefix_wiki_pages (
   wiki INT8  NOT NULL
 ) ;
 
+ALTER TABLE ONLY prefix_wiki_pages
+    ADD CONSTRAINT id PRIMARY KEY (pagename, "version");
+
 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 b46f4f9007f30ef70d4d007a2e6cb0ecf94124ac..930081f2883c0f7b0dc28b983c1944f2891cdf14 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  = 2004062400;  // The current module version (Date: YYYYMMDDXX)
+$module->version  = 2004073000;  // The current module version (Date: YYYYMMDDXX)
 $module->cron     = 0;           // Period for cron to check this module (secs)
 
 ?>