Merge pull request #534 from nextcloud/make-column-nullable

Allow nullable values as subject params

Author: rullzer

appinfo/info.xml

@@ -14,7 +14,7 @@
 		More information is available in the Activity documentation.
 	</description>
 
-	<version>2.14.2</version>
+	<version>2.14.3</version>
 	<licence>agpl</licence>
 	<author>Frank Karlitschek</author>
 	<author>Joas Schilling</author>

lib/Migration/Version2011Date20201006132544.php

@@ -61,7 +61,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		// Can't switch from Long to clob on Oracle, so we need an intermediate column
 		if ($column->getType() !== Type::getType('text')) {
 			$table->addColumn('amq_subjectparams2', 'text', [
-				'notnull' => true,
+				'notnull' => false,
 			]);
 		}
 

lib/Migration/Version2011Date20201006132546.php

@@ -53,7 +53,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 		$table = $schema->getTable('activity_mq');
 		if (!$table->hasColumn('amq_subjectparams')) {
 			$table->addColumn('amq_subjectparams', 'text', [
-				'notnull' => true,
+				'notnull' => false,
 			]);
 			return $schema;
 		}

lib/Migration/Version2011Date20201207091915.php

@@ -0,0 +1,61 @@
+<?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\Activity\Migration;
+
+use Closure;
+use OCP\DB\ISchemaWrapper;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version2011Date20201207091915 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, 'activity_mq', 'amq_subjectparams');
+
+		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;
+	}
+}