Make is_user_defined nullable so we can store false on oracle

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/apps/user_status/appinfo/info.xml b/apps/user_status/appinfo/info.xml
index 15d871b89b922b8a609793319c433510ebcdaf47..e2d79ba1fb4a00fef27e71100b7947641a71e053 100644 (file)
--- a/apps/user_status/appinfo/info.xml
+++ b/apps/user_status/appinfo/info.xml
@@ -5,7 +5,7 @@
        <name>User status</name>
        <summary>User status</summary>
        <description><![CDATA[User status]]></description>
-       <version>1.1.0</version>
+       <version>1.1.1</version>
        <licence>agpl</licence>
        <author mail="oc.list@georgehrke.com" >Georg Ehrke</author>
        <namespace>UserStatus</namespace>

diff --git a/apps/user_status/composer/composer/autoload_classmap.php b/apps/user_status/composer/composer/autoload_classmap.php
index ba2ed1f176211c3cffa2bd0a7fae71b6f8b45459..cd88b468c5e207b754d2b82599d1b1c3ccba574c 100644 (file)
--- a/apps/user_status/composer/composer/autoload_classmap.php
+++ b/apps/user_status/composer/composer/autoload_classmap.php
@@ -28,6 +28,7 @@ return array(
     'OCA\\UserStatus\\Listener\\UserLiveStatusListener' => $baseDir . '/../lib/Listener/UserLiveStatusListener.php',
     '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\\Service\\EmojiService' => $baseDir . '/../lib/Service/EmojiService.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 fd05c1c1627ff8a563c30857cf51b911f0e4e955..1dc85767dbe29ce01cd11f8ad2c5ee2f49c452da 100644 (file)
--- a/apps/user_status/composer/composer/autoload_static.php
+++ b/apps/user_status/composer/composer/autoload_static.php
@@ -43,6 +43,7 @@ class ComposerStaticInitUserStatus
         'OCA\\UserStatus\\Listener\\UserLiveStatusListener' => __DIR__ . '/..' . '/../lib/Listener/UserLiveStatusListener.php',
         '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\\Service\\EmojiService' => __DIR__ . '/..' . '/../lib/Service/EmojiService.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/Version0001Date20200602134824.php b/apps/user_status/lib/Migration/Version0001Date20200602134824.php
index 82b33f815b793e5bbb2c2d237389571c0914fc6c..4ed8bfe8d6518423d930d5d11a6d16d39c58bf75 100644 (file)
--- a/apps/user_status/lib/Migration/Version0001Date20200602134824.php
+++ b/apps/user_status/lib/Migration/Version0001Date20200602134824.php
@@ -69,7 +69,7 @@ class Version0001Date20200602134824 extends SimpleMigrationStep {
                        'unsigned' => true,
                ]);
                $statusTable->addColumn('is_user_defined', Types::BOOLEAN, [
-                       'notnull' => true,
+                       'notnull' => false,
                ]);
                $statusTable->addColumn('message_id', Types::STRING, [
                        'notnull' => false,

diff --git a/apps/user_status/lib/Migration/Version1000Date20201111130204.php b/apps/user_status/lib/Migration/Version1000Date20201111130204.php
new file mode 100644 (file)
index 0000000..53b35f2
--- /dev/null
+++ b/apps/user_status/lib/Migration/Version1000Date20201111130204.php
@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2020 Joas Schilling <coding@schilljs.com>
+ *
+ * @author Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\UserStatus\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version1000Date20201111130204 extends SimpleMigrationStep {
+
+       /**
+        * @param IOutput $output
+        * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+        * @param array $options
+        * @return null|ISchemaWrapper
+        */
+       public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+               /** @var ISchemaWrapper $schema */
+               $schema = $schemaClosure();
+
+               $result = $this->ensureColumnIsNullable($schema, 'user_status', 'is_user_defined');
+
+               return $result ? $schema : null;
+       }
+
+       protected function ensureColumnIsNullable(ISchemaWrapper $schema, string $tableName, string $columnName): bool {
+               $table = $schema->getTable($tableName);
+               $column = $table->getColumn($columnName);
+
+               if ($column->getNotnull()) {
+                       $column->setNotnull(false);
+                       return true;
+               }
+
+               return false;
+       }
+}