mirror of
https://github.com/django/django.git
synced 2025-09-12 13:36:31 +00:00
Fixed #3754 -- Re-introduced utf-8 as default encoding for interaction with
MySQL backend (a side-effect of [4724]). Thanks Andy Dustman and Michael Radziej. git-svn-id: http://code.djangoproject.com/svn/django/trunk@4760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
9fb40185fe
commit
1f9711ffb0
1 changed files with 2 additions and 0 deletions
|
@ -80,6 +80,8 @@ class DatabaseWrapper(local):
|
||||||
if not self._valid_connection():
|
if not self._valid_connection():
|
||||||
kwargs = {
|
kwargs = {
|
||||||
'conv': django_conversions,
|
'conv': django_conversions,
|
||||||
|
'charset': 'utf8',
|
||||||
|
'use_unicode': False,
|
||||||
}
|
}
|
||||||
if settings.DATABASE_USER:
|
if settings.DATABASE_USER:
|
||||||
kwargs['user'] = settings.DATABASE_USER
|
kwargs['user'] = settings.DATABASE_USER
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue