innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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

This commit is contained in:
Daniel Hahler 2021-10-01 07:23:57 +02:00 committed by GitHub
parent 492ed60f23
commit 98c8bf1cee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/backends/postgresql/base.py
View File

@ -304,10 +304,13 @@ class DatabaseWrapper(BaseDatabaseWrapper):
@contextmanager @contextmanager
def _nodb_cursor(self): def _nodb_cursor(self):
cursor = None
try: try:
with super()._nodb_cursor() as cursor: with super()._nodb_cursor() as cursor:
yield cursor yield cursor
except (Database.DatabaseError, WrappedDatabaseError): except (Database.DatabaseError, WrappedDatabaseError):
if cursor is not None:
raise
warnings.warn( warnings.warn(
"Normally Django will use a connection to the 'postgres' database " "Normally Django will use a connection to the 'postgres' database "
"to avoid running initialization queries against the production " "to avoid running initialization queries against the production "

5
tests/backends/postgresql/tests.py
View File

@ -103,6 +103,11 @@ class Tests(TestCase):
with connection._nodb_cursor(): with connection._nodb_cursor():
pass 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): def test_database_name_too_long(self):
from django.db.backends.postgresql.base import DatabaseWrapper from django.db.backends.postgresql.base import DatabaseWrapper
settings = connection.settings_dict.copy() settings = connection.settings_dict.copy()