From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 13 Nov 2008 20:38:56 +0000 (+0000)
Subject: - Rearranged the `load_dialect_impl()` method in
X-Git-Tag: rel_0_5rc4~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3de4d545fc53bb3bb3b4b5e28c9dee79f017cc4;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Rearranged the `load_dialect_impl()` method in
`TypeDecorator` such that it will take effect
even if the user-defined `TypeDecorator` uses
another `TypeDecorator` as its impl.
---

diff --git a/CHANGES b/CHANGES
index b9d2c1bbef..58859fb402 100644
--- a/CHANGES
+++ b/CHANGES
@@ -43,6 +43,11 @@ CHANGES
     
     - Restored "active rowcount" fetch before ResultProxy
       autocloses the cursor.  This was removed in 0.5rc3.
+    
+    - Rearranged the `load_dialect_impl()` method in 
+      `TypeDecorator` such that it will take effect
+      even if the user-defined `TypeDecorator` uses
+      another `TypeDecorator` as its impl.
       
 - access
     - Added support for Currency type.
diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py
index fe6cc7b534..084ec51172 100644
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -152,13 +152,11 @@ class TypeDecorator(AbstractType):
         except KeyError:
             pass
 
-        if isinstance(self.impl, TypeDecorator):
-            typedesc = self.impl.dialect_impl(dialect)
-        else:
-            typedesc = self.load_dialect_impl(dialect)
+        typedesc = self.load_dialect_impl(dialect)
         tt = self.copy()
         if not isinstance(tt, self.__class__):
-            raise AssertionError("Type object %s does not properly implement the copy() method, it must return an object of type %s" % (self, self.__class__))
+            raise AssertionError("Type object %s does not properly implement the copy() "
+                    "method, it must return an object of type %s" % (self, self.__class__))
         tt.impl = typedesc
         self._impl_dict[dialect] = tt
         return tt
@@ -170,7 +168,10 @@ class TypeDecorator(AbstractType):
         can be overridden to provide different behavior.
         """
 
-        return dialect.type_descriptor(self.impl)
+        if isinstance(self.impl, TypeDecorator):
+            return self.impl.dialect_impl(dialect)
+        else:
+            return dialect.type_descriptor(self.impl)
 
     def __getattr__(self, key):
         """Proxy all other undefined accessors to the underlying implementation."""