From 38deec06cdd8f184ae4b272920e5d90958a69810 Mon Sep 17 00:00:00 2001 From: Liviu-Mihail Concioiu Date: Sat, 7 Jan 2023 18:05:14 +0100 Subject: [PATCH] Fix uuid column move Signed-off-by: Liviu-Mihail Concioiu --- .../Controllers/Table/Structure/MoveColumnsController.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php b/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php index 8f81d239b8..e945055b73 100644 --- a/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php +++ b/libraries/classes/Controllers/Table/Structure/MoveColumnsController.php @@ -81,11 +81,17 @@ final class MoveColumnsController extends AbstractController $timeDefault = $data['Default'] === 'CURRENT_TIMESTAMP' || $data['Default'] === 'current_timestamp()'; $current_timestamp = $timeType && $timeDefault; + $uuidType = $data['Type'] === 'uuid'; + $uuidDefault = $data['Default'] === 'UUID' || $data['Default'] === 'uuid()'; + $uuid = $uuidType && $uuidDefault; + // @see https://mariadb.com/kb/en/library/information-schema-columns-table/#examples if ($data['Null'] === 'YES' && in_array($data['Default'], [$defaultNullValue, null])) { $default_type = 'NULL'; } elseif ($current_timestamp) { $default_type = 'CURRENT_TIMESTAMP'; + } elseif ($uuid) { + $default_type = 'UUID'; } elseif ($data['Default'] === null) { $default_type = 'NONE'; } else {