From f597bb1def0dbb33b9670ba8be21b43eba50449c Mon Sep 17 00:00:00 2001 From: Matteo Scaramuccia Date: Thu, 3 Aug 2017 00:13:03 +0200 Subject: [PATCH] MDL-59583 dml: fixed NULL values w/ MariaDB 10.2.7+ --- lib/dml/mysqli_native_moodle_database.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/dml/mysqli_native_moodle_database.php b/lib/dml/mysqli_native_moodle_database.php index 1f70e7b4c8e..9ec4ab7e0ec 100644 --- a/lib/dml/mysqli_native_moodle_database.php +++ b/lib/dml/mysqli_native_moodle_database.php @@ -804,10 +804,13 @@ class mysqli_native_moodle_database extends moodle_database { $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;