Merge pull request mozilla#1294 from lmorchard/user-migration-fixes

Fix order of DB operations in user account cleanup migration
imromec · Aug 26, 2016 · f551813 · f551813
2 parents ef66d79 + c65c39f
commit f551813
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/testpilot/users/migrations/0003_delete_nonstaff_users.py b/testpilot/users/migrations/0003_delete_nonstaff_users.py
@@ -18,13 +18,13 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RunPython(delete_nonstaff_users_forwards),
-
         # Clean up tables left over from FxA removal...
-        migrations.RunSQL('DROP TABLE IF EXISTS account_emailaddress'),
         migrations.RunSQL('DROP TABLE IF EXISTS account_emailconfirmation'),
-        migrations.RunSQL('DROP TABLE IF EXISTS socialaccount_socialaccount'),
-        migrations.RunSQL('DROP TABLE IF EXISTS socialaccount_socialapp'),
+        migrations.RunSQL('DROP TABLE IF EXISTS account_emailaddress'),
+        migrations.RunSQL('DROP TABLE IF EXISTS socialaccount_socialtoken'),
         migrations.RunSQL('DROP TABLE IF EXISTS socialaccount_socialapp_sites'),
-        migrations.RunSQL('DROP TABLE IF EXISTS socialaccount_socialtoken')
+        migrations.RunSQL('DROP TABLE IF EXISTS socialaccount_socialapp'),
+        migrations.RunSQL('DROP TABLE IF EXISTS socialaccount_socialaccount'),
+
+        migrations.RunPython(delete_nonstaff_users_forwards)
     ]