From dfdbf9ec1e50ac0416297503b05322cdd2f5234a Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Fri, 14 Sep 2007 22:05:58 +0000 Subject: [PATCH] Fixed #5161 -- Changed MySQL backend only to report warning once. Thanks, durdinator git-svn-id: http://code.djangoproject.com/svn/django/trunk@6229 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/backends/mysql/base.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py index f913b887092..92eac6ea3ec 100644 --- a/django/db/backends/mysql/base.py +++ b/django/db/backends/mysql/base.py @@ -24,6 +24,11 @@ from MySQLdb.constants import FIELD_TYPE import types import re +# Raise exceptions for database warnings if DEBUG is on +if settings.DEBUG: + from warnings import filterwarnings + filterwarnings("error", category=Database.Warning) + DatabaseError = Database.DatabaseError IntegrityError = Database.IntegrityError @@ -153,7 +158,6 @@ class DatabaseWrapper(BaseDatabaseWrapper): return False def _cursor(self, settings): - from warnings import filterwarnings if not self._valid_connection(): kwargs = { 'conv': django_conversions, @@ -175,8 +179,6 @@ class DatabaseWrapper(BaseDatabaseWrapper): kwargs.update(self.options) self.connection = Database.connect(**kwargs) cursor = self.connection.cursor() - if settings.DEBUG: - filterwarnings("error", category=Database.Warning) return cursor def _rollback(self):