Skip to content

Commit 5f8869a

Browse files
authored
Use joinedload to avoid raise_on_sql (#5965)
1 parent 6bddefe commit 5f8869a

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

warehouse/admin/views/users.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
from pyramid.httpexceptions import HTTPBadRequest, HTTPNotFound, HTTPSeeOther
2020
from pyramid.view import view_config
2121
from sqlalchemy import or_
22+
from sqlalchemy.orm import joinedload
2223
from sqlalchemy.orm.exc import NoResultFound
2324

2425
from warehouse import forms
@@ -189,7 +190,10 @@ def user_delete(request):
189190
deleted_user = request.db.query(User).filter(User.username == "deleted-user").one()
190191

191192
journals = (
192-
request.db.query(JournalEntry).filter(JournalEntry.submitted_by == user).all()
193+
request.db.query(JournalEntry)
194+
.options(joinedload("submitted_by"))
195+
.filter(JournalEntry.submitted_by == user)
196+
.all()
193197
)
194198

195199
for journal in journals:

0 commit comments

Comments
 (0)