From 55d9d2437097b7a22ad10d4bbc13346174be02cf Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 19 Sep 2017 14:37:30 +0200 Subject: [PATCH] Fix database structure of twofactor backupcodes app to match 12 Signed-off-by: Joas Schilling --- apps/twofactor_backupcodes/appinfo/info.xml | 2 +- .../Version1002Date20170919123342.php | 56 +++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 apps/twofactor_backupcodes/lib/Migration/Version1002Date20170919123342.php diff --git a/apps/twofactor_backupcodes/appinfo/info.xml b/apps/twofactor_backupcodes/appinfo/info.xml index 565bd1ebcc..0002d0dcf0 100644 --- a/apps/twofactor_backupcodes/appinfo/info.xml +++ b/apps/twofactor_backupcodes/appinfo/info.xml @@ -5,7 +5,7 @@ A two-factor auth backup codes provider agpl Christoph Wurst - 1.2.1 + 1.2.2 TwoFactorBackupCodes other diff --git a/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170919123342.php b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170919123342.php new file mode 100644 index 0000000000..bb35a900a1 --- /dev/null +++ b/apps/twofactor_backupcodes/lib/Migration/Version1002Date20170919123342.php @@ -0,0 +1,56 @@ + + * + * @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 OCA\TwoFactorBackupCodes\Migration; + +use Doctrine\DBAL\Schema\Schema; +use Doctrine\DBAL\Types\Type; +use OCP\Migration\SimpleMigrationStep; +use OCP\Migration\IOutput; + +class Version1002Date20170919123342 extends SimpleMigrationStep { + + /** + * @param IOutput $output + * @param \Closure $schemaClosure The `\Closure` returns a `Schema` + * @param array $options + * @return null|Schema + * @since 13.0.0 + */ + public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { + /** @var Schema $schema */ + $schema = $schemaClosure(); + + $table = $schema->getTable('twofactor_backupcodes'); + $column = $table->getColumn('user_id'); + $column->setDefault(''); + + $column = $table->getColumn('used'); + if ($column->getType()->getName() !== Type::SMALLINT) { + $column->setType(Type::getType(Type::SMALLINT)); + $column->setOptions(['length' => 6]); + } + + return $schema; + } +}