Skip to content

fix(migration): stop using the removed IIndex::hasColumnAtPosition() #1493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
solracsf wants to merge 1 commit into from
Closed

fix(migration): stop using the removed IIndex::hasColumnAtPosition() #1493

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions lib/Migration/Version01022Date20221202161257.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,19 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
$table = $schema->getTable('user_oidc_sessions');
$indexes = $table->getIndexes();
foreach ($indexes as $index) {
$columns = $index->getColumns();
// fix created_at index which is not unique
if ($index->isUnique() && $index->hasColumnAtPosition('created_at')) {
if ($index->isUnique() && $this->startsWithColumn($columns, 'created_at')) {
$table->dropIndex($index->getName());
$table->addIndex(['created_at'], 'user_oidc_sess_crat');
$somethingChanged = true;
}
// rename indexes on sid and nc_session_id if needed
if ($index->isUnique() && $index->hasColumnAtPosition('sid') && $index->getName() !== 'user_oidc_sess_sid') {
if ($index->isUnique() && $this->startsWithColumn($columns, 'sid') && $index->getName() !== 'user_oidc_sess_sid') {
$table->renameIndex($index->getName(), 'user_oidc_sess_sid');
$somethingChanged = true;
}
if ($index->isUnique() && $index->hasColumnAtPosition('nc_session_id') && $index->getName() !== 'user_oidc_sess_sess_id') {
if ($index->isUnique() && $this->startsWithColumn($columns, 'nc_session_id') && $index->getName() !== 'user_oidc_sess_sess_id') {
$table->renameIndex($index->getName(), 'user_oidc_sess_sess_id');
$somethingChanged = true;
}
Expand All @@ -59,8 +60,9 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
$table = $schema->getTable('user_oidc_providers');
$indexes = $table->getIndexes();
foreach ($indexes as $index) {
$columns = $index->getColumns();
// rename index on identifier if needed
if ($index->isUnique() && $index->hasColumnAtPosition('identifier') && $index->getName() !== 'user_oidc_prov_idtf') {
if ($index->isUnique() && $this->startsWithColumn($columns, 'identifier') && $index->getName() !== 'user_oidc_prov_idtf') {
$table->renameIndex($index->getName(), 'user_oidc_prov_idtf');
$somethingChanged = true;
}
Expand All @@ -69,4 +71,21 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt

return $somethingChanged ? $schema : null;
}

/**
* Whether the first column of an index is the given column.
*
* Replaces IIndex::hasColumnAtPosition() which was removed from the public
* API in Nextcloud 35. Column names are compared like Doctrine did, without
* quoting and case insensitively, so $columnName must be given lowercase.
*
* @param list<string> $indexColumns
*/
private function startsWithColumn(array $indexColumns, string $columnName): bool {
if ($indexColumns === []) {
return false;
}

return strtolower(str_replace(['`', '"', '[', ']'], '', $indexColumns[0])) === $columnName;
}
}
Loading