From 1def6f92ee128204caee968164c387ee3f9c99ba Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 11 Nov 2020 14:46:06 +0100 Subject: [PATCH] Also make direct_edit.accessed nullable Signed-off-by: Joas Schilling --- .../Version18000Date20191014105105.php | 2 +- .../Version20000Date20201111081915.php | 61 +++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 core/Migrations/Version20000Date20201111081915.php diff --git a/core/Migrations/Version18000Date20191014105105.php b/core/Migrations/Version18000Date20191014105105.php index 2b0f8f5cc1..fca2ebe140 100644 --- a/core/Migrations/Version18000Date20191014105105.php +++ b/core/Migrations/Version18000Date20191014105105.php @@ -82,7 +82,7 @@ class Version18000Date20191014105105 extends SimpleMigrationStep { 'unsigned' => true, ]); $table->addColumn('accessed', Types::BOOLEAN, [ - 'notnull' => true, + 'notnull' => false, 'default' => false ]); diff --git a/core/Migrations/Version20000Date20201111081915.php b/core/Migrations/Version20000Date20201111081915.php new file mode 100644 index 0000000000..6cb76a02a4 --- /dev/null +++ b/core/Migrations/Version20000Date20201111081915.php @@ -0,0 +1,61 @@ + + * + * @author Joas Schilling + * + * @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 . + * + */ + +namespace OC\Core\Migrations; + +use Closure; +use OCP\DB\ISchemaWrapper; +use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; + +class Version20000Date20201111081915 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, 'direct_edit', 'accessed'); + + 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; + } +}