From 0209b24bcf2055966a3b8ab1ccdeacd018f58150 Mon Sep 17 00:00:00 2001
From: Massimo Di Pierro <massimo.dipierro@gmail.com>
Date: Wed, 13 Jun 2012 20:02:13 -0500
Subject: [PATCH] issue 844 (SQLCustomType and unicode parsing), thanks admin

---
 VERSION      | 2 +-
 gluon/dal.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index a27d2098..c0c1447d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-06-13 17:14:50) dev
+Version 2.00.0 (2012-06-13 20:02:08) dev
diff --git a/gluon/dal.py b/gluon/dal.py
index 1599683b..6d49f949 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -1583,7 +1583,7 @@ class BaseAdapter(ConnectionPool):
                 pass
         if isinstance(value, unicode):
             value = value.encode('utf-8')
-        elif isinstance(field_type, SQLCustomType):
+        if isinstance(field_type, SQLCustomType):
             value = field_type.decoder(value)
         if not isinstance(field_type, str) or value is None:
             return value