Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCôme Chilliet <come.chilliet@nextcloud.com>2022-01-10 14:07:41 +0300
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2022-01-14 11:46:42 +0300
commit4b40402821cefd895d2402c51839cd64e88a6f89 (patch)
tree75720b2a5d78774eae36882c925ea43ebd1cba58
parent1ead55e45cd6a6a3264acc14397360ef22aea711 (diff)
Fix primary key change in user_ldap migration
Use a backup table to copy the data, drop table and recreate it with correct primary key, then copy the data back and drop the backup table. Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
-rw-r--r--apps/user_ldap/lib/Migration/Version1130Date20211102154716.php31
-rw-r--r--apps/user_ldap/lib/Migration/Version1130Date20220110154717.php159
-rw-r--r--apps/user_ldap/lib/Migration/Version1130Date20220110154718.php56
3 files changed, 244 insertions, 2 deletions
diff --git a/apps/user_ldap/lib/Migration/Version1130Date20211102154716.php b/apps/user_ldap/lib/Migration/Version1130Date20211102154716.php
index 80a6f0650da..f464b132133 100644
--- a/apps/user_ldap/lib/Migration/Version1130Date20211102154716.php
+++ b/apps/user_ldap/lib/Migration/Version1130Date20211102154716.php
@@ -103,11 +103,38 @@ class Version1130Date20211102154716 extends SimpleMigrationStep {
$table->addUniqueIndex(['directory_uuid'], 'ldap_group_directory_uuid');
$changeSchema = true;
}
- if (!$table->hasPrimaryKey() || ($table->getPrimaryKeyColumns() !== ['owncloud_name'])) {
- $table->dropPrimaryKey();
+ if (!$table->hasPrimaryKey()) {
$table->setPrimaryKey(['owncloud_name']);
$changeSchema = true;
}
+
+ if ($table->getPrimaryKeyColumns() !== ['owncloud_name']) {
+ // We need to copy the table twice to be able to change primary key, prepare the backup table
+ $table2 = $schema->createTable('ldap_group_mapping_backup');
+ $table2->addColumn('ldap_dn', Types::STRING, [
+ 'notnull' => true,
+ 'length' => 255,
+ 'default' => '',
+ ]);
+ $table2->addColumn('owncloud_name', Types::STRING, [
+ 'notnull' => true,
+ 'length' => 64,
+ 'default' => '',
+ ]);
+ $table2->addColumn('directory_uuid', Types::STRING, [
+ 'notnull' => true,
+ 'length' => 255,
+ 'default' => '',
+ ]);
+ $table2->addColumn('ldap_dn_hash', Types::STRING, [
+ 'notnull' => false,
+ 'length' => 64,
+ ]);
+ $table2->setPrimaryKey(['owncloud_name']);
+ $table2->addUniqueIndex(['ldap_dn_hash'], 'ldap_group_dn_hashes');
+ $table2->addUniqueIndex(['directory_uuid'], 'ldap_group_directory_uuid');
+ $changeSchema = true;
+ }
}
}
diff --git a/apps/user_ldap/lib/Migration/Version1130Date20220110154717.php b/apps/user_ldap/lib/Migration/Version1130Date20220110154717.php
new file mode 100644
index 00000000000..e940747c819
--- /dev/null
+++ b/apps/user_ldap/lib/Migration/Version1130Date20220110154717.php
@@ -0,0 +1,159 @@
+<?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\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;
+ }
+
+ public function getName() {
+ return 'Copy ldap_group_mapping data to backup table and back 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`
+ * @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');
+ $table = $schema->createTable('ldap_group_mapping');
+ $table->addColumn('ldap_dn', Types::STRING, [
+ 'notnull' => true,
+ 'length' => 255,
+ '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();
+ }
+}
diff --git a/apps/user_ldap/lib/Migration/Version1130Date20220110154718.php b/apps/user_ldap/lib/Migration/Version1130Date20220110154718.php
new file mode 100644
index 00000000000..972a6553877
--- /dev/null
+++ b/apps/user_ldap/lib/Migration/Version1130Date20220110154718.php
@@ -0,0 +1,56 @@
+<?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;
+use OCP\Migration\SimpleMigrationStep;
+
+class Version1130Date20220110154718 extends SimpleMigrationStep {
+ public function getName() {
+ return 'Drop ldap_group_mapping_backup';
+ }
+
+ /**
+ * @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')) {
+ $schema->dropTable('ldap_group_mapping_backup');
+ return $schema;
+ }
+
+ return null;
+ }
+}