From d9e0b9d7e7fc0dc05e3d0c14197ccb12dbd2ce67 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Wed, 29 Mar 2023 22:23:52 +0200 Subject: [PATCH] Fix move columns (#18271) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #18232 - Fix issues when moving a column Signed-off-by: Liviu-Mihail Concioiu Co-authored-by: Maurício Meneghini Fauth --- .../Controllers/Table/Structure/MoveColumnsController.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php b/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php index 48e843db8bcf..5494be2b6519 100644 --- a/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php +++ b/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php @@ -112,10 +112,9 @@ public function __invoke(ServerRequest $request): void $data['Collation'] ?? '', $data['Null'] === 'YES' ? 'YES' : 'NO', $defaultType, - $currentTimestamp ? '' : $data['Default'], + $data['Default'] ?? '', $data['Extra'] ?? '', - isset($data['COLUMN_COMMENT']) && $data['COLUMN_COMMENT'] !== '' - ? $data['COLUMN_COMMENT'] : false, + $data['COLUMN_COMMENT'] ?? '', $data['Virtuality'], $data['Expression'], $i === 0 ? '-first' : $columnNames[$i - 1],