mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-74138-master' of https://github.com/snake/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2022-03-25 13:13:08 +08:00
commit 616fe3ac3a
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
auth/lti/db/upgrade.php
View File

@ -52,7 +52,7 @@ function xmldb_auth_lti_upgrade($oldversion) {
// Adding keys to table auth_lti_linked_login.
$table->add_key('primary', XMLDB_KEY_PRIMARY, ['id']);
$table->add_key('userid_key', XMLDB_KEY_FOREIGN, ['userid'], 'user', ['id']);
$table->add_key('unique_key', XMLDB_KEY_UNIQUE, ['userid, issuer256, sub256']);
$table->add_key('unique_key', XMLDB_KEY_UNIQUE, ['userid', 'issuer256', 'sub256']);
// Conditionally launch create table for auth_lti_linked_login.
if (!$dbman->table_exists($table)) {
@ -63,5 +63,27 @@ function xmldb_auth_lti_upgrade($oldversion) {
upgrade_plugin_savepoint(true, 2021100500, 'auth', 'lti');
}
if ($oldversion < 2022030900) {
// Fix the unique key made up of {userid, issuer256, sub256}.
// This was improperly defined as ['userid, issuer256, sub256'] in the upgrade step above (note the quotes),
// resulting in the potential for missing keys on some databases.
// Drop and re-add the key to make sure we have it in place.
// Define table auth_lti_linked_login to be modified.
$table = new xmldb_table('auth_lti_linked_login');
// Define the key to be dropped and re-added.
$key = new xmldb_key('unique_key', XMLDB_KEY_UNIQUE, ['userid', 'issuer256', 'sub256'], 'auth_lti_linked_login');
// Drop the key.
$dbman->drop_key($table, $key);
// Create the key.
$dbman->add_key($table, $key);
// Auth LTI savepoint reached.
upgrade_plugin_savepoint(true, 2022030900, 'auth', 'lti');
}
return true;
}

2
auth/lti/version.php
View File

@ -24,6 +24,6 @@
defined('MOODLE_INTERNAL') || die();
$plugin->version = 2021100500; // The current plugin version (Date: YYYYMMDDXX).
$plugin->version = 2022030900; // The current plugin version (Date: YYYYMMDDXX).
$plugin->requires = 2021052500; // Requires this Moodle version.
$plugin->component = 'auth_lti'; // Full name of the plugin (used for diagnostics).