mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 04:30:15 +01:00
merging changes from MOODLE_16_STABLE
This commit is contained in:
parent
a8ff58dd2c
commit
bfc38bb2eb
@ -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;
|
||||
|
@ -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');
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user