Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed #33160 -- Avoided suppressing query errors in _nodb_cursor() on PostgreSQL. #14918

Merged
merged 2 commits into from
Oct 1, 2021
Merged

Fixed #33160 -- Avoided suppressing query errors in _nodb_cursor() on PostgreSQL. #14918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55a1038
Fixed #33160 - Made postgresql _nodb_cursor only transform connection…
blueyed Sep 30, 2021
3bda7a2
add test
blueyed Sep 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions django/db/backends/postgresql/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,13 @@ def is_usable(self):

@contextmanager
def _nodb_cursor(self):
cursor = None
try:
with super()._nodb_cursor() as cursor:
yield cursor
except (Database.DatabaseError, WrappedDatabaseError):
if cursor is not None:
raise
warnings.warn(
"Normally Django will use a connection to the 'postgres' database "
"to avoid running initialization queries against the production "
Expand Down
5 changes: 5 additions & 0 deletions tests/backends/postgresql/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ def mocked_all(self):
with connection._nodb_cursor():
pass

def test_nodb_cursor_reraise_exceptions(self):
with self.assertRaisesMessage(DatabaseError, 'exception'):
with connection._nodb_cursor():
raise DatabaseError('exception')

def test_database_name_too_long(self):
from django.db.backends.postgresql.base import DatabaseWrapper
settings = connection.settings_dict.copy()
Expand Down