From: skodak <skodak>
Date: Mon, 31 Jul 2006 18:21:42 +0000 (+0000)
Subject: merging changes from MOODLE_16_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=bfc38bb2eb1a41808007656b7c05dbddc4549e8b;p=moodle.git

merging changes from MOODLE_16_STABLE
---

diff --git a/mod/scorm/db/postgres7.php b/mod/scorm/db/postgres7.php
index 72484abc17..23f18ab85b 100755
--- a/mod/scorm/db/postgres7.php
+++ b/mod/scorm/db/postgres7.php
@@ -231,6 +231,13 @@ function scorm_upgrade($oldversion) {
 
     if ($oldversion < 2006021401) {
        table_column("scorm", "", "version", "VARCHAR", "9", "", "", "NOT NULL", "reference");
+
+       modify_database('', 'ALTER TABLE prefix_scorm ALTER COLUMN width SET DEFAULT 100');
+       modify_database('', 'ALTER TABLE prefix_scorm ALTER COLUMN height SET DEFAULT 500');
+       // there is an extra constraint key1, we should drop this
+       modify_database('', 'ALTER TABLE prefix_scorm_scoes_track DROP CONSTRAINT prefix_scorm_scoes_track_userid_key1');
+       modify_database('', 'ALTER TABLE prefix_scorm_scoes_track DROP CONSTRAINT prefix_scorm_scoes_track_userid_key');
+       modify_database('', 'ALTER TABLE prefix_scorm_scoes_track ADD CONSTRAINT prefix_scorm_scoes_track_userid_key UNIQUE (userid, scormid, scoid, attempt, element)');
     }
 
     return true;
diff --git a/mod/wiki/db/postgres7.php b/mod/wiki/db/postgres7.php
index b1786b637f..da338e649f 100644
--- a/mod/wiki/db/postgres7.php
+++ b/mod/wiki/db/postgres7.php
@@ -147,9 +147,12 @@ function wiki_upgrade($oldversion) {
 
     if ($oldversion < 2006042801) {
         modify_database('', 'ALTER TABLE prefix_wiki_pages 
-            ALTER COLUMN content SET DEFAULT \'\', 
-            ALTER COLUMN refs SET DEFAULT \'\', 
-            ALTER COLUMN content DROP NOT NULL,
+            ALTER COLUMN content SET DEFAULT \'\'');
+        modify_database('', 'ALTER TABLE prefix_wiki_pages 
+            ALTER COLUMN refs SET DEFAULT \'\'');
+        modify_database('', 'ALTER TABLE prefix_wiki_pages 
+            ALTER COLUMN content DROP NOT NULL');
+        modify_database('', 'ALTER TABLE prefix_wiki_pages 
             ALTER COLUMN refs DROP NOT NULL');
     }