Merge branch 'MDL-47664-master' of git://github.com/andrewnicols/moodle

2014-10-20 17:49:02 +01:00
parent 6c75bcb5d6 3fa0daa90f
commit cf3fbf8a0e
1 changed files with 6 additions and 1 deletions
@@ -527,7 +527,12 @@ abstract class testing_util {

            foreach ($data as $table => $records) {
                if (isset($structure[$table]['id']) and $structure[$table]['id']->auto_increment) {
-                    $nextid = self::get_next_sequence_starting_value($records);
+                    $lastrecord = end($records);
+                    if ($lastrecord) {
+                        $nextid = $lastrecord->id + 1;
+                    } else {
+                        $nextid = 1;
+                    }
                    if (!isset($current[$table])) {
                        $DB->get_manager()->reset_sequence($table);
                    } else if ($nextid == $current[$table]) {