Merge branch 'MDL-32188' of git://github.com/timhunt/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Oct 2013 01:43:36 +0000 (14:43 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Oct 2013 01:43:36 +0000 (14:43 +1300)
Conflicts:
lib/db/upgrade.php

1  2 
lang/en/question.php
lib/db/install.xml
lib/db/upgrade.php
version.php

Simple merge
Simple merge
@@@ -2577,35 -2577,18 +2577,49 @@@ function xmldb_main_upgrade($oldversion
      }
  
      if ($oldversion < 2013100400.01) {
 +        // Add user_devices core table.
 +
 +        // Define field id to be added to user_devices.
 +        $table = new xmldb_table('user_devices');
 +
 +        $table->add_field('id', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, XMLDB_SEQUENCE, null, null);
 +        $table->add_field('userid', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, '0', 'id');
 +        $table->add_field('appid', XMLDB_TYPE_CHAR, '128', null, XMLDB_NOTNULL, null, null, 'userid');
 +        $table->add_field('name', XMLDB_TYPE_CHAR, '32', null, XMLDB_NOTNULL, null, null, 'appid');
 +        $table->add_field('model', XMLDB_TYPE_CHAR, '32', null, XMLDB_NOTNULL, null, null, 'name');
 +        $table->add_field('platform', XMLDB_TYPE_CHAR, '32', null, XMLDB_NOTNULL, null, null, 'model');
 +        $table->add_field('version', XMLDB_TYPE_CHAR, '32', null, XMLDB_NOTNULL, null, null, 'platform');
 +        $table->add_field('pushid', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, null, 'version');
 +        $table->add_field('uuid', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, null, 'pushid');
 +        $table->add_field('timecreated', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, null, 'uuid');
 +        $table->add_field('timemodified', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, null, 'timecreated');
 +
 +        $table->add_key('primary', XMLDB_KEY_PRIMARY, array('id'));
 +        $table->add_key('pushid-userid', XMLDB_KEY_UNIQUE, array('pushid', 'userid'));
 +        $table->add_key('pushid-platform', XMLDB_KEY_UNIQUE, array('pushid', 'platform'));
 +        $table->add_key('userid', XMLDB_KEY_FOREIGN, array('userid'), 'user', array('id'));
 +
 +        if (!$dbman->table_exists($table)) {
 +            $dbman->create_table($table);
 +        }
 +
 +        // Main savepoint reached.
 +        upgrade_main_savepoint(true, 2013100400.01);
++    }
++
++    if ($oldversion < 2013100800.00) {
+         // Define field maxfraction to be added to question_attempts.
+         $table = new xmldb_table('question_attempts');
+         $field = new xmldb_field('maxfraction', XMLDB_TYPE_NUMBER, '12, 7', null, XMLDB_NOTNULL, null, '1', 'minfraction');
+         // Conditionally launch add field maxfraction.
+         if (!$dbman->field_exists($table, $field)) {
+             $dbman->add_field($table, $field);
+         }
  
 -        upgrade_main_savepoint(true, 2013100400.01);
+         // Main savepoint reached.
++        upgrade_main_savepoint(true, 2013100800.00);
      }
  
      return true;
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
--$version  = 2013100400.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2013100800.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.