-
-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #30663 from nextcloud/backport/30568/stable23
[stable23] Fix primary key change in user_ldap migration
- Loading branch information
Showing
7 changed files
with
337 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright Copyright (c) 2020 Joas Schilling <coding@schilljs.com> | ||
| * | ||
| * @author Côme Chilliet <come.chilliet@nextcloud.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\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(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
apps/user_ldap/lib/Migration/Version1130Date20220110154717.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright Copyright (c) 2020 Joas Schilling <coding@schilljs.com> | ||
| * | ||
| * @author Côme Chilliet <come.chilliet@nextcloud.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\User_LDAP\Migration; | ||
|
|
||
| use Closure; | ||
| use OCP\DB\ISchemaWrapper; | ||
| use OCP\Migration\IOutput; | ||
|
|
||
| class Version1130Date20220110154717 extends GroupMappingMigration { | ||
| public function getName() { | ||
| return 'Copy ldap_group_mapping data to backup table if needed'; | ||
| } | ||
|
|
||
| /** | ||
| * @param IOutput $output | ||
| * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` | ||
| * @param array $options | ||
| * @since 13.0.0 | ||
| */ | ||
| public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { | ||
| /** @var ISchemaWrapper $schema */ | ||
| $schema = $schemaClosure(); | ||
|
|
||
| if (!$schema->hasTable('ldap_group_mapping_backup')) { | ||
| // Backup table does not exist | ||
| return; | ||
| } | ||
|
|
||
| $output->startProgress(); | ||
| $this->copyGroupMappingData('ldap_group_mapping', 'ldap_group_mapping_backup'); | ||
| $output->finishProgress(); | ||
| } | ||
|
|
||
| /** | ||
| * @param IOutput $output | ||
| * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` | ||
| * @param array $options | ||
| * @return null|ISchemaWrapper | ||
| */ | ||
| public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { | ||
| /** @var ISchemaWrapper $schema */ | ||
| $schema = $schemaClosure(); | ||
|
|
||
| if (!$schema->hasTable('ldap_group_mapping_backup')) { | ||
| // Backup table does not exist | ||
| return null; | ||
| } | ||
|
|
||
| $schema->dropTable('ldap_group_mapping'); | ||
|
|
||
| return $schema; | ||
| } | ||
| } |
99 changes: 99 additions & 0 deletions
99
apps/user_ldap/lib/Migration/Version1130Date20220110154718.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright Copyright (c) 2020 Joas Schilling <coding@schilljs.com> | ||
| * | ||
| * @author Côme Chilliet <come.chilliet@nextcloud.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\User_LDAP\Migration; | ||
|
|
||
| use Closure; | ||
| use OCP\DB\ISchemaWrapper; | ||
| use OCP\DB\Types; | ||
| use OCP\Migration\IOutput; | ||
|
|
||
| class Version1130Date20220110154718 extends GroupMappingMigration { | ||
| public function getName() { | ||
| return 'Copy ldap_group_mapping data from backup table and if needed'; | ||
| } | ||
|
|
||
| /** | ||
| * @param IOutput $output | ||
| * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` | ||
| * @param array $options | ||
| * @return null|ISchemaWrapper | ||
| */ | ||
| public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper { | ||
| /** @var ISchemaWrapper $schema */ | ||
| $schema = $schemaClosure(); | ||
|
|
||
| if (!$schema->hasTable('ldap_group_mapping_backup')) { | ||
| // Backup table does not exist | ||
| return null; | ||
| } | ||
|
|
||
| $table = $schema->createTable('ldap_group_mapping'); | ||
| $table->addColumn('ldap_dn', Types::STRING, [ | ||
| 'notnull' => true, | ||
| 'length' => 4096, | ||
| 'default' => '', | ||
| ]); | ||
| $table->addColumn('owncloud_name', Types::STRING, [ | ||
| 'notnull' => true, | ||
| 'length' => 64, | ||
| 'default' => '', | ||
| ]); | ||
| $table->addColumn('directory_uuid', Types::STRING, [ | ||
| 'notnull' => true, | ||
| 'length' => 255, | ||
| 'default' => '', | ||
| ]); | ||
| $table->addColumn('ldap_dn_hash', Types::STRING, [ | ||
| 'notnull' => false, | ||
| 'length' => 64, | ||
| ]); | ||
| $table->setPrimaryKey(['owncloud_name']); | ||
| $table->addUniqueIndex(['ldap_dn_hash'], 'ldap_group_dn_hashes'); | ||
| $table->addUniqueIndex(['directory_uuid'], 'ldap_group_directory_uuid'); | ||
|
|
||
| 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) { | ||
| /** @var ISchemaWrapper $schema */ | ||
| $schema = $schemaClosure(); | ||
|
|
||
| if (!$schema->hasTable('ldap_group_mapping_backup')) { | ||
| // Backup table does not exist | ||
| return; | ||
| } | ||
|
|
||
| $output->startProgress(); | ||
| $this->copyGroupMappingData('ldap_group_mapping_backup', 'ldap_group_mapping'); | ||
| $output->finishProgress(); | ||
| } | ||
| } |
Oops, something went wrong.