merging changes from MOODLE_16_STABLE

diff --git a/mod/scorm/db/postgres7.php b/mod/scorm/db/postgres7.php
index 72484abc175ca84be71dd9e63ad0bfc3fc3d4f4f..23f18ab85b12367f4a813e13371bf2e5fdfdb648 100755 (executable)
--- 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 b1786b637fcc27f1be30961e57b2396fa111114e..da338e649f9c038b3be1eeba66ba72ee4fc52c3c 100644 (file)
--- 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');
     }