sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

[stable21] Don't pass a column object to addOrderBy
pull/27455/head
Morris Jobke 2021-06-10 10:12:53 +07:00 committed by GitHub
parent 7c5f2e63b4 7259259d1e
commit f627f38b79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/Command/Db/ConvertType.php
Unescape Escape View File

@ -340,14 +340,11 @@ class ConvertType extends Command implements CompletionAwareInterface {
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();