undo that change with the _, it doesn't break round trips

diff --git a/CHANGES b/CHANGES
index 3377cf383b86ebc902a774b888d464203da9a71b..0760031f9dcb7fd24bb13795daff49e83dbaf5fa 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -240,14 +240,7 @@ CHANGES
   - a CREATE TABLE will put the COLLATE option 
     after CHARSET, which appears to be part of 
     MySQL's arbitrary rules regarding if it will actually
-    work or not.  [ticket:2225]
-
-  - reflecting a MySQL table will ensure that the 
-    options added to the Table at the table.kwargs
-    level have spaces converted to underscores.
-    This is a slight behavioral change specifically
-    to the "mysql_default_charset" option which 
-    previously would not be symmetrical.
+    work or not.  [ticket:2225]  Also in 0.6.9.
 
 - mssql
   - Changes to attempt support of FreeTDS 0.91 with 

diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 1d7d8984962ae1873392dc3d64160ba0ce23c015..80067f9dccb3eb9c5c40680edb6002c7d045bff7 100644 (file)
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -2262,7 +2262,7 @@ class MySQLTableDefinitionParser(object):
             options.pop(nope, None)
 
         for opt, val in options.items():
-            state.table_options['%s_%s' % (self.dialect.name, opt.replace(' ', '_'))] = val
+            state.table_options['%s_%s' % (self.dialect.name, opt)] = val
 
     def _parse_column(self, line, state):
         """Extract column details.

diff --git a/test/dialect/test_mysql.py b/test/dialect/test_mysql.py
index b8bcd573d4aae5ad70935ae930ab788c3c8a875e..433c3eded090f2928bc6551a4b466c62f84d7c2c 100644 (file)
--- a/test/dialect/test_mysql.py
+++ b/test/dialect/test_mysql.py
@@ -343,9 +343,7 @@ class TypesTest(fixtures.TestBase, AssertsExecutionResults, AssertsCompiledSQL):
         m2 = MetaData(testing.db)
         t2 = Table('foo', m2, autoload=True)
         eq_(t2.kwargs['mysql_collate'], 'utf8_unicode_ci')
-        # this is also testing that the names coming
-        # back get an underscore _ in them
-        eq_(t2.kwargs['mysql_default_charset'], 'utf8')
+        eq_(t2.kwargs['mysql_default charset'], 'utf8')
 
     @testing.exclude('mysql', '<', (5, 0, 5), 'a 5.0+ feature')
     @testing.fails_on('mysql+oursql', 'some round trips fail, oursql bug ?')
@@ -894,7 +892,7 @@ class ReflectionTest(fixtures.TestBase, AssertsExecutionResults):
 
         assert reflected.kwargs['mysql_engine'] == 'MEMORY'
         assert reflected.kwargs['mysql_comment'] == comment
-        assert reflected.kwargs['mysql_default_charset'] == 'utf8'
+        assert reflected.kwargs['mysql_default charset'] == 'utf8'
         assert reflected.kwargs['mysql_avg_row_length'] == '3'
         assert reflected.kwargs['mysql_connection'] == 'fish'