Permalink
Browse files

Merge branch 'MDL-29620-workshop-sequence_21_STABLE' of git://github.…

…com/mudrd8mz/moodle into MOODLE_21_STABLE
  • Loading branch information...
2 parents d56fe71 + daccd72 commit 0eb0583d9d56f35cb6e33c9c5751f3c95632fb7e @nebgor nebgor committed Nov 9, 2011
Showing with 11 additions and 1 deletion.
  1. +8 −0 mod/workshop/db/upgrade.php
  2. +2 −0 mod/workshop/db/upgradelib.php
  3. +1 −1 mod/workshop/version.php
@@ -311,5 +311,13 @@ function xmldb_workshop_upgrade($oldversion) {
// Moodle v2.1.0 release upgrade line
// Put any upgrade step following this
+ /**
+ * Fix the eventually corrupted workshop table id sequence
+ */
+ if ($oldversion < 2011061001) {
+ $dbman->reset_sequence('workshop');
+ upgrade_mod_savepoint(true, 2011061001, 'workshop');
+ }
+
return true;
}
@@ -163,6 +163,8 @@ function workshop_upgrade_module_instances() {
$DB->set_field('workshop_old', 'newid', $new->id, array('id' => $old->id));
}
$rs->close();
+ $dbman = $DB->get_manager();
+ $dbman->reset_sequence('workshop');
}
/**
View
@@ -29,6 +29,6 @@
defined('MOODLE_INTERNAL') || die();
-$module->version = 2011061000;
+$module->version = 2011061001;
$module->requires = 2011020900; // Requires this Moodle version
//$module->cron = 60;

0 comments on commit 0eb0583

Please sign in to comment.