Merge pull request #51867 from nextcloud/backport/51866/stable29

AndyScherzinger · web-flow · commit e1d98a1d5c64 · 2025-04-02T18:32:46.000+02:00
[stable29] fix: use proper migration sorting when checking if a migration needs to be executed
diff --git a/lib/private/DB/MigrationService.php b/lib/private/DB/MigrationService.php
@@ -221,9 +221,9 @@ protected function sortMigrations(string $a, string $b): int {
 			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));
 	}
 
 	/**
@@ -272,7 +272,7 @@ private function getMigrationsToExecute($to) {
 
 		$toBeExecuted = [];
 		foreach ($availableMigrations as $v) {
-			if ($to !== 'latest' && $v > $to) {
+			if ($to !== 'latest' && ($this->sortMigrations($v, $to) > 0)) {
 				continue;
 			}
 			if ($this->shallBeExecuted($v, $knownMigrations)) {

Original file line number	Diff line number	Diff line change
`@@ -221,9 +221,9 @@ protected function sortMigrations(string $a, string $b): int {`
`221`	`221`	`if ($versionA !== $versionB) {`
`222`	`222`	`return ($versionA < $versionB) ? -1 : 1;`
`223`	`223`	`}`
`224`		`- return ($matchA[2] < $matchB[2]) ? -1 : 1;`
	`224`	`+ return strnatcmp($matchA[2], $matchB[2]);`
`225`	`225`	`}`
`226`		`- return (basename($a) < basename($b)) ? -1 : 1;`
	`226`	`+ return strnatcmp(basename($a), basename($b));`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`/**`
`@@ -272,7 +272,7 @@ private function getMigrationsToExecute($to) {`
`272`	`272`
`273`	`273`	`$toBeExecuted = [];`
`274`	`274`	`foreach ($availableMigrations as $v) {`
`275`		`- if ($to !== 'latest' && $v > $to) {`
	`275`	`+ if ($to !== 'latest' && ($this->sortMigrations($v, $to) > 0)) {`
`276`	`276`	`continue;`
`277`	`277`	`}`
`278`	`278`	`if ($this->shallBeExecuted($v, $knownMigrations)) {`