Merge pull request #6566 from nextcloud/fix-tfbc-structure

Fix database structure of twofactor backupcodes app to match 12

apps/twofactor_backupcodes/appinfo/info.xml

@@ -5,7 +5,7 @@
 	<description>A two-factor auth backup codes provider</description>
 	<licence>agpl</licence>
 	<author>Christoph Wurst</author>
-	<version>1.2.1</version>
+	<version>1.2.2</version>
 	<namespace>TwoFactorBackupCodes</namespace>
 	<category>other</category>
 

apps/twofactor_backupcodes/lib/Migration/Version1002Date20170919123342.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 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\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;
+	}
+}