From d4ffafe4674dbda984c78ea9f7db894156e2a764 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 4 Jun 2014 18:15:58 +0200
Subject: Removed simulate db update flag and split into separate methods

---
 lib/private/db/mdb2schemamanager.php | 37 ++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

(limited to 'lib/private/db')

diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php
index 397aaf3608a..734ba18d1ac 100644
--- a/lib/private/db/mdb2schemamanager.php
+++ b/lib/private/db/mdb2schemamanager.php
@@ -73,33 +73,46 @@ class MDB2SchemaManager {
 		}
 	}
 
+	/**
+	 * Reads database schema from file
+	 *
+	 * @param string $file file to read from
+	 */
+	private function readSchemaFromFile($file) {
+		$platform = $this->conn->getDatabasePlatform();
+		$schemaReader = new MDB2SchemaReader(\OC_Config::getObject(), $platform);
+		return $schemaReader->loadSchemaFromFile($file);
+	}
+
 	/**
 	 * update the database scheme
 	 * @param string $file file to read structure from
 	 * @param bool $generateSql only return the sql needed for the upgrade
-	 * @param bool $simulate whether to simulate on separate tables instead of the real onces
 	 * @return string|boolean
 	 */
-	public function updateDbFromStructure($file, $generateSql = false, $simulate = false) {
-
-		$platform = $this->conn->getDatabasePlatform();
-		$schemaReader = new MDB2SchemaReader(\OC_Config::getObject(), $platform);
-		$toSchema = $schemaReader->loadSchemaFromFile($file);
+	public function updateDbFromStructure($file, $generateSql = false) {
+		$toSchema = $this->readSchemaFromFile($file);
 		$migrator = $this->getMigrator();
 
 		if ($generateSql) {
 			return $migrator->generateChangeScript($toSchema);
 		} else {
-			if ($simulate) {
-				$migrator->checkMigrate($toSchema);
-			}
-			else {
-				$migrator->migrate($toSchema);
-			}
+			$migrator->migrate($toSchema);
 			return true;
 		}
 	}
 
+	/**
+	 * update the database scheme
+	 * @param string $file file to read structure from
+	 * @return string|boolean
+	 */
+	public function simulateUpdateDbFromStructure($file) {
+		$toSchema = $this->readSchemaFromFile($file);
+		$migrator = $this->getMigrator()->checkMigrate($toSchema);
+		return true;
+	}
+
 	/**
 	 * @param \Doctrine\DBAL\Schema\Schema $schema
 	 * @return string
-- 
cgit v1.2.3