Commit e4f1cac9 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge remote-tracking branch 'origin/master'

parents 1d7c40dc 09c40965
Pipeline #3108 passed with stages
in 1 minute and 54 seconds
...@@ -137,10 +137,6 @@ class DatabaseUpdate { ...@@ -137,10 +137,6 @@ class DatabaseUpdate {
$versionInfo = $this->getDatabaseVersion(); $versionInfo = $this->getDatabaseVersion();
$old = $versionInfo[QFQ_VERSION_KEY] ?? false; $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)) { if ($dbUpdate === SYSTEM_DB_UPDATE_ALWAYS || ($dbUpdate === SYSTEM_DB_UPDATE_AUTO && $new != $old)) {
$newFunctionHash = $this->updateSqlFunctions($versionInfo[QFQ_VERSION_KEY_FUNCTION_HASH] ?? ''); $newFunctionHash = $this->updateSqlFunctions($versionInfo[QFQ_VERSION_KEY_FUNCTION_HASH] ?? '');
...@@ -164,6 +160,11 @@ class DatabaseUpdate { ...@@ -164,6 +160,11 @@ class DatabaseUpdate {
// A complete new installation get's some extra tables // A complete new installation get's some extra tables
$this->db->playSqlFile(__DIR__ . '/../../Sql/customTable.sql'); $this->db->playSqlFile(__DIR__ . '/../../Sql/customTable.sql');
} }
if (version_compare($old, '19.9.0') === -1) {
$this->updateSpecialColumns();
}
} }
/** /**
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment