From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 27 Mar 2011 23:57:24 +0000 (-0400)
Subject: - some merge or something went wrong here
X-Git-Tag: rel_0_6_7~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a85ee010ec744de2ee43a0c5dcf343c7cd0f6f03;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- some merge or something went wrong here
---

diff --git a/test/dialect/test_mysql.py b/test/dialect/test_mysql.py
index b50d785183..f1601bbc17 100644
--- a/test/dialect/test_mysql.py
+++ b/test/dialect/test_mysql.py
@@ -15,6 +15,20 @@ from sqlalchemy.test.engines import utf8_engine
 import datetime
 from sqlalchemy.engine.url import make_url
 
+
+class CompileTest(TestBase, AssertsCompiledSQL):
+
+    __dialect__ = mysql.dialect()
+
+    def test_reserved_words(self):
+        table = Table("mysql_table", MetaData(),
+            Column("col1", Integer),
+            Column("master_ssl_verify_server_cert", Integer))
+        x = select([table.c.col1, table.c.master_ssl_verify_server_cert])
+
+        self.assert_compile(x, 
+            '''SELECT mysql_table.col1, mysql_table.`master_ssl_verify_server_cert` FROM mysql_table''')
+
 class DialectTest(TestBase):
     __only_on__ = 'mysql'
 
@@ -558,19 +572,6 @@ class TypesTest(TestBase, AssertsExecutionResults, AssertsCompiledSQL):
         finally:
             meta.drop_all()
 
-class CompileTest(TestBase, AssertsCompiledSQL):
-
-    __dialect__ = mysql.dialect()
-
-    def test_reserved_words(self):
-        table = Table("mysql_table", MetaData(),
-            Column("col1", Integer),
-            Column("master_ssl_verify_server_cert", Integer))
-        x = select([table.c.col1, table.c.master_ssl_verify_server_cert])
-
-        self.assert_compile(x, 
-            '''SELECT mysql_table.col1, mysql_table.`master_ssl_verify_server_cert` FROM mysql_table''')
-
     def test_set(self):
         """Exercise the SET type."""