From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 9 Jun 2010 22:27:43 +0000 (-0400)
Subject: fix the enum for MySQL after native_enum added to adaption keys
X-Git-Tag: rel_0_6_2~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4881873c6b80f168f498e8316711254cfa222cc8;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix the enum for MySQL after native_enum added to adaption keys
---

diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 619bbb3ced..179e0c76d8 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -907,7 +907,7 @@ class ENUM(sqltypes.Enum, _StringType):
 
         """
         self.quoting = kw.pop('quoting', 'auto')
-
+        
         if self.quoting == 'auto' and len(enums):
             # What quoting character are we using?
             q = None
@@ -937,6 +937,7 @@ class ENUM(sqltypes.Enum, _StringType):
         kw.pop('schema', None)
         kw.pop('name', None)
         kw.pop('quote', None)
+        kw.pop('native_enum', None)
         _StringType.__init__(self, length=length, **kw)
         sqltypes.Enum.__init__(self, *enums)
     
diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index 23e1ebec6a..91e4ec177a 100644
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -573,8 +573,6 @@ class EnumTest(TestBase):
         eq_(e1.adapt(ENUM).name, 'foo')
         eq_(e1.adapt(ENUM).schema, 'bar')
         
-        
-        
     @testing.fails_on('mysql+mysqldb', "MySQL seems to issue a 'data truncated' warning.")
     def test_constraint(self):
         assert_raises(exc.DBAPIError,