diff options
| author | Mo Sureerat <sureemo@gmail.com> | 2022-11-03 18:56:29 +0300 |
|---|---|---|
| committer | Mo Sureerat <sureemo@gmail.com> | 2022-11-03 18:57:07 +0300 |
| commit | 250be6adbc97636b8c5cf9758b5edf7d0a3da609 (patch) | |
| tree | 15806f346cccb969b346a3361586ce736209efa6 | |
| parent | afd568e8890dbd7518b3f589efe9c99b807daf0c (diff) | |
[ISSUE-17793] Fix static analysis warning
Signed-off-by: Mo Sureerat <sureemo@gmail.com>
| -rw-r--r-- | libraries/classes/Table/ColumnsDefinition.php | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/libraries/classes/Table/ColumnsDefinition.php b/libraries/classes/Table/ColumnsDefinition.php index d5e6d7ef9b..1a96a024ec 100644 --- a/libraries/classes/Table/ColumnsDefinition.php +++ b/libraries/classes/Table/ColumnsDefinition.php @@ -84,7 +84,7 @@ final class ColumnsDefinition ] ); if (isset($_POST['field_where'])) { - $form_params['after_field'] = $_POST['after_field']; + $form_params['after_field'] = (string) $_POST['after_field']; } } @@ -284,16 +284,15 @@ final class ColumnsDefinition $columnMeta['Expression'] = is_array($expressions) ? $expressions[$columnMeta['Field']] : null; } + $columnMeta['DefaultType'] = 'USER_DEFINED'; + $columnMeta['DefaultValue'] = ''; + switch ($columnMeta['Default']) { case null: if ($columnMeta['Default'] === null) { - if ($columnMeta['Null'] === 'YES') { - $columnMeta['DefaultType'] = 'NULL'; - $columnMeta['DefaultValue'] = ''; - } else { - $columnMeta['DefaultType'] = 'NONE'; - $columnMeta['DefaultValue'] = ''; - } + $columnMeta['DefaultType'] = $columnMeta['Null'] === 'YES' + ? 'NULL' + : 'NONE'; } else { // empty $columnMeta['DefaultType'] = 'USER_DEFINED'; $columnMeta['DefaultValue'] = $columnMeta['Default']; @@ -303,15 +302,14 @@ final class ColumnsDefinition case 'CURRENT_TIMESTAMP': case 'current_timestamp()': $columnMeta['DefaultType'] = 'CURRENT_TIMESTAMP'; - $columnMeta['DefaultValue'] = ''; + break; case 'UUID': case 'uuid()': $columnMeta['DefaultType'] = 'UUID'; - $columnMeta['DefaultValue'] = ''; + break; default: - $columnMeta['DefaultType'] = 'USER_DEFINED'; $columnMeta['DefaultValue'] = $columnMeta['Default']; if (substr($columnMeta['Type'], -4) === 'text') { |