From 5a914ffff188d9ee1dc0ce6ac50b13b4f47f11a9 Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Mon, 14 Mar 2022 10:08:05 -0100 Subject: [PATCH] fix primaryKeys on circles_event Signed-off-by: Maxence Lange --- .../Version0022Date20220526113601.php | 2 +- .../Version0023Date20211216113101.php | 35 +---- .../Version0024Date20220203123901.php | 109 +++++++++++++++ .../Version0024Date20220203123902.php | 130 ++++++++++++++++++ 4 files changed, 241 insertions(+), 35 deletions(-) create mode 100644 lib/Migration/Version0024Date20220203123901.php create mode 100644 lib/Migration/Version0024Date20220203123902.php diff --git a/lib/Migration/Version0022Date20220526113601.php b/lib/Migration/Version0022Date20220526113601.php index 0bb15764c..b6bcb3a38 100644 --- a/lib/Migration/Version0022Date20220526113601.php +++ b/lib/Migration/Version0022Date20220526113601.php @@ -97,7 +97,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt 'display_name', 'string', [ 'notnull' => false, 'default' => '', - 'length' => 127 + 'length' => 255 ] ); $table->addColumn( diff --git a/lib/Migration/Version0023Date20211216113101.php b/lib/Migration/Version0023Date20211216113101.php index 023020cc3..8318f3481 100644 --- a/lib/Migration/Version0023Date20211216113101.php +++ b/lib/Migration/Version0023Date20211216113101.php @@ -10,7 +10,7 @@ * later. See the COPYING file. * * @author Maxence Lange - * @copyright 2021 + * @copyright 2022 * @license GNU AGPL version 3 or any later version * * This program is free software: you can redistribute it and/or modify @@ -31,11 +31,7 @@ namespace OCA\Circles\Migration; -use Closure; -use Doctrine\DBAL\Schema\SchemaException; -use OCP\DB\ISchemaWrapper; use OCP\IDBConnection; -use OCP\Migration\IOutput; use OCP\Migration\SimpleMigrationStep; /** @@ -52,33 +48,4 @@ class Version0023Date20211216113101 extends SimpleMigrationStep { public function __construct(IDBConnection $connection) { } - - /** - * @param IOutput $output - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` - * @param array $options - * - * @return null|ISchemaWrapper - * @throws SchemaException - */ - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { - /** @var ISchemaWrapper $schema */ - $schema = $schemaClosure(); - - if ($schema->hasTable('circles_token')) { - $table = $schema->getTable('circles_token'); - $table->changeColumn( - 'password', [ - 'length' => 127 - ] - ); - } - - if ($schema->hasTable('circles_event')) { - $table = $schema->getTable('circles_event'); - $table->setPrimaryKey(['token']); - } - - return $schema; - } } diff --git a/lib/Migration/Version0024Date20220203123901.php b/lib/Migration/Version0024Date20220203123901.php new file mode 100644 index 000000000..e52d36b06 --- /dev/null +++ b/lib/Migration/Version0024Date20220203123901.php @@ -0,0 +1,109 @@ + + * @copyright 2022 + * @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 OCA\Circles\Migration; + +use Closure; +use Doctrine\DBAL\Schema\SchemaException; +use OCP\DB\ISchemaWrapper; +use OCP\IDBConnection; +use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; + +/** + * Class Version0024Date20220203123901 + * + * @package OCA\Circles\Migration + */ +class Version0024Date20220203123901 extends SimpleMigrationStep { + + + /** + * @param IDBConnection $connection + */ + public function __construct(IDBConnection $connection) { + } + + + /** + * @param IOutput $output + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @param array $options + * + * @return null|ISchemaWrapper + * @throws SchemaException + */ + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { + /** @var ISchemaWrapper $schema */ + $schema = $schemaClosure(); + + if ($schema->hasTable('circles_token')) { + $table = $schema->getTable('circles_token'); + $table->changeColumn( + 'password', [ + 'length' => 127 + ] + ); + } + + if ($schema->hasTable('circles_member')) { + $table = $schema->getTable('circles_member'); + $table->changeColumn( + 'instance', + [ + 'default' => '', + 'notnull' => false, + 'length' => 255 + ] + ); + } + + if ($schema->hasTable('circles_circle')) { + $table = $schema->getTable('circles_circle'); + $table->changeColumn( + 'display_name', + [ + 'notnull' => false, + 'default' => '', + 'length' => 255 + ] + ); + } + + // dropping to be re-created with the right primary keys. + if ($schema->hasTable('circles_event')) { + $schema->dropTable('circles_event'); + } + + return $schema; + } + +} diff --git a/lib/Migration/Version0024Date20220203123902.php b/lib/Migration/Version0024Date20220203123902.php new file mode 100644 index 000000000..ee3fa5cf5 --- /dev/null +++ b/lib/Migration/Version0024Date20220203123902.php @@ -0,0 +1,130 @@ + + * @copyright 2022 + * @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 OCA\Circles\Migration; + +use Closure; +use Doctrine\DBAL\Schema\SchemaException; +use OCP\DB\ISchemaWrapper; +use OCP\IDBConnection; +use OCP\Migration\IOutput; +use OCP\Migration\SimpleMigrationStep; + +class Version0024Date20220203123902 extends SimpleMigrationStep { + + + /** + * @param IDBConnection $connection + */ + public function __construct(IDBConnection $connection) { + } + + + /** + * @param IOutput $output + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` + * @param array $options + * + * @return null|ISchemaWrapper + * @throws SchemaException + */ + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { + /** @var ISchemaWrapper $schema */ + $schema = $schemaClosure(); + + if (!$schema->hasTable('circles_event')) { + $table = $schema->createTable('circles_event'); + $table->addColumn( + 'token', 'string', [ + 'notnull' => false, + 'length' => 63, + ] + ); + $table->addColumn( + 'event', 'text', [ + 'notnull' => false + ] + ); + $table->addColumn( + 'result', 'text', [ + 'notnull' => false + ] + ); + $table->addColumn( + 'instance', 'string', [ + 'length' => 255, + 'notnull' => false + ] + ); + $table->addColumn( + 'interface', 'integer', [ + 'notnull' => true, + 'length' => 1, + 'default' => 0 + ] + ); + $table->addColumn( + 'severity', 'integer', [ + 'length' => 3, + 'notnull' => false + ] + ); + $table->addColumn( + 'retry', 'integer', [ + 'length' => 3, + 'notnull' => false + ] + ); + $table->addColumn( + 'status', 'integer', [ + 'length' => 3, + 'notnull' => false + ] + ); + $table->addColumn( + 'updated', 'datetime', [ + 'notnull' => false, + ] + ); + $table->addColumn( + 'creation', 'bigint', [ + 'length' => 14, + 'notnull' => false + ] + ); + + $table->setPrimaryKey(['token', 'instance']); + } + + return $schema; + } + +}