Revert "Installation goes brrrr"

3 files changed, 3 insertions, 49 deletions

diff --git a/lib/private/DB/MigrationService.php b/lib/private/DB/MigrationService.php
index 9c94cbc61fa..cd0280162d3 100644
--- a/lib/private/DB/MigrationService.php
+++ b/lib/private/DB/MigrationService.php
@@ -124,11 +124,6 @@ class MigrationService {
 			return false;
 		}
 
-		if ($this->connection->tableExists('migrations')) {
-			$this->migrationTableCreated = true;
-			return false;
-		}
-
 		$schema = new SchemaWrapper($this->connection);
 
 		/**
@@ -413,11 +408,6 @@ 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) {
@@ -426,42 +416,6 @@ 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
 	 *
 	 * @param string $to
diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index 96f14933a76..9388711697a 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('latest', true);
+			$ms->migrate();
 		}
 		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('latest', true);
+			$ms->migrate();
 		}
 
 		//run appinfo/install.php
diff --git a/lib/private/Setup/AbstractDatabase.php b/lib/private/Setup/AbstractDatabase.php
index 8a9aed09f1b..98d6b84ab9c 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('latest', true);
+		$ms->migrate();
 	}
 }