upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-01 13:00:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

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

Browse source 
[stable21] Don't pass a column object to addOrderBy
This commit is contained in:
Morris Jobke 2021-06-10 10:12:53 +02:00 committed by GitHub
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
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();