Merge branch 'MDL-29620-workshop-sequence' of git://github.com/mudrd8mz/moodle

mod/workshop/db/upgrade.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 < 2011110400) {
+        $dbman->reset_sequence('workshop');
+        upgrade_mod_savepoint(true, 2011110400, 'workshop');
+    }
+
     return true;
 }

mod/workshop/db/upgradelib.php

@@ -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');
 }
 
 /**

mod/workshop/version.php

@@ -29,6 +29,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$module->version  = 2011061000;
+$module->version  = 2011110400;
 $module->requires = 2011020900;  // Requires this Moodle version
 //$module->cron     = 60;