Merge pull request #101 from thomasmckay/2204-cherry-pick

QUAY-2204 - cherry-pick - avoid db connection timeouts

data/migrations/versions/703298a825c2_backfill_new_encrypted_fields.py

@@ -130,17 +130,15 @@ class OAuthApplication(BaseModel):
 def upgrade(tables, tester, progress_reporter):
     op = ProgressWrapper(original_op, progress_reporter)
 
+    # NOTE: Disconnects the Alembic database connection. We do this because the Peewee calls below
+    # use a *different* connection, and if we leave the alembic connection open, it'll time out.
+    # See: https://github.com/sqlalchemy/alembic/issues/630
+    op.get_bind().execute("COMMIT")
+    op.get_bind().invalidate()
+
     from app import app
 
     if app.config.get("SETUP_COMPLETE", False) or tester.is_testing():
-        # Empty all access token names to fix the bug where we put the wrong name and code
-        # in for some tokens.
-        (
-            AccessToken.update(token_name=None)
-            .where(~(AccessToken.token_name >> None), AccessToken.temporary == False)
-            .execute()
-        )
-
         # AccessToken.
         logger.info("Backfilling encrypted credentials for access tokens")
         for access_token in _iterate(