Split dropTable and createTable in two migrations

It is not possible to drop and create the same table in one migration

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

3 files changed, 141 insertions, 48 deletions

diff --git a/apps/user_ldap/lib/Migration/Version1130Date20220110154717.php b/apps/user_ldap/lib/Migration/Version1130Date20220110154717.php
index e940747c819..492081a4543 100644
--- a/apps/user_ldap/lib/Migration/Version1130Date20220110154717.php
+++ b/apps/user_ldap/lib/Migration/Version1130Date20220110154717.php
@@ -43,7 +43,7 @@ class Version1130Date20220110154717 extends SimpleMigrationStep {
 	}
 
 	public function getName() {
-		return 'Copy ldap_group_mapping data to backup table and back if needed';
+		return 'Copy ldap_group_mapping data to backup table if needed';
 	}
 
 	protected function copyGroupMappingData(string $sourceTable, string $destinationTable): void {
@@ -111,49 +111,7 @@ class Version1130Date20220110154717 extends SimpleMigrationStep {
 		}
 
 		$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
index 972a6553877..6132d9060cb 100644
--- a/apps/user_ldap/lib/Migration/Version1130Date20220110154718.php
+++ b/apps/user_ldap/lib/Migration/Version1130Date20220110154718.php
@@ -32,8 +32,44 @@ use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
 
 class Version1130Date20220110154718 extends SimpleMigrationStep {
+	/** @var IDBConnection */
+	private $dbc;
+
+	public function __construct(IDBConnection $dbc) {
+		$this->dbc = $dbc;
+	}
+
 	public function getName() {
-		return 'Drop ldap_group_mapping_backup';
+		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();
 	}
 
 	/**
@@ -46,11 +82,54 @@ class Version1130Date20220110154718 extends SimpleMigrationStep {
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
 
-		if ($schema->hasTable('ldap_group_mapping_backup')) {
-			$schema->dropTable('ldap_group_mapping_backup');
-			return $schema;
+		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' => 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;
 		}
 
-		return null;
+		$output->startProgress();
+		$this->copyGroupMappingData('ldap_group_mapping_backup', 'ldap_group_mapping');
+		$output->finishProgress();
 	}
 }
diff --git a/apps/user_ldap/lib/Migration/Version1130Date20220110154719.php b/apps/user_ldap/lib/Migration/Version1130Date20220110154719.php
new file mode 100644
index 00000000000..9e9ed38cb70
--- /dev/null
+++ b/apps/user_ldap/lib/Migration/Version1130Date20220110154719.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 Version1130Date20220110154719 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;
+	}
+}