Merge branch 'unsigned_fixes' of git://github.com/stronk7/moodle

2011-06-27 15:45:41 +08:00
parent a3f8860d6c a0628c68de
commit 35d4d85dc4
5 changed files with 31 additions and 3 deletions
@@ -6558,6 +6558,20 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
        upgrade_main_savepoint(true, 2011062000.01);
    }

+    // Signed fixes - MDL-28032
+    if ($oldversion < 2011062400.01) {
+
+        // Changing sign of field defaultmark on table question to unsigned
+        $table = new xmldb_table('question');
+        $field = new xmldb_field('defaultmark', XMLDB_TYPE_NUMBER, '12, 7', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, '1', 'generalfeedbackformat');
+
+        // Launch change of sign for field defaultmark
+        $dbman->change_field_unsigned($table, $field);
+
+        // Main savepoint reached
+        upgrade_main_savepoint(true, 2011062400.01);
+    }
+
    return true;
 }

@@ -499,7 +499,7 @@ class mysqli_native_moodle_database extends moodle_database {
                $info->has_default   = is_null($info->default_value) ? false : true;
                $info->primary_key   = ($rawcolumn->key === 'PRI');
                $info->binary        = false;
-                $info->unsigned      = null;
+                $info->unsigned      = (stripos($rawcolumn->type, 'unsigned') !== false);
                $info->auto_increment= false;
                $info->unique        = null;

@@ -380,6 +380,20 @@ function xmldb_quiz_statistics_upgrade($oldversion) {
        upgrade_plugin_savepoint(true, 2011021500, 'quiz', 'statistics');
    }

+    // Signed fixes - MDL-28032
+    if ($oldversion < 2011062600) {
+
+        // Changing sign of field maxmark on table quiz_question_statistics to signed
+        $table = new xmldb_table('quiz_question_statistics');
+        $field = new xmldb_field('maxmark', XMLDB_TYPE_NUMBER, '12, 7', null, null, null, null, 'subquestions');
+
+        // Launch change of sign for field maxmark
+        $dbman->change_field_unsigned($table, $field);
+
+        // statistics savepoint reached
+        upgrade_plugin_savepoint(true, 2011062600, 'quiz', 'statistics');
+    }
+
    return true;
 }

@@ -25,5 +25,5 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version  = 2011051200;
+$plugin->version  = 2011062600;
 $plugin->requires = 2011060313;
@@ -31,7 +31,7 @@ defined('MOODLE_INTERNAL') || die();



-$version  = 2011062400.00;              // YYYYMMDD      = weekly release date of this DEV branch
+$version  = 2011062400.01;              // YYYYMMDD      = weekly release date of this DEV branch
                                        //         RR    = release increments - 00 in DEV branches
                                        //           .XX = incremental changes