summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Wurst <ChristophWurst@users.noreply.github.com>2023-09-26 15:46:48 +0200
committerGitHub <noreply@github.com>2023-09-26 15:46:48 +0200
commit91959c99c1e8cdbb74af9733b40669cba9ba088c (patch)
treef2c061e48684478a3963cfed1bf77544de557ee1
parent2397e835e6d1118ddb0a31075a29a47d4fc05921 (diff)
parentcf3fadc707f247ee4273d8c36e1af5ded7cd9154 (diff)
downloadnextcloud-server-91959c99c1e8cdbb74af9733b40669cba9ba088c.tar.gz
nextcloud-server-91959c99c1e8cdbb74af9733b40669cba9ba088c.zip
Merge pull request #40614 from nextcloud/fix/userstatus/migration-version-number
fix(userstatus): Sync migration version number with app version
-rw-r--r--apps/user_status/composer/composer/autoload_classmap.php2
-rw-r--r--apps/user_status/composer/composer/autoload_static.php2
-rw-r--r--apps/user_status/lib/Migration/Version1003Date20210809144824.php (renamed from apps/user_status/lib/Migration/Version2301Date20210809144824.php)12
3 files changed, 9 insertions, 7 deletions
diff --git a/apps/user_status/composer/composer/autoload_classmap.php b/apps/user_status/composer/composer/autoload_classmap.php
index 7cfc131ab20..50a2459e53b 100644
--- a/apps/user_status/composer/composer/autoload_classmap.php
+++ b/apps/user_status/composer/composer/autoload_classmap.php
@@ -30,7 +30,7 @@ return array(
'OCA\\UserStatus\\Migration\\Version0001Date20200602134824' => $baseDir . '/../lib/Migration/Version0001Date20200602134824.php',
'OCA\\UserStatus\\Migration\\Version0002Date20200902144824' => $baseDir . '/../lib/Migration/Version0002Date20200902144824.php',
'OCA\\UserStatus\\Migration\\Version1000Date20201111130204' => $baseDir . '/../lib/Migration/Version1000Date20201111130204.php',
- 'OCA\\UserStatus\\Migration\\Version2301Date20210809144824' => $baseDir . '/../lib/Migration/Version2301Date20210809144824.php',
+ 'OCA\\UserStatus\\Migration\\Version1003Date20210809144824' => $baseDir . '/../lib/Migration/Version1003Date20210809144824.php',
'OCA\\UserStatus\\ResponseDefinitions' => $baseDir . '/../lib/ResponseDefinitions.php',
'OCA\\UserStatus\\Service\\JSDataService' => $baseDir . '/../lib/Service/JSDataService.php',
'OCA\\UserStatus\\Service\\PredefinedStatusService' => $baseDir . '/../lib/Service/PredefinedStatusService.php',
diff --git a/apps/user_status/composer/composer/autoload_static.php b/apps/user_status/composer/composer/autoload_static.php
index 73de6f1a0f7..317f9d18969 100644
--- a/apps/user_status/composer/composer/autoload_static.php
+++ b/apps/user_status/composer/composer/autoload_static.php
@@ -45,7 +45,7 @@ class ComposerStaticInitUserStatus
'OCA\\UserStatus\\Migration\\Version0001Date20200602134824' => __DIR__ . '/..' . '/../lib/Migration/Version0001Date20200602134824.php',
'OCA\\UserStatus\\Migration\\Version0002Date20200902144824' => __DIR__ . '/..' . '/../lib/Migration/Version0002Date20200902144824.php',
'OCA\\UserStatus\\Migration\\Version1000Date20201111130204' => __DIR__ . '/..' . '/../lib/Migration/Version1000Date20201111130204.php',
- 'OCA\\UserStatus\\Migration\\Version2301Date20210809144824' => __DIR__ . '/..' . '/../lib/Migration/Version2301Date20210809144824.php',
+ 'OCA\\UserStatus\\Migration\\Version1003Date20210809144824' => __DIR__ . '/..' . '/../lib/Migration/Version1003Date20210809144824.php',
'OCA\\UserStatus\\ResponseDefinitions' => __DIR__ . '/..' . '/../lib/ResponseDefinitions.php',
'OCA\\UserStatus\\Service\\JSDataService' => __DIR__ . '/..' . '/../lib/Service/JSDataService.php',
'OCA\\UserStatus\\Service\\PredefinedStatusService' => __DIR__ . '/..' . '/../lib/Service/PredefinedStatusService.php',
diff --git a/apps/user_status/lib/Migration/Version2301Date20210809144824.php b/apps/user_status/lib/Migration/Version1003Date20210809144824.php
index 947378484c6..ed8a15a9c60 100644
--- a/apps/user_status/lib/Migration/Version2301Date20210809144824.php
+++ b/apps/user_status/lib/Migration/Version1003Date20210809144824.php
@@ -33,7 +33,7 @@ use OCP\Migration\SimpleMigrationStep;
/**
* @package OCA\UserStatus\Migration
*/
-class Version2301Date20210809144824 extends SimpleMigrationStep {
+class Version1003Date20210809144824 extends SimpleMigrationStep {
/**
* @param IOutput $output
@@ -48,10 +48,12 @@ class Version2301Date20210809144824 extends SimpleMigrationStep {
$statusTable = $schema->getTable('user_status');
- $statusTable->addColumn('is_backup', Types::BOOLEAN, [
- 'notnull' => false,
- 'default' => false,
- ]);
+ if (!$statusTable->hasColumn('is_backup')) {
+ $statusTable->addColumn('is_backup', Types::BOOLEAN, [
+ 'notnull' => false,
+ 'default' => false,
+ ]);
+ }
return $schema;
}