MDL-33562 lib: remove deleted user tokens

lib/db/upgrade.php

@@ -1187,5 +1187,14 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2012062507.01);
     }
 
+    if ($oldversion < 2012062507.04) {
+        // Clean up old tokens which haven't been deleted.
+        $DB->execute("DELETE FROM {user_private_key} WHERE NOT EXISTS
+                         (SELECT 'x' FROM {user} WHERE deleted = 0 AND id = userid)");
+
+        // Main savepoint reached.
+        upgrade_main_savepoint(true, 2012062507.04);
+    }
+
     return true;
 }

version.php

@@ -29,8 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-
-$version  = 2012062507.03;              // YYYYMMDD      = weekly release date of this DEV branch
+$version  = 2012062507.04;              // YYYYMMDD      = weekly release date of this DEV branch
                                         //         RR    = release increments - 00 in DEV branches
                                         //           .XX = incremental changes