use $schemaClosure in migration

Signed-off-by: notEvil <[email protected]>
nextcloud · Jul 9, 2023 · f5d5bbf · f5d5bbf
1 parent ec0ab03
commit f5d5bbf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/lib/Db/TableManager.php b/lib/Db/TableManager.php
@@ -156,18 +156,22 @@ public function resetWatch(): array {
 	 *
 	 * @psalm-return non-empty-list<string>
 	 */
-	public function createTables(): array {
+	public function createTables(?Schema $schema = null): array {
+		if ($schema === null) {
+			$schema = &$this->schema;
+		}
+
 		$messages = [];
 
 		foreach (TableSchema::TABLES as $tableName => $columns) {
 			$tableName = $this->dbPrefix . $tableName;
 
-			if ($this->schema->hasTable($tableName)) {
-				$table = $this->schema->getTable($tableName);
+			if ($schema->hasTable($tableName)) {
+				$table = $schema->getTable($tableName);
 				$messages[] = 'Validating table ' . $table->getName();
 				$tableCreated = false;
 			} else {
-				$table = $this->schema->createTable($tableName);
+				$table = $schema->createTable($tableName);
 				$tableCreated = true;
 				$messages[] = 'Creating table ' . $table->getName();
 			}

diff --git a/lib/Migration/Version050100Date20230515083001.php b/lib/Migration/Version050100Date20230515083001.php
@@ -47,14 +47,14 @@ public function __construct(
 	 */
 	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
 		// Create tables, as defined in TableSchema or fix column definitions
-		$messages = $this->tableManager->createTables();
-		$this->tableManager->migrate();
+		$schema = $schemaClosure();
+		$messages = $this->tableManager->createTables($schema->getWrappedSchema());
 
 		foreach ($messages as $message) {
 			$output->info('Polls - ' . $message);
 		};
 
-		return null;
+		return $schema;
 	}
 
 	/**