python/mysqlclient
1
0
Fork 0
mirror of https://github.com/PyMySQL/mysqlclient.git synced 2025-08-15 19:31:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

raise NotSupportedError instead of non-existent UnsupportedError

Browse Source 
connection.set_character_set() now avoids raising an exception
if the current character set is already correct, regardless of
MySQL version.
This commit is contained in:
adustman
2006-04-04 15:04:20 +00:00
parent a1e2fb715b
commit f373a32f95
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
MySQLdb/MySQLdb/connections.py
View File

@ -116,7 +116,7 @@ class Connection(_mysql.connection):
dictionary or mapping, contains SSL connection parameters; dictionary or mapping, contains SSL connection parameters;
see the MySQL documentation for more details see the MySQL documentation for more details
(mysql_ssl_set()). If this is set, and the client does not (mysql_ssl_set()). If this is set, and the client does not
support SSL, UnsupportedError will be raised. support SSL, NotSupportedError will be raised.
local_infile local_infile
integer, non-zero enables LOAD LOCAL INFILE; zero disables integer, non-zero enables LOAD LOCAL INFILE; zero disables
@ -253,13 +253,16 @@ class Connection(_mysql.connection):
return 0 return 0
def set_character_set(self, charset): def set_character_set(self, charset):
"""Set the connection character set to charset.""" """Set the connection character set to charset. The character
set can only be changed in MySQL-4.1 and newer. If you try
to change the character set from the current value in an
older version, NotSupportedError will be raised."""
if self.character_set_name() != charset:
try: try:
super(Connection, self).set_character_set(charset) super(Connection, self).set_character_set(charset)
except AttributeError: except AttributeError:
if self._server_version < (4, 1): if self._server_version < (4, 1):
raise UnsupportedError, "server is too old to set charset" raise NotSupportedError, "server is too old to set charset"
if self.character_set_name() != charset:
self.query('SET NAMES %s' % charset) self.query('SET NAMES %s' % charset)
self.store_result() self.store_result()
self.string_decoder.charset = charset self.string_decoder.charset = charset
@ -269,7 +272,7 @@ class Connection(_mysql.connection):
"""Set the connection sql_mode. See MySQL documentation for """Set the connection sql_mode. See MySQL documentation for
legal values.""" legal values."""
if self._server_version < (4, 1): if self._server_version < (4, 1):
raise UnsupportedError, "server is too old to set sql_mode" raise NotSupportedError, "server is too old to set sql_mode"
self.query("SET SESSION sql_mode='%s'" % sql_mode) self.query("SET SESSION sql_mode='%s'" % sql_mode)
self.store_result() self.store_result()