Merge pull request #51866 from nextcloud/migrations-to-execute-filter-sort

fix: use proper migration sorting when checking if a migration needs to be executed
pull/51848/head
Robin Appelman 3 weeks ago committed by GitHub
commit f7d5edfb5f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 6
      lib/private/DB/MigrationService.php

@ -199,9 +199,9 @@ class MigrationService {
if ($versionA !== $versionB) {
return ($versionA < $versionB) ? -1 : 1;
}
return ($matchA[2] < $matchB[2]) ? -1 : 1;
return strnatcmp($matchA[2], $matchB[2]);
}
return (basename($a) < basename($b)) ? -1 : 1;
return strnatcmp(basename($a), basename($b));
}
/**
@ -250,7 +250,7 @@ class MigrationService {
$toBeExecuted = [];
foreach ($availableMigrations as $v) {
if ($to !== 'latest' && $v > $to) {
if ($to !== 'latest' && ($this->sortMigrations($v, $to) > 0)) {
continue;
}
if ($this->shallBeExecuted($v, $knownMigrations)) {

Loading…
Cancel
Save