Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Wurst <ChristophWurst@users.noreply.github.com>2021-06-09 10:12:03 +0300
committerGitHub <noreply@github.com>2021-06-09 10:12:03 +0300
commit932a385c562481ed6a9df95af9b69fa49f267cb2 (patch)
tree456b83d6ff706242f7f83b2dfefff7f380c97ac6 /core/Command
parent1c97818e14702a3d52bc79a42f65a3d107d233ce (diff)
parent11cacf63f8249561b856d6283b6b7a7fcfb3bdad (diff)
Merge pull request #27429 from nextcloud/bug/26085/wrong-data-add-order-by
Don't pass a column object to addOrderBy
Diffstat (limited to 'core/Command')
-rw-r--r--core/Command/Db/ConvertType.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/core/Command/Db/ConvertType.php b/core/Command/Db/ConvertType.php
index 5b8980e632b..47a07b2f324 100644
--- a/core/Command/Db/ConvertType.php
+++ b/core/Command/Db/ConvertType.php
@@ -336,14 +336,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();