Fix the type hints of migrations and correctly inject the wrapped schema into migrations

Signed-off-by: Joas Schilling <coding@schilljs.com>

2 files changed, 16 insertions, 21 deletions

diff --git a/lib/private/DB/MigrationService.php b/lib/private/DB/MigrationService.php
index cbe5bd9b957..57283fbe8b5 100644
--- a/lib/private/DB/MigrationService.php
+++ b/lib/private/DB/MigrationService.php
@@ -423,7 +423,7 @@ class MigrationService {
 		}
 
 		$instance->preSchemaChange($this->output, function() {
-			return $this->connection->createSchema();
+			return new SchemaWrapper($this->connection);
 		}, ['tablePrefix' => $this->connection->getPrefix()]);
 
 		$toSchema = $instance->changeSchema($this->output, function() {
@@ -436,7 +436,7 @@ class MigrationService {
 		}
 
 		$instance->postSchemaChange($this->output, function() {
-			return $this->connection->createSchema();
+			return new SchemaWrapper($this->connection);
 		}, ['tablePrefix' => $this->connection->getPrefix()]);
 
 		$this->markAsExecuted($version);
diff --git a/lib/private/DB/SchemaWrapper.php b/lib/private/DB/SchemaWrapper.php
index 2a0660b2a88..4f05b7b00ef 100644
--- a/lib/private/DB/SchemaWrapper.php
+++ b/lib/private/DB/SchemaWrapper.php
@@ -25,9 +25,10 @@ namespace OC\DB;
 
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Schema\Schema;
+use OCP\DB\ISchemaWrapper;
 use OCP\IDBConnection;
 
-class SchemaWrapper {
+class SchemaWrapper implements ISchemaWrapper {
 
 	/** @var IDBConnection|Connection */
 	protected $connection;
@@ -76,6 +77,13 @@ class SchemaWrapper {
 	// Overwritten methods
 
 	/**
+	 * @return array
+	 */
+	public function getTableNames() {
+		return $this->schema->getTableNames();
+	}
+
+	/**
 	 * @param string $tableName
 	 *
 	 * @return \Doctrine\DBAL\Schema\Table
@@ -107,19 +115,6 @@ class SchemaWrapper {
 	}
 
 	/**
-	 * Renames a table.
-	 *
-	 * @param string $oldTableName
-	 * @param string $newTableName
-	 *
-	 * @return \Doctrine\DBAL\Schema\Schema
-	 * @throws DBALException
-	 */
-	public function renameTable($oldTableName, $newTableName) {
-		throw new DBALException('Renaming tables is not supported. Please create and drop the tables manually.');
-	}
-
-	/**
 	 * Drops a table from the schema.
 	 *
 	 * @param string $tableName
@@ -131,11 +126,11 @@ class SchemaWrapper {
 	}
 
 	/**
-	 * @param string $name
-	 * @param array $arguments
-	 * @return mixed
+	 * Gets all tables of this schema.
+	 *
+	 * @return \Doctrine\DBAL\Schema\Table[]
 	 */
-	public function __call($name, $arguments) {
-		return call_user_func_array([$this->schema, $name], $arguments);
+	public function getTables() {
+		return $this->schema->getTables();
 	}
 }