From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 15 Dec 2010 00:24:17 +0000 (-0500)
Subject: - fixes for mysql and I'm ready to replace this whole adapt() business with a constru... 
X-Git-Tag: rel_0_7b1~160
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bff2f6f3fbb0450cb9d0d09a25845a437c3df85e;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- fixes for mysql and I'm ready to replace this whole adapt() business with a constructor copy
---

diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index fd99a16b55..5c3289bfb0 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -965,6 +965,10 @@ class ENUM(sqltypes.Enum, _StringType):
             else:
                 return value
         return process
+    
+    def adapt(self, impltype, **kw):
+        kw['strict'] = self.strict
+        return sqltypes.Enum.adapt(self, impltype, **kw)
 
 class SET(_StringType):
     """MySQL SET type."""
diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index b432c351d6..ae0625d30f 100644
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -135,14 +135,16 @@ class DefaultDialect(base.Dialect):
                     (label_length, self.max_identifier_length))
         self.label_length = label_length
         
-        self._type_memos = weakref.WeakKeyDictionary()
-        
         if not hasattr(self, 'description_encoding'):
             self.description_encoding = getattr(
                                             self, 
                                             'description_encoding', 
                                             encoding)
     
+    @util.memoized_property
+    def _type_memos(self):
+        return weakref.WeakKeyDictionary()
+        
     @property
     def dialect_description(self):
         return self.name + "+" + self.driver