Fixed #316 -- Changed MySQL backend to disregard warnings
git-svn-id: http://code.djangoproject.com/svn/django/trunk@494 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
54f93895a8
commit
a9b43edde2
|
@ -9,6 +9,7 @@ from django.core.db.dicthelpers import *
|
||||||
import MySQLdb as Database
|
import MySQLdb as Database
|
||||||
from MySQLdb.converters import conversions
|
from MySQLdb.converters import conversions
|
||||||
from MySQLdb.constants import FIELD_TYPE
|
from MySQLdb.constants import FIELD_TYPE
|
||||||
|
from MySQLdb.cursors import CursorNW # Ignores MySQL warnings.
|
||||||
import types
|
import types
|
||||||
|
|
||||||
DatabaseError = Database.DatabaseError
|
DatabaseError = Database.DatabaseError
|
||||||
|
@ -30,7 +31,8 @@ class DatabaseWrapper:
|
||||||
from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PASSWORD, DEBUG
|
from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PASSWORD, DEBUG
|
||||||
if self.connection is None:
|
if self.connection is None:
|
||||||
self.connection = Database.connect(user=DATABASE_USER, db=DATABASE_NAME,
|
self.connection = Database.connect(user=DATABASE_USER, db=DATABASE_NAME,
|
||||||
passwd=DATABASE_PASSWORD, host=DATABASE_HOST, conv=django_conversions)
|
passwd=DATABASE_PASSWORD, host=DATABASE_HOST, conv=django_conversions,
|
||||||
|
cursorclass=CursorNW)
|
||||||
if DEBUG:
|
if DEBUG:
|
||||||
return base.CursorDebugWrapper(self.connection.cursor(), self)
|
return base.CursorDebugWrapper(self.connection.cursor(), self)
|
||||||
return self.connection.cursor()
|
return self.connection.cursor()
|
||||||
|
|
Loading…
Reference in New Issue