Merge pull request #27446 from nextcloud/backport/27429/stable21

[stable21] Don't pass a column object to addOrderBy
nextcloud · Jun 10, 2021 · f627f38 · f627f38
2 parents 7c5f2e6 + 7259259
commit f627f38
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/core/Command/Db/ConvertType.php b/core/Command/Db/ConvertType.php
@@ -340,14 +340,11 @@ protected function copyTable(Connection $fromDB, Connection $toDB, Table $table,
 		try {
 			$orderColumns = $table->getPrimaryKeyColumns();
 		} catch (Exception $e) {
-			$orderColumns = [];
-			foreach ($table->getColumns() as $column) {
-				$orderColumns[] = $column->getName();
-			}
+			$orderColumns = $table->getColumns();
 		}
 
 		foreach ($orderColumns as $column) {
-			$query->addOrderBy($column);
+			$query->addOrderBy($column->getName());
 		}
 
 		$insertQuery = $toDB->getQueryBuilder();