MDL-59583 dml: fixed NULL values w/ MariaDB 10.2.7+

valmynd · Aug 2, 2017 · 2ec50fe · 2ec50fe
1 parent 0510d5c
commit 2ec50fe
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/dml/mysqli_native_moodle_database.php b/lib/dml/mysqli_native_moodle_database.php
@@ -804,10 +804,13 @@ private function get_column_info(stdClass $rawcolumn) {
         $info->meta_type      = $this->mysqltype2moodletype($rawcolumn->data_type);
         if ($this->has_breaking_change_quoted_defaults()) {
             $info->default_value = trim($rawcolumn->column_default, "'");
+            if ($info->default_value === 'NULL') {
+                $info->default_value = null;
+            }
         } else {
             $info->default_value = $rawcolumn->column_default;
         }
-        $info->has_default    = !is_null($rawcolumn->column_default);
+        $info->has_default    = !is_null($info->default_value);
         $info->not_null       = ($rawcolumn->is_nullable === 'NO');
         $info->primary_key    = ($rawcolumn->column_key === 'PRI');
         $info->binary         = false;