Merge pull request #4425 from nextcloud/oci
Primary key is too long for oracle
This commit is contained in:
commit
e920e20284
|
@ -5,7 +5,7 @@
|
||||||
<overwrite>false</overwrite>
|
<overwrite>false</overwrite>
|
||||||
<charset>utf8</charset>
|
<charset>utf8</charset>
|
||||||
<table>
|
<table>
|
||||||
<name>*dbprefix*twofactor_backup_codes</name>
|
<name>*dbprefix*twofactor_backupcodes</name>
|
||||||
<declaration>
|
<declaration>
|
||||||
<field>
|
<field>
|
||||||
<name>id</name>
|
<name>id</name>
|
||||||
|
@ -37,7 +37,7 @@
|
||||||
</field>
|
</field>
|
||||||
|
|
||||||
<index>
|
<index>
|
||||||
<name>two_factor_backupcodes_user_id</name>
|
<name>twofactor_backupcodes_uid</name>
|
||||||
<field>
|
<field>
|
||||||
<name>user_id</name>
|
<name>user_id</name>
|
||||||
<sorting>ascending</sorting>
|
<sorting>ascending</sorting>
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<description>A two-factor auth backup codes provider</description>
|
<description>A two-factor auth backup codes provider</description>
|
||||||
<licence>agpl</licence>
|
<licence>agpl</licence>
|
||||||
<author>Christoph Wurst</author>
|
<author>Christoph Wurst</author>
|
||||||
<version>1.1.0</version>
|
<version>1.1.1</version>
|
||||||
<namespace>TwoFactorBackupCodes</namespace>
|
<namespace>TwoFactorBackupCodes</namespace>
|
||||||
<category>other</category>
|
<category>other</category>
|
||||||
|
|
||||||
|
@ -29,4 +29,10 @@
|
||||||
<provider>OCA\TwoFactorBackupCodes\Activity\Provider</provider>
|
<provider>OCA\TwoFactorBackupCodes\Activity\Provider</provider>
|
||||||
</providers>
|
</providers>
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
|
<repair-steps>
|
||||||
|
<post-migration>
|
||||||
|
<step>OCA\TwoFactorBackupCodes\Migration\CopyEntriesFromOldTable</step>
|
||||||
|
</post-migration>
|
||||||
|
</repair-steps>
|
||||||
</info>
|
</info>
|
||||||
|
|
|
@ -22,13 +22,14 @@
|
||||||
namespace OCA\TwoFactorBackupCodes\Db;
|
namespace OCA\TwoFactorBackupCodes\Db;
|
||||||
|
|
||||||
use OCP\AppFramework\Db\Mapper;
|
use OCP\AppFramework\Db\Mapper;
|
||||||
|
use OCP\DB\QueryBuilder\IQueryBuilder;
|
||||||
use OCP\IDBConnection;
|
use OCP\IDBConnection;
|
||||||
use OCP\IUser;
|
use OCP\IUser;
|
||||||
|
|
||||||
class BackupCodeMapper extends Mapper {
|
class BackupCodeMapper extends Mapper {
|
||||||
|
|
||||||
public function __construct(IDBConnection $db) {
|
public function __construct(IDBConnection $db) {
|
||||||
parent::__construct($db, 'twofactor_backup_codes');
|
parent::__construct($db, 'twofactor_backupcodes');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -40,7 +41,7 @@ class BackupCodeMapper extends Mapper {
|
||||||
$qb = $this->db->getQueryBuilder();
|
$qb = $this->db->getQueryBuilder();
|
||||||
|
|
||||||
$qb->select('id', 'user_id', 'code', 'used')
|
$qb->select('id', 'user_id', 'code', 'used')
|
||||||
->from('twofactor_backup_codes')
|
->from('twofactor_backupcodes')
|
||||||
->where($qb->expr()->eq('user_id', $qb->createNamedParameter($user->getUID())));
|
->where($qb->expr()->eq('user_id', $qb->createNamedParameter($user->getUID())));
|
||||||
$result = $qb->execute();
|
$result = $qb->execute();
|
||||||
|
|
||||||
|
@ -66,7 +67,7 @@ class BackupCodeMapper extends Mapper {
|
||||||
/* @var IQueryBuilder $qb */
|
/* @var IQueryBuilder $qb */
|
||||||
$qb = $this->db->getQueryBuilder();
|
$qb = $this->db->getQueryBuilder();
|
||||||
|
|
||||||
$qb->delete('twofactor_backup_codes')
|
$qb->delete('twofactor_backupcodes')
|
||||||
->where($qb->expr()->eq('user_id', $qb->createNamedParameter($uid)));
|
->where($qb->expr()->eq('user_id', $qb->createNamedParameter($uid)));
|
||||||
$qb->execute();
|
$qb->execute();
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,108 @@
|
||||||
|
<?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 OCP\DB\QueryBuilder\IQueryBuilder;
|
||||||
|
use OCP\IConfig;
|
||||||
|
use OCP\IDBConnection;
|
||||||
|
use OCP\Migration\IOutput;
|
||||||
|
use OCP\Migration\IRepairStep;
|
||||||
|
|
||||||
|
class CopyEntriesFromOldTable implements IRepairStep {
|
||||||
|
|
||||||
|
/** @var IDBConnection */
|
||||||
|
protected $connection;
|
||||||
|
|
||||||
|
/** @var IConfig */
|
||||||
|
protected $config;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param IDBConnection $connection
|
||||||
|
* @param IConfig $config
|
||||||
|
*/
|
||||||
|
public function __construct(IDBConnection $connection, IConfig $config) {
|
||||||
|
$this->connection = $connection;
|
||||||
|
$this->config = $config;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the step's name
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
* @since 9.1.0
|
||||||
|
*/
|
||||||
|
public function getName() {
|
||||||
|
return 'Copy twofactor backup codes from legacy table';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run repair step.
|
||||||
|
* Must throw exception on error.
|
||||||
|
*
|
||||||
|
* @since 9.1.0
|
||||||
|
* @param IOutput $output
|
||||||
|
* @throws \Exception in case of failure
|
||||||
|
*/
|
||||||
|
public function run(IOutput $output) {
|
||||||
|
$version = $this->config->getAppValue('twofactor_backupcodes', 'installed_version', '0.0.0');
|
||||||
|
if (version_compare($version, '1.1.1', '>=')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$this->connection->tableExists('twofactor_backup_codes')) {
|
||||||
|
// Legacy table does not exist
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$insert = $this->connection->getQueryBuilder();
|
||||||
|
$insert->insert('twofactor_backupcodes')
|
||||||
|
->values([
|
||||||
|
// Inserting with id might fail: 'id' => $insert->createParameter('id'),
|
||||||
|
'user_id' => $insert->createParameter('user_id'),
|
||||||
|
'code' => $insert->createParameter('code'),
|
||||||
|
'used' => $insert->createParameter('used'),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$query = $this->connection->getQueryBuilder();
|
||||||
|
$query->select('*')
|
||||||
|
->from('twofactor_backup_codes')
|
||||||
|
->orderBy('id', 'ASC');
|
||||||
|
$result = $query->execute();
|
||||||
|
|
||||||
|
$output->startProgress();
|
||||||
|
while ($row = $result->fetch()) {
|
||||||
|
$output->advance();
|
||||||
|
|
||||||
|
$insert
|
||||||
|
// Inserting with id might fail: ->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT)
|
||||||
|
->setParameter('user_id', $row['user_id'], IQueryBuilder::PARAM_STR)
|
||||||
|
->setParameter('code', $row['code'], IQueryBuilder::PARAM_STR)
|
||||||
|
->setParameter('used', $row['used'], IQueryBuilder::PARAM_INT)
|
||||||
|
->execute();
|
||||||
|
}
|
||||||
|
$output->finishProgress();
|
||||||
|
|
||||||
|
$this->connection->dropTable('twofactor_backup_codes');
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue