kopia lustrzana https://github.com/nextcloud/social
Merge pull request #453 from nextcloud/bugfix/noid/create-hashed-primary-keys
creating a new field id_prim, set as primary and fill itpull/463/head
Maxence Lange
GitHub
commit
dd2346d4a4
|
|
@ -85,6 +85,8 @@ class ActorsRequest extends ActorsRequestBuilder {
|
|||
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
|
||||
);
|
||||
|
||||
$this->generatePrimaryKey($qb, $id);
|
||||
|
||||
$qb->execute();
|
||||
|
||||
return $id;
|
||||
|
|
|
|||
|
|
@ -106,6 +106,8 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
|
|||
|
||||
$qb->setValue('icon_id', $qb->createNamedParameter($iconId));
|
||||
|
||||
$this->generatePrimaryKey($qb, $actor->getId());
|
||||
|
||||
$qb->execute();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -61,6 +61,9 @@ class CacheDocumentsRequest extends CacheDocumentsRequestBuilder {
|
|||
'creation',
|
||||
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
|
||||
);
|
||||
|
||||
$this->generatePrimaryKey($qb, $document->getId());
|
||||
|
||||
$qb->execute();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -107,6 +107,15 @@ class CoreRequestBuilder {
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param IQueryBuilder $qb
|
||||
* @param string $id
|
||||
*/
|
||||
public function generatePrimaryKey(IQueryBuilder $qb, string $id) {
|
||||
$qb->setValue('id_prim', $qb->createNamedParameter(hash('sha512', $id)));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Limit the request to the Id
|
||||
*
|
||||
|
|
|
|||
|
|
@ -66,6 +66,8 @@ class FollowsRequest extends FollowsRequestBuilder {
|
|||
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
|
||||
);
|
||||
|
||||
$this->generatePrimaryKey($qb, $follow->getId());
|
||||
|
||||
$qb->execute();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -455,6 +455,8 @@ class NotesRequest extends NotesRequestBuilder {
|
|||
$qb->createNamedParameter(new DateTime('now'), IQueryBuilder::PARAM_DATE)
|
||||
);
|
||||
|
||||
$this->generatePrimaryKey($qb, $note->getId());
|
||||
|
||||
return $qb;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,150 @@
|
|||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
* Nextcloud - Social Support
|
||||
*
|
||||
* This file is licensed under the Affero General Public License version 3 or
|
||||
* later. See the COPYING file.
|
||||
*
|
||||
* @author Maxence Lange <maxence@artificial-owl.com>
|
||||
* @copyright 2018, Maxence Lange <maxence@artificial-owl.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\Social\Migration;
|
||||
|
||||
|
||||
use Closure;
|
||||
use Doctrine\DBAL\DBALException;
|
||||
use Doctrine\DBAL\Schema\SchemaException;
|
||||
use Doctrine\DBAL\Types\Type;
|
||||
use OCA\Social\Db\CoreRequestBuilder;
|
||||
use OCP\DB\ISchemaWrapper;
|
||||
use OCP\IDBConnection;
|
||||
use OCP\Migration\IOutput;
|
||||
use OCP\Migration\SimpleMigrationStep;
|
||||
|
||||
|
||||
/**
|
||||
* Class Version0002Date20190305091901
|
||||
*
|
||||
* @package OCA\Social\Migration
|
||||
*/
|
||||
class Version0002Date20190305091901 extends SimpleMigrationStep {
|
||||
|
||||
|
||||
/** @var IDBConnection */
|
||||
private $connection;
|
||||
|
||||
|
||||
/** @var array */
|
||||
public static $setAsKeys = [
|
||||
[CoreRequestBuilder::TABLE_CACHE_ACTORS, 'id'],
|
||||
[CoreRequestBuilder::TABLE_CACHE_DOCUMENTS, 'id'],
|
||||
[CoreRequestBuilder::TABLE_SERVER_ACTORS, 'id'],
|
||||
[CoreRequestBuilder::TABLE_SERVER_FOLLOWS, 'id'],
|
||||
[CoreRequestBuilder::TABLE_SERVER_NOTES, 'id']
|
||||
];
|
||||
|
||||
|
||||
/**
|
||||
* @param IDBConnection $connection
|
||||
*/
|
||||
public function __construct(IDBConnection $connection) {
|
||||
$this->connection = $connection;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param IOutput $output
|
||||
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
|
||||
* @param array $options
|
||||
*
|
||||
* @return ISchemaWrapper
|
||||
* @throws SchemaException
|
||||
* @throws DBALException
|
||||
*/
|
||||
public function changeSchema(IOutput $output, Closure $schemaClosure, array $options
|
||||
): ISchemaWrapper {
|
||||
/** @var ISchemaWrapper $schema */
|
||||
$schema = $schemaClosure();
|
||||
|
||||
foreach (self::$setAsKeys as $edit) {
|
||||
list($tableName, $field) = $edit;
|
||||
|
||||
$table = $schema->getTable($tableName);
|
||||
|
||||
$prim = self::getPrimField($field);
|
||||
if (!$table->hasColumn($prim)) {
|
||||
$table->addColumn($prim, Type::STRING, ['notnull' => false, 'length' => 255]);
|
||||
}
|
||||
}
|
||||
|
||||
return $schema;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param IOutput $output
|
||||
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
|
||||
* @param array $options
|
||||
*/
|
||||
public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
|
||||
|
||||
foreach (self::$setAsKeys as $edit) {
|
||||
list($tableName, $field) = $edit;
|
||||
|
||||
$prim = self::getPrimField($field);
|
||||
$qb = $this->connection->getQueryBuilder();
|
||||
|
||||
/** @noinspection PhpMethodParametersCountMismatchInspection */
|
||||
$qb->select('t.' . $field)
|
||||
->from($tableName, 't');
|
||||
|
||||
$cursor = $qb->execute();
|
||||
while ($data = $cursor->fetch()) {
|
||||
$id = $data[$field];
|
||||
$hash = hash('sha512', $id);
|
||||
$update = $this->connection->getQueryBuilder();
|
||||
$update->update($tableName);
|
||||
$update->set($prim, $update->createNamedParameter($hash));
|
||||
$update->where(
|
||||
$qb->expr()
|
||||
->eq($field, $update->createNamedParameter($id))
|
||||
);
|
||||
$update->execute();
|
||||
}
|
||||
$cursor->closeCursor();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param string $field
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public static function getPrimField(string $field): string {
|
||||
return $field . '_prim';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,101 @@
|
|||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
* Nextcloud - Social Support
|
||||
*
|
||||
* This file is licensed under the Affero General Public License version 3 or
|
||||
* later. See the COPYING file.
|
||||
*
|
||||
* @author Maxence Lange <maxence@artificial-owl.com>
|
||||
* @copyright 2018, Maxence Lange <maxence@artificial-owl.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\Social\Migration;
|
||||
|
||||
|
||||
use Closure;
|
||||
use Doctrine\DBAL\DBALException;
|
||||
use Doctrine\DBAL\Schema\SchemaException;
|
||||
use Doctrine\DBAL\Types\Type;
|
||||
use OCA\Social\Db\CoreRequestBuilder;
|
||||
use OCP\DB\ISchemaWrapper;
|
||||
use OCP\IDBConnection;
|
||||
use OCP\Migration\IOutput;
|
||||
use OCP\Migration\SimpleMigrationStep;
|
||||
|
||||
|
||||
/**
|
||||
* Class Version0002Date20190305091902
|
||||
*
|
||||
* @package OCA\Social\Migration
|
||||
*/
|
||||
class Version0002Date20190305091902 extends SimpleMigrationStep {
|
||||
|
||||
|
||||
/** @var IDBConnection */
|
||||
private $connection;
|
||||
|
||||
|
||||
/**
|
||||
* @param IDBConnection $connection
|
||||
*/
|
||||
public function __construct(IDBConnection $connection) {
|
||||
$this->connection = $connection;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param IOutput $output
|
||||
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
|
||||
* @param array $options
|
||||
*
|
||||
* @return ISchemaWrapper
|
||||
* @throws SchemaException
|
||||
* @throws DBALException
|
||||
*/
|
||||
public function changeSchema(IOutput $output, Closure $schemaClosure, array $options
|
||||
): ISchemaWrapper {
|
||||
/** @var ISchemaWrapper $schema */
|
||||
$schema = $schemaClosure();
|
||||
|
||||
foreach (Version0002Date20190305091901::$setAsKeys as $edit) {
|
||||
list($tableName, $field) = $edit;
|
||||
|
||||
$table = $schema->getTable($tableName);
|
||||
|
||||
$prim = Version0002Date20190305091901::getPrimField($field);
|
||||
$table->setPrimaryKey([$prim]);
|
||||
}
|
||||
|
||||
return $schema;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param IOutput $output
|
||||
* @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
|
||||
* @param array $options
|
||||
*/
|
||||
public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Ładowanie…
Reference in New Issue