From 692ae9122e064927ee13543f66640f279a1a87c5 Mon Sep 17 00:00:00 2001 From: stronk7 Date: Tue, 22 Sep 2009 17:26:40 +0000 Subject: [PATCH] MDL-14679, MDL-17491 empty defaults: when passing empty ('') default to char/clob columns apply correct $default_for_char, so each DB will get its correct empty value --- lib/ddl/sql_generator.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/ddl/sql_generator.php b/lib/ddl/sql_generator.php index 5b13f5fbcb..d5ca19eeac 100644 --- a/lib/ddl/sql_generator.php +++ b/lib/ddl/sql_generator.php @@ -520,7 +520,11 @@ abstract class sql_generator { if ($xmldb_field->getDefault() !== NULL) { if ($xmldb_field->getType() == XMLDB_TYPE_CHAR || $xmldb_field->getType() == XMLDB_TYPE_TEXT) { - $default = "'" . $this->addslashes($xmldb_field->getDefault()) . "'"; + if ($xmldb_field->getDefault() === '') { // If passing empty default, use the $default_for_char one instead + $default = "'" . $this->default_for_char . "'"; + } else { + $default = "'" . $this->addslashes($xmldb_field->getDefault()) . "'"; + } } else { $default = $xmldb_field->getDefault(); } -- 2.39.5