Ticket #3370: mysql-utf8-complete.2.patch

File mysql-utf8-complete.2.patch, 1.3 kB (added by anton@khalikov.ru, 2 years ago)
Better patch that fix the issue and should work correctly with MySQL 4.0

django/db/models/base.py

old	new
77	77	return getattr(self, self._meta.pk.attname)
78	78
79	79	def __repr__(self):
80		return '<%s: %s>' % (self.__class__.__name__, self)
	80	try:
	81	return '<%s: %s>' % (self.__class__.__name__, self)
	82	except UnicodeEncodeError:
	83	return '<%s: %s>' % (self.__class__.__name__, self.__str__().encode(settings.DEFAULT_CHARSET))
81	84
82	85	def __str__(self):
83	86	return '%s object' % self.__class__.__name__

old	new
98	98	kwargs['port'] = int(settings.DATABASE_PORT)
99	99	kwargs.update(self.options)
100	100	self.connection = Database.connect(**kwargs)
	101	if self.connection.get_server_info() >= '4.1':
	102	self.connection.charset = 'utf8'
101	103	cursor = self.connection.cursor()
102	104	if self.connection.get_server_info() >= '4.1':
103	105	cursor.execute("SET NAMES 'utf8'")