moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-22992 cleaning repository upgrade path, please note core functions MUST NOT be called from the main upgrade script; the installation of plugins should be handled through each install.php

Browse source
This commit is contained in:
Petr Skoda 2010-07-04 12:36:46 +00:00
parent 37a0892432
commit 1c5f926de9
2 changed files with 3 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

81
lib/db/upgrade.php
View file

@ -693,6 +693,7 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2008081900); upgrade_main_savepoint(true, 2008081900);
} }
if ($oldversion < 2008082602) { if ($oldversion < 2008082602) {
/// Define table repository to be dropped /// Define table repository to be dropped
@ -719,6 +720,7 @@ function xmldb_main_upgrade($oldversion) {
if (!$dbman->table_exists($table)) { if (!$dbman->table_exists($table)) {
$dbman->create_table($table); $dbman->create_table($table);
} }
/// Define table repository_instances to be created /// Define table repository_instances to be created
$table = new xmldb_table('repository_instances'); $table = new xmldb_table('repository_instances');
@ -732,6 +734,7 @@ function xmldb_main_upgrade($oldversion) {
$table->add_field('password', XMLDB_TYPE_CHAR, '255', null, null, null, null); $table->add_field('password', XMLDB_TYPE_CHAR, '255', null, null, null, null);
$table->add_field('timecreated', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, null, null, null); $table->add_field('timecreated', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, null, null, null);
$table->add_field('timemodified', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, null, null, null); $table->add_field('timemodified', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, null, null, null);
$table->add_field('readonly', XMLDB_TYPE_INTEGER, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0');
/// Adding keys to table repository_instances /// Adding keys to table repository_instances
$table->add_key('primary', XMLDB_KEY_PRIMARY, array('id')); $table->add_key('primary', XMLDB_KEY_PRIMARY, array('id'));
@ -792,50 +795,6 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2008082900); upgrade_main_savepoint(true, 2008082900);
} }
if ($oldversion < 2008090108) {
$repo = new object();
$repo->type = 'upload';
$repo->visible = 1;
$repo->sortorder = 1;
if (!$DB->record_exists('repository', array('type'=>'upload'))) {
$typeid = $DB->insert_record('repository', $repo);
}else{
$record = $DB->get_record('repository', array('type'=>'upload'));
$typeid = $record->id;
}
if (!$DB->record_exists('repository_instances', array('typeid'=>$typeid))) {
$instance = new object();
$instance->name = get_string('repositoryname', 'repository_upload');
$instance->typeid = $typeid;
$instance->userid = 0;
$instance->contextid = SITEID;
$instance->timecreated = time();
$instance->timemodified = time();
$DB->insert_record('repository_instances', $instance);
}
$repo->type = 'local';
$repo->visible = 1;
$repo->sortorder = 1;
if (!$DB->record_exists('repository', array('type'=>'local'))) {
$typeid = $DB->insert_record('repository', $repo);
}else{
$record = $DB->get_record('repository', array('type'=>'local'));
$typeid = $record->id;
}
if (!$DB->record_exists('repository_instances', array('typeid'=>$typeid))) {
$instance = new object();
$instance->name = get_string('repositoryname', 'repository_local');
$instance->typeid = $typeid;
$instance->userid = 0;
$instance->contextid = SITEID;
$instance->timecreated = time();
$instance->timemodified = time();
$DB->insert_record('repository_instances', $instance);
}
upgrade_main_savepoint(true, 2008090108);
}
// MDL-16411 Move all plugintype_pluginname_version values from config to config_plugins. // MDL-16411 Move all plugintype_pluginname_version values from config to config_plugins.
if ($oldversion < 2008091000) { if ($oldversion < 2008091000) {
foreach (get_object_vars($CFG) as $name => $value) { foreach (get_object_vars($CFG) as $name => $value) {
@ -862,23 +821,6 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2008091000); upgrade_main_savepoint(true, 2008091000);
} }
//Add a readonly field to the repository_instances table
//in order to support instance created automatically by a repository plugin
if ($oldversion < 2008091611) {
/// Define field readonly to be added to repository_instances
$table = new xmldb_table('repository_instances');
$field = new xmldb_field('readonly', XMLDB_TYPE_INTEGER, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '0', 'timemodified');
/// Conditionally launch add field readonly
if (!$dbman->field_exists($table, $field)) {
$dbman->add_field($table, $field);
}
/// Main savepoint reached
upgrade_main_savepoint(true, 2008091611);
}
if ($oldversion < 2008092300) { if ($oldversion < 2008092300) {
unset_config('editorspelling'); unset_config('editorspelling');
unset_config('editordictionary'); unset_config('editordictionary');
@ -1337,13 +1279,6 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
upgrade_main_savepoint(true, 2009030300); upgrade_main_savepoint(true, 2009030300);
} }
if ($oldversion < 2009030501) {
/// setup default repository plugins
require_once($CFG->dirroot . '/repository/lib.php');
repository_setup_default_plugins();
/// Main savepoint reached
upgrade_main_savepoint(true, 2009030501);
}
/// MDL-18132 replace the use a new Role allow switch settings page, instead of /// MDL-18132 replace the use a new Role allow switch settings page, instead of
/// $CFG->allowuserswitchrolestheycantassign /// $CFG->allowuserswitchrolestheycantassign
@ -3987,16 +3922,6 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
upgrade_main_savepoint(true, 2010050403); upgrade_main_savepoint(true, 2010050403);
} }
// fix repository_alfresco version number
if ($oldversion < 2010050411) {
// force to change repository_alfresco version number to upgrade smoothly (from preview 1 -> preview 2)
if ($repository_plugin = $DB->get_record('config_plugins', array('plugin'=>'repository_alfresco', 'name'=>'version'))) {
$repository_plugin->value = '2008000000';
$DB->update_record('config_plugins', $repository_plugin);
}
upgrade_main_savepoint(true, 2010050411);
}
if ($oldversion < 2010051500) { if ($oldversion < 2010051500) {
/// Fix a bad table name that existed for a few days in HEAD /// Fix a bad table name that existed for a few days in HEAD

27
repository/lib.php
View file

@ -1815,30 +1815,3 @@ function initialise_filepicker($args) {
} }
return $return; return $return;
} }
/**
* The plugins should be enabled by defaulted once moodle installed
*
* @global object $OUTPUT
*
* @return boolean
*/
function repository_setup_default_plugins() {
global $OUTPUT;
//if the plugin type has no multiple instance (e.g. has no instance option name)
//repository_type::create will create an instance automatically
$user_plugin = new repository_type('user', array(), true);
$user_plugin->create(true);
$recent_plugin = new repository_type('recent', array(), true);
$recent_plugin->create(true);
$upload_plugin = new repository_type('upload', array(), true);
$upload_plugin->create(true);
$local_plugin = new repository_type('local', array(), true);
$local_plugin->create(true);
echo $OUTPUT->notification(get_string('setupdefaultplugins', 'repository'), 'notifysuccess');
return true;
}