From d7b5d4cb58f75e4598d3d537c743905c301d7952 Mon Sep 17 00:00:00 2001
From: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
Date: Wed, 11 Nov 2020 20:12:13 +0100
Subject: [PATCH 1/2] Revert "Revert "Installation goes brrrr""

---
 lib/private/DB/MigrationService.php    | 46 ++++++++++++++++++++++++++
 lib/private/Installer.php              |  4 +--
 lib/private/Setup/AbstractDatabase.php |  2 +-
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/lib/private/DB/MigrationService.php b/lib/private/DB/MigrationService.php
index cd0280162d..9c94cbc61f 100644
--- a/lib/private/DB/MigrationService.php
+++ b/lib/private/DB/MigrationService.php
@@ -124,6 +124,11 @@ class MigrationService {
 			return false;
 		}
 
+		if ($this->connection->tableExists('migrations')) {
+			$this->migrationTableCreated = true;
+			return false;
+		}
+
 		$schema = new SchemaWrapper($this->connection);
 
 		/**
@@ -408,6 +413,11 @@ class MigrationService {
 	 * @throws \InvalidArgumentException
 	 */
 	public function migrate($to = 'latest', $schemaOnly = false) {
+		if ($schemaOnly) {
+			$this->migrateSchemaOnly($to);
+			return;
+		}
+
 		// read known migrations
 		$toBeExecuted = $this->getMigrationsToExecute($to);
 		foreach ($toBeExecuted as $version) {
@@ -415,6 +425,42 @@ class MigrationService {
 		}
 	}
 
+	/**
+	 * Applies all not yet applied versions up to $to
+	 *
+	 * @param string $to
+	 * @throws \InvalidArgumentException
+	 */
+	public function migrateSchemaOnly($to = 'latest') {
+		// read known migrations
+		$toBeExecuted = $this->getMigrationsToExecute($to);
+
+		if (empty($toBeExecuted)) {
+			return;
+		}
+
+		$toSchema = null;
+		foreach ($toBeExecuted as $version) {
+			$instance = $this->createInstance($version);
+
+			$toSchema = $instance->changeSchema($this->output, function () use ($toSchema) {
+				return $toSchema ?: new SchemaWrapper($this->connection);
+			}, ['tablePrefix' => $this->connection->getPrefix()]) ?: $toSchema;
+
+			$this->markAsExecuted($version);
+		}
+
+		if ($toSchema instanceof SchemaWrapper) {
+			$targetSchema = $toSchema->getWrappedSchema();
+			if ($this->checkOracle) {
+				$beforeSchema = $this->connection->createSchema();
+				$this->ensureOracleIdentifierLengthLimit($beforeSchema, $targetSchema, strlen($this->connection->getPrefix()));
+			}
+			$this->connection->migrateToSchema($targetSchema);
+			$toSchema->performDropTableCalls();
+		}
+	}
+
 	/**
 	 * Get the human readable descriptions for the migration steps to run
 	 *
diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index 9388711697..96f14933a7 100644
--- a/lib/private/Installer.php
+++ b/lib/private/Installer.php
@@ -154,7 +154,7 @@ class Installer {
 			}
 		} else {
 			$ms = new \OC\DB\MigrationService($info['id'], \OC::$server->getDatabaseConnection());
-			$ms->migrate();
+			$ms->migrate('latest', true);
 		}
 		if ($previousVersion) {
 			OC_App::executeRepairSteps($appId, $info['repair-steps']['post-migration']);
@@ -589,7 +589,7 @@ class Installer {
 			}
 		} else {
 			$ms = new \OC\DB\MigrationService($app, \OC::$server->getDatabaseConnection());
-			$ms->migrate();
+			$ms->migrate('latest', true);
 		}
 
 		//run appinfo/install.php
diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php
index 98d6b84ab9..8a9aed09f1 100644
--- a/lib/private/Setup/AbstractDatabase.php
+++ b/lib/private/Setup/AbstractDatabase.php
@@ -150,6 +150,6 @@ abstract class AbstractDatabase {
 			return;
 		}
 		$ms = new MigrationService('core', \OC::$server->getDatabaseConnection());
-		$ms->migrate();
+		$ms->migrate('latest', true);
 	}
 }

From 9a3ce2f71fffc166cf9676ee9231eb167d8954a4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Mon, 16 Nov 2020 19:34:38 +0100
Subject: [PATCH 2/2] Don't drop the table anymore when we create it again

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/private/DB/SchemaWrapper.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/private/DB/SchemaWrapper.php b/lib/private/DB/SchemaWrapper.php
index e42535d64a..440008d35b 100644
--- a/lib/private/DB/SchemaWrapper.php
+++ b/lib/private/DB/SchemaWrapper.php
@@ -111,6 +111,7 @@ class SchemaWrapper implements ISchemaWrapper {
 	 * @return \Doctrine\DBAL\Schema\Table
 	 */
 	public function createTable($tableName) {
+		unset($this->tablesToDelete[$tableName]);
 		return $this->schema->createTable($this->connection->getPrefix() . $tableName);
 	}