From 2b2b4777b41bfba6f6af239e5ee464ea334d8d32 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 17 Jul 2015 14:42:41 +0530 Subject: [PATCH] Fix indentation Signed-off-by: Madhura Jayaratne --- libraries/common.inc.php | 2 +- .../TableIndexesController.class.php | 7 ++- libraries/tbl_columns_definition_form.inc.php | 58 +++++++++---------- 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 93da663c33..c7a712059a 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -1069,7 +1069,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { */ include_once './libraries/sql-parser/autoload.php'; - // Loads closest context to this version. + // Loads closest context to this version. SqlParser\Context::loadClosest( (PMA_DRIZZLE ? 'Drizzle' : 'MySql') . PMA_MYSQL_INT_VERSION ); diff --git a/libraries/controllers/TableIndexesController.class.php b/libraries/controllers/TableIndexesController.class.php index c5093dea7c..4ffcb74d34 100644 --- a/libraries/controllers/TableIndexesController.class.php +++ b/libraries/controllers/TableIndexesController.class.php @@ -143,9 +143,10 @@ class TableIndexesController extends TableController 'message', PMA_Util::getMessage($message, $sql_query, 'success') ); $response->addJSON( - 'index_table', PMA_Index::getHtmlForIndexes( - $this->table, $this->db - ) + 'index_table', + PMA_Index::getHtmlForIndexes( + $this->table, $this->db + ) ); } else { include 'tbl_structure.php'; diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index 5029cb25ee..73a0828dd5 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -168,16 +168,16 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) { ? 'FULLTEXT' : false; switch ($columnMeta['DefaultType']) { - case 'NONE': - $columnMeta['Default'] = null; - break; - case 'USER_DEFINED': - $columnMeta['Default'] = $columnMeta['DefaultValue']; - break; - case 'NULL': - case 'CURRENT_TIMESTAMP': - $columnMeta['Default'] = $columnMeta['DefaultType']; - break; + case 'NONE': + $columnMeta['Default'] = null; + break; + case 'USER_DEFINED': + $columnMeta['Default'] = $columnMeta['DefaultValue']; + break; + case 'NULL': + case 'CURRENT_TIMESTAMP': + $columnMeta['Default'] = $columnMeta['DefaultType']; + break; } $length = Util\get($_REQUEST, "field_length.${columnNumber}", $length); @@ -204,28 +204,28 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) { $columnMeta['Expression'] = $expressions[$columnMeta['Field']]; } switch ($columnMeta['Default']) { - case null: - 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']; + case null: + if (is_null($columnMeta['Default'])) { // null + if ($columnMeta['Null'] == 'YES') { + $columnMeta['DefaultType'] = 'NULL'; + $columnMeta['DefaultValue'] = ''; + } else { + $columnMeta['DefaultType'] = 'NONE'; + $columnMeta['DefaultValue'] = ''; } - break; - case 'CURRENT_TIMESTAMP': - $columnMeta['DefaultType'] = 'CURRENT_TIMESTAMP'; - $columnMeta['DefaultValue'] = ''; - break; - default: + } else { // empty $columnMeta['DefaultType'] = 'USER_DEFINED'; $columnMeta['DefaultValue'] = $columnMeta['Default']; - break; + } + break; + case 'CURRENT_TIMESTAMP': + $columnMeta['DefaultType'] = 'CURRENT_TIMESTAMP'; + $columnMeta['DefaultValue'] = ''; + break; + default: + $columnMeta['DefaultType'] = 'USER_DEFINED'; + $columnMeta['DefaultValue'] = $columnMeta['Default']; + break; } }