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:
authorDaniel Kesselberg <mail@danielkesselberg.de>2021-06-08 17:30:44 +0300
committerDaniel Kesselberg <mail@danielkesselberg.de>2021-06-08 17:30:44 +0300
commit11cacf63f8249561b856d6283b6b7a7fcfb3bdad (patch)
tree79c2040142d8adf1edbc59921cdff2b2c7dffb88 /core/Command/Db
parentd0cf20cc51c6f7d119d21d3ea3ed81b9b52f2c9d (diff)
Fix #26085
addOrderBy expects a order expression. For the migration scenario we have column objects. Column objects are not supported by quoteColumnName yet. A column object as order expression is most likely an edgy thing when migration database information. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Diffstat (limited to 'core/Command/Db')
-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 e4252264dbb..f05bcdef28e 100644
--- a/core/Command/Db/ConvertType.php
+++ b/core/Command/Db/ConvertType.php
@@ -337,14 +337,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();