Merge branch 'develop' into 'master'

Develop

See merge request !234

extension/Classes/Core/Database/DatabaseUpdate.php

@@ -137,10 +137,6 @@ class DatabaseUpdate {
         $versionInfo = $this->getDatabaseVersion();
         $old = $versionInfo[QFQ_VERSION_KEY] ?? false;
 
-        if (version_compare($old, '19.9.0') === -1) {
-            $this->updateSpecialColumns();
-        }
-
         if ($dbUpdate === SYSTEM_DB_UPDATE_ALWAYS || ($dbUpdate === SYSTEM_DB_UPDATE_AUTO && $new != $old)) {
 
             $newFunctionHash = $this->updateSqlFunctions($versionInfo[QFQ_VERSION_KEY_FUNCTION_HASH] ?? '');
@@ -164,6 +160,11 @@ class DatabaseUpdate {
             // A complete new installation get's some extra tables
             $this->db->playSqlFile(__DIR__ . '/../../Sql/customTable.sql');
         }
+
+        if (version_compare($old, '19.9.0') === -1) {
+            $this->updateSpecialColumns();
+        }
+
     }
 
     /**