summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/databases/mysql.py
diff options
context:
space:
mode:
authorJason Kirtland <jek@discorporate.us>2007-11-18 18:19:52 +0000
committerJason Kirtland <jek@discorporate.us>2007-11-18 18:19:52 +0000
commitea627ebe5c8c34ffc4ab5efd04a4855c9419e9c6 (patch)
tree088dba60ebe3c3ab6b9ef34e0ea9d8f7ec1e6a69 /lib/sqlalchemy/databases/mysql.py
parent08a434881faa14eab8f17274b97af042903eaba9 (diff)
downloadsqlalchemy-ea627ebe5c8c34ffc4ab5efd04a4855c9419e9c6.tar.gz
Migrated Connection.properties to Connection.info ('info' is the new standard name for user-writable property collections that came out of [ticket:573]). 'properties' is now an alias, will be removed in 0.5.
Diffstat (limited to 'lib/sqlalchemy/databases/mysql.py')
-rw-r--r--lib/sqlalchemy/databases/mysql.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index eaba40a6d..441c099a2 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -1591,9 +1591,9 @@ class MySQLDialect(default.DefaultDialect):
"""
try:
- return connection.properties['_mysql_server_version_info']
+ return connection.info['_mysql_server_version_info']
except KeyError:
- version = connection.properties['_mysql_server_version_info'] = \
+ version = connection.info['_mysql_server_version_info'] = \
self._server_version_info(connection.connection.connection)
return version
@@ -1663,8 +1663,8 @@ class MySQLDialect(default.DefaultDialect):
"""Sniff out the character set in use for connection results."""
# Allow user override, won't sniff if force_charset is set.
- if 'force_charset' in connection.properties:
- return connection.properties['force_charset']
+ if 'force_charset' in connection.info:
+ return connection.info['force_charset']
# Note: MySQL-python 1.2.1c7 seems to ignore changes made
# on a connection via set_character_set()
@@ -1710,7 +1710,7 @@ class MySQLDialect(default.DefaultDialect):
# http://dev.mysql.com/doc/refman/5.0/en/name-case-sensitivity.html
try:
- return connection.properties['lower_case_table_names']
+ return connection.info['lower_case_table_names']
except KeyError:
row = _compat_fetchone(connection.execute(
"SHOW VARIABLES LIKE 'lower_case_table_names'"),
@@ -1727,7 +1727,7 @@ class MySQLDialect(default.DefaultDialect):
else:
cs = int(row[1])
row.close()
- connection.properties['lower_case_table_names'] = cs
+ connection.info['lower_case_table_names'] = cs
return cs
def _detect_collations(self, connection, charset=None):
@@ -1737,7 +1737,7 @@ class MySQLDialect(default.DefaultDialect):
"""
try:
- return connection.properties['collations']
+ return connection.info['collations']
except KeyError:
collations = {}
if self.server_version_info(connection) < (4, 1, 0):
@@ -1746,7 +1746,7 @@ class MySQLDialect(default.DefaultDialect):
rs = connection.execute('SHOW COLLATION')
for row in _compat_fetchall(rs, charset):
collations[row[0]] = row[1]
- connection.properties['collations'] = collations
+ connection.info['collations'] = collations
return collations
def _show_create_table(self, connection, table, charset=None,