From fcb3e9a0712b3ffe0a0a6de6c3083515b4d531e9 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 13 Dec 2021 09:28:13 +0100 Subject: Add a primary key to ratelimit_entries table Signed-off-by: Joas Schilling --- core/Migrations/Version23000Date20210906132259.php | 43 +++++++------- core/Migrations/Version24000Date20211213081506.php | 50 ++++++++++++++++ core/Migrations/Version24000Date20211213081604.php | 66 ++++++++++++++++++++++ 3 files changed, 139 insertions(+), 20 deletions(-) create mode 100644 core/Migrations/Version24000Date20211213081506.php create mode 100644 core/Migrations/Version24000Date20211213081604.php (limited to 'core/Migrations') diff --git a/core/Migrations/Version23000Date20210906132259.php b/core/Migrations/Version23000Date20210906132259.php index 26d18edc8f1..d4476a4d36d 100644 --- a/core/Migrations/Version23000Date20210906132259.php +++ b/core/Migrations/Version23000Date20210906132259.php @@ -11,8 +11,6 @@ use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; class Version23000Date20210906132259 extends SimpleMigrationStep { - private const TABLE_NAME = 'ratelimit_entries'; - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` @@ -20,24 +18,29 @@ class Version23000Date20210906132259 extends SimpleMigrationStep { * @return null|ISchemaWrapper */ public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { - /** @var ISchemaWrapper $schema */ - $schema = $schemaClosure(); - - $hasTable = $schema->hasTable(self::TABLE_NAME); - - if (!$hasTable) { - $table = $schema->createTable(self::TABLE_NAME); - $table->addColumn('hash', Types::STRING, [ - 'notnull' => true, - 'length' => 128, - ]); - $table->addColumn('delete_after', Types::DATETIME, [ - 'notnull' => true, - ]); - $table->addIndex(['hash'], 'ratelimit_hash'); - $table->addIndex(['delete_after'], 'ratelimit_delete_after'); - return $schema; - } + /** + * Table was missing a primary key + * Therefore it was dropped with Version24000Date20211213081506 + * and then recreated with a primary key in Version24000Date20211213081604 + */ +// /** @var ISchemaWrapper $schema */ +// $schema = $schemaClosure(); +// +// $hasTable = $schema->hasTable(self::TABLE_NAME); +// +// if (!$hasTable) { +// $table = $schema->createTable(self::TABLE_NAME); +// $table->addColumn('hash', Types::STRING, [ +// 'notnull' => true, +// 'length' => 128, +// ]); +// $table->addColumn('delete_after', Types::DATETIME, [ +// 'notnull' => true, +// ]); +// $table->addIndex(['hash'], 'ratelimit_hash'); +// $table->addIndex(['delete_after'], 'ratelimit_delete_after'); +// return $schema; +// } return null; } diff --git a/core/Migrations/Version24000Date20211213081506.php b/core/Migrations/Version24000Date20211213081506.php new file mode 100644 index 00000000000..dd9d2626e18 --- /dev/null +++ b/core/Migrations/Version24000Date20211213081506.php @@ -0,0 +1,50 @@ + + * + * @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 Version24000Date20211213081506 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(); + + $hasTable = $schema->hasTable('ratelimit_entries'); + if ($hasTable) { + $schema->dropTable('ratelimit_entries'); + return $schema; + } + + return null; + } +} diff --git a/core/Migrations/Version24000Date20211213081604.php b/core/Migrations/Version24000Date20211213081604.php new file mode 100644 index 00000000000..38ceba93b2e --- /dev/null +++ b/core/Migrations/Version24000Date20211213081604.php @@ -0,0 +1,66 @@ + + * + * @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\DB\Types; +use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; + +class Version24000Date20211213081604 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(); + + $hasTable = $schema->hasTable('ratelimit_entries'); + + if (!$hasTable) { + $table = $schema->createTable('ratelimit_entries'); + $table->addColumn('id', Types::BIGINT, [ + 'autoincrement' => true, + 'notnull' => true, + ]); + $table->addColumn('hash', Types::STRING, [ + 'notnull' => true, + 'length' => 128, + ]); + $table->addColumn('delete_after', Types::DATETIME, [ + 'notnull' => true, + ]); + $table->setPrimaryKey(['id']); + $table->addIndex(['hash'], 'ratelimit_hash'); + $table->addIndex(['delete_after'], 'ratelimit_delete_after'); + return $schema; + } + + return null; + } +} -- cgit v1.2.3