Skip to content

[stable23] Fix primary key change in user_ldap migration #30663

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

Merged
blizzz merged 6 commits into from
Jan 14, 2022
Merged

[stable23] Fix primary key change in user_ldap migration #30663

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d90e908
Fix primary key change in user_ldap migration
come-nc Jan 10, 2022
03a570a
Split dropTable and createTable in two migrations
come-nc Jan 11, 2022
66ca292
Move duplicated code to a base class for group_mapping migrations
come-nc Jan 11, 2022
e4235bd
Fix user_ldap migration for long DNs support
come-nc Jan 13, 2022
9a9c860
Update autoloader
nickvergessen Jan 13, 2022
1013380
Remove useless indexes with duplicated names on backup table
come-nc Jan 13, 2022
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
Prev Previous commit
Next Next commit
Fix user_ldap migration for long DNs support 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc @backportbot
come-nc authored and backportbot[bot] committed Jan 14, 2022
commit e4235bdebaf623d6ba16abdb04f89a267ad8682d
78 changes: 30 additions & 48 deletions apps/user_ldap/lib/Migration/Version1130Date20211102154716.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,12 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
$changeSchema = true;
}
$column = $table->getColumn('ldap_dn');
if ($column->getLength() < 4096) {
$column->setLength(4096);
$changeSchema = true;
}
if ($tableName === 'ldap_user_mapping') {
if ($column->getLength() < 4096) {
$column->setLength(4096);
$changeSchema = true;
}

if ($table->hasIndex('ldap_dn_users')) {
$table->dropIndex('ldap_dn_users');
$changeSchema = true;
Expand All @@ -91,50 +92,31 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
$changeSchema = true;
}
} else {
if ($table->hasIndex('owncloud_name_groups')) {
$table->dropIndex('owncloud_name_groups');
$changeSchema = true;
}
if (!$table->hasIndex('ldap_group_dn_hashes')) {
$table->addUniqueIndex(['ldap_dn_hash'], 'ldap_group_dn_hashes');
$changeSchema = true;
}
if (!$table->hasIndex('ldap_group_directory_uuid')) {
$table->addUniqueIndex(['directory_uuid'], 'ldap_group_directory_uuid');
$changeSchema = true;
}
if (!$table->hasPrimaryKey()) {
$table->setPrimaryKey(['owncloud_name']);
$changeSchema = true;
}

if ($table->getPrimaryKeyColumns() !== ['owncloud_name']) {
// We need to copy the table twice to be able to change primary key, prepare the backup table
$table2 = $schema->createTable('ldap_group_mapping_backup');
$table2->addColumn('ldap_dn', Types::STRING, [
'notnull' => true,
'length' => 255,
'default' => '',
]);
$table2->addColumn('owncloud_name', Types::STRING, [
'notnull' => true,
'length' => 64,
'default' => '',
]);
$table2->addColumn('directory_uuid', Types::STRING, [
'notnull' => true,
'length' => 255,
'default' => '',
]);
$table2->addColumn('ldap_dn_hash', Types::STRING, [
'notnull' => false,
'length' => 64,
]);
$table2->setPrimaryKey(['owncloud_name']);
$table2->addUniqueIndex(['ldap_dn_hash'], 'ldap_group_dn_hashes');
$table2->addUniqueIndex(['directory_uuid'], 'ldap_group_directory_uuid');
$changeSchema = true;
}
// We need to copy the table twice to be able to change primary key, prepare the backup table
$table2 = $schema->createTable('ldap_group_mapping_backup');
$table2->addColumn('ldap_dn', Types::STRING, [
'notnull' => true,
'length' => 4096,
'default' => '',
]);
$table2->addColumn('owncloud_name', Types::STRING, [
'notnull' => true,
'length' => 64,
'default' => '',
]);
$table2->addColumn('directory_uuid', Types::STRING, [
'notnull' => true,
'length' => 255,
'default' => '',
]);
$table2->addColumn('ldap_dn_hash', Types::STRING, [
'notnull' => false,
'length' => 64,
]);
$table2->setPrimaryKey(['owncloud_name'], 'lgm_backup_primary');
$table2->addUniqueIndex(['ldap_dn_hash'], 'ldap_group_dn_hashes');
$table2->addUniqueIndex(['directory_uuid'], 'ldap_group_directory_uuid');
$changeSchema = true;
}
}

Expand Down
2 changes: 1 addition & 1 deletion apps/user_ldap/lib/Migration/Version1130Date20220110154718.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
$table = $schema->createTable('ldap_group_mapping');
$table->addColumn('ldap_dn', Types::STRING, [
'notnull' => true,
'length' => 255,
'length' => 4096,
'default' => '',
]);
$table->addColumn('owncloud_name', Types::STRING, [
Expand Down