From 23845755f2013adabea27550ed4dc6429ce4f326 Mon Sep 17 00:00:00 2001 From: Côme Chilliet Date: Tue, 11 Jan 2022 16:36:27 +0100 Subject: Move duplicated code to a base class for group_mapping migrations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Côme Chilliet Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com> --- .../lib/Migration/GroupMappingMigration.php | 69 ++++++++++++++++++++++ .../Migration/Version1130Date20220110154717.php | 42 +------------ .../Migration/Version1130Date20220110154718.php | 40 +------------ 3 files changed, 72 insertions(+), 79 deletions(-) create mode 100644 apps/user_ldap/lib/Migration/GroupMappingMigration.php (limited to 'apps/user_ldap/lib/Migration') diff --git a/apps/user_ldap/lib/Migration/GroupMappingMigration.php b/apps/user_ldap/lib/Migration/GroupMappingMigration.php new file mode 100644 index 00000000000..f89bebe57d6 --- /dev/null +++ b/apps/user_ldap/lib/Migration/GroupMappingMigration.php @@ -0,0 +1,69 @@ + + * + * @author Côme Chilliet + * + * @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\User_LDAP\Migration; + +use OCP\IDBConnection; +use OCP\Migration\SimpleMigrationStep; + +abstract class GroupMappingMigration extends SimpleMigrationStep { + + /** @var IDBConnection */ + private $dbc; + + public function __construct(IDBConnection $dbc) { + $this->dbc = $dbc; + } + + protected function copyGroupMappingData(string $sourceTable, string $destinationTable): void { + $insert = $this->dbc->getQueryBuilder(); + $insert->insert($destinationTable) + ->values([ + 'ldap_dn' => $insert->createParameter('ldap_dn'), + 'owncloud_name' => $insert->createParameter('owncloud_name'), + 'directory_uuid' => $insert->createParameter('directory_uuid'), + 'ldap_dn_hash' => $insert->createParameter('ldap_dn_hash'), + ]); + + $query = $this->dbc->getQueryBuilder(); + $query->select('*') + ->from($sourceTable); + + + $result = $query->executeQuery(); + while ($row = $result->fetch()) { + $insert + ->setParameter('ldap_dn', $row['ldap_dn']) + ->setParameter('owncloud_name', $row['owncloud_name']) + ->setParameter('directory_uuid', $row['directory_uuid']) + ->setParameter('ldap_dn_hash', $row['ldap_dn_hash']) + ; + + $insert->executeStatement(); + } + $result->closeCursor(); + } +} diff --git a/apps/user_ldap/lib/Migration/Version1130Date20220110154717.php b/apps/user_ldap/lib/Migration/Version1130Date20220110154717.php index 492081a4543..2ffda4198c1 100644 --- a/apps/user_ldap/lib/Migration/Version1130Date20220110154717.php +++ b/apps/user_ldap/lib/Migration/Version1130Date20220110154717.php @@ -28,53 +28,13 @@ namespace OCA\User_LDAP\Migration; use Closure; use OCP\DB\ISchemaWrapper; -use OCP\DB\Types; -use OCP\IDBConnection; use OCP\Migration\IOutput; -use OCP\Migration\SimpleMigrationStep; - -class Version1130Date20220110154717 extends SimpleMigrationStep { - - /** @var IDBConnection */ - private $dbc; - - public function __construct(IDBConnection $dbc) { - $this->dbc = $dbc; - } +class Version1130Date20220110154717 extends GroupMappingMigration { public function getName() { return 'Copy ldap_group_mapping data to backup table if needed'; } - protected function copyGroupMappingData(string $sourceTable, string $destinationTable): void { - $insert = $this->dbc->getQueryBuilder(); - $insert->insert($destinationTable) - ->values([ - 'ldap_dn' => $insert->createParameter('ldap_dn'), - 'owncloud_name' => $insert->createParameter('owncloud_name'), - 'directory_uuid' => $insert->createParameter('directory_uuid'), - 'ldap_dn_hash' => $insert->createParameter('ldap_dn_hash'), - ]); - - $query = $this->dbc->getQueryBuilder(); - $query->select('*') - ->from($sourceTable); - - - $result = $query->executeQuery(); - while ($row = $result->fetch()) { - $insert - ->setParameter('ldap_dn', $row['ldap_dn']) - ->setParameter('owncloud_name', $row['owncloud_name']) - ->setParameter('directory_uuid', $row['directory_uuid']) - ->setParameter('ldap_dn_hash', $row['ldap_dn_hash']) - ; - - $insert->executeStatement(); - } - $result->closeCursor(); - } - /** * @param IOutput $output * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` diff --git a/apps/user_ldap/lib/Migration/Version1130Date20220110154718.php b/apps/user_ldap/lib/Migration/Version1130Date20220110154718.php index 6132d9060cb..caadd9d9be2 100644 --- a/apps/user_ldap/lib/Migration/Version1130Date20220110154718.php +++ b/apps/user_ldap/lib/Migration/Version1130Date20220110154718.php @@ -28,50 +28,14 @@ namespace OCA\User_LDAP\Migration; use Closure; use OCP\DB\ISchemaWrapper; +use OCP\DB\Types; use OCP\Migration\IOutput; -use OCP\Migration\SimpleMigrationStep; - -class Version1130Date20220110154718 extends SimpleMigrationStep { - /** @var IDBConnection */ - private $dbc; - - public function __construct(IDBConnection $dbc) { - $this->dbc = $dbc; - } +class Version1130Date20220110154718 extends GroupMappingMigration { public function getName() { return 'Copy ldap_group_mapping data from backup table and if needed'; } - protected function copyGroupMappingData(string $sourceTable, string $destinationTable): void { - $insert = $this->dbc->getQueryBuilder(); - $insert->insert($destinationTable) - ->values([ - 'ldap_dn' => $insert->createParameter('ldap_dn'), - 'owncloud_name' => $insert->createParameter('owncloud_name'), - 'directory_uuid' => $insert->createParameter('directory_uuid'), - 'ldap_dn_hash' => $insert->createParameter('ldap_dn_hash'), - ]); - - $query = $this->dbc->getQueryBuilder(); - $query->select('*') - ->from($sourceTable); - - - $result = $query->executeQuery(); - while ($row = $result->fetch()) { - $insert - ->setParameter('ldap_dn', $row['ldap_dn']) - ->setParameter('owncloud_name', $row['owncloud_name']) - ->setParameter('directory_uuid', $row['directory_uuid']) - ->setParameter('ldap_dn_hash', $row['ldap_dn_hash']) - ; - - $insert->executeStatement(); - } - $result->closeCursor(); - } - /** * @param IOutput $output * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` -- cgit v1.2.3