From e0750d93ae50dfd2c103b16d4a5b517e564bec51 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Tue, 23 Jun 2015 08:12:09 +0530
Subject: [PATCH] Distinguish between null and empty default values

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/tbl_columns_definition_form.inc.php | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 594c4100e7..933536901a 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -240,15 +240,17 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
         $columnMeta = $fields_meta[$columnNumber];
         switch ($columnMeta['Default']) {
             case null:
-                if ($columnMeta['Null'] == 'YES') {
-                    $columnMeta['DefaultType']  = 'NULL';
-                    $columnMeta['DefaultValue'] = '';
-                    // SHOW FULL COLUMNS does not report the case
-                    // when there is a DEFAULT value which is empty so we need to use the
-                    // results of SHOW CREATE TABLE
-                } else {
-                    $columnMeta['DefaultType']  = 'NONE';
-                    $columnMeta['DefaultValue'] = '';
+                if (is_null($columnMeta['Default'])) { // null
+                    if ($columnMeta['Null'] == 'YES') {
+                        $columnMeta['DefaultType']  = 'NULL';
+                        $columnMeta['DefaultValue'] = '';
+                    } else {
+                        $columnMeta['DefaultType']  = 'NONE';
+                        $columnMeta['DefaultValue'] = '';
+                    }
+                } else { // empty
+                    $columnMeta['DefaultType']  = 'USER_DEFINED';
+                    $columnMeta['DefaultValue'] = $columnMeta['Default'];
                 }
                 break;
             case 'CURRENT_TIMESTAMP':