From 417afb3eca28c6039c4a87dd68939973c1de5271 Mon Sep 17 00:00:00 2001
From: Konsta Vesterinen <konsta.vesterinen@gmail.com>
Date: Wed, 27 May 2015 15:14:28 +0300
Subject: [PATCH] Fix composite array bind param process

---
 CHANGES.rst                            |  7 +++++++
 sqlalchemy_utils/__init__.py           |  2 +-
 sqlalchemy_utils/types/pg_composite.py | 15 +++++++++++----
 tests/types/test_composite.py          |  4 ++--
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 52b1ac6..8569e67 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,13 @@ Changelog
 Here you can see the full list of changes between each SQLAlchemy-Utils release.
 
 
+0.30.5 (2015-05-27)
+^^^^^^^^^^^^^^^^^^^
+
+- Fixed CompositeType bind parameter processing when one of the fields is of TypeDecorator type and
+CompositeType is used inside ARRAY type.
+
+
 0.30.4 (2015-05-27)
 ^^^^^^^^^^^^^^^^^^^
 
diff --git a/sqlalchemy_utils/__init__.py b/sqlalchemy_utils/__init__.py
index 1ab3c2a..04c58c4 100644
--- a/sqlalchemy_utils/__init__.py
+++ b/sqlalchemy_utils/__init__.py
@@ -90,4 +90,4 @@ from .types import (  # noqa
     WeekDaysType
 )
 
-__version__ = '0.30.4'
+__version__ = '0.30.5'
diff --git a/sqlalchemy_utils/types/pg_composite.py b/sqlalchemy_utils/types/pg_composite.py
index c475a94..f4fb3a2 100644
--- a/sqlalchemy_utils/types/pg_composite.py
+++ b/sqlalchemy_utils/types/pg_composite.py
@@ -97,6 +97,7 @@ import psycopg2
 import sqlalchemy as sa
 from psycopg2.extensions import adapt, AsIs, register_adapter
 from sqlalchemy.dialects.postgresql import ARRAY
+from sqlalchemy.dialects.postgresql.psycopg2 import PGDialect_psycopg2
 from sqlalchemy.ext.compiler import compiles
 from sqlalchemy.schema import _CreateDropBase
 from sqlalchemy.sql.expression import FunctionElement
@@ -127,7 +128,7 @@ def _compile_pgelem(expr, compiler, **kw):
 class CompositeArray(ARRAY):
     def _proc_array(self, arr, itemproc, dim, collection):
         if dim is None:
-            if issubclass(self.item_type.python_type, (list, tuple)):
+            if issubclass(self.item_type.python_type, tuple):
                 return arr
         ARRAY._proc_array(self, arr, itemproc, dim, collection)
 
@@ -166,8 +167,7 @@ class CompositeType(UserDefinedType, SchemaType):
         self.columns = columns
         if name in registered_composites:
             self.type_cls = registered_composites[name].type_cls
-        else:
-            registered_composites[name] = self
+        registered_composites[name] = self
         attach_composite_listeners()
 
     def get_col_spec(self):
@@ -226,7 +226,14 @@ def register_psycopg2_composite(dbapi_connection, composite):
 
     def adapt_composite(value):
         values = [
-            adapt(getattr(value, column.name)).getquoted().decode('utf-8')
+            adapt(
+                getattr(value, column.name)
+                if not isinstance(column.type, TypeDecorator)
+                else column.type.process_bind_param(
+                    getattr(value, column.name),
+                    PGDialect_psycopg2()
+                )
+            ).getquoted().decode('utf-8')
             for column in
             composite.columns
         ]
diff --git a/tests/types/test_composite.py b/tests/types/test_composite.py
index 4b39e59..e5514e8 100644
--- a/tests/types/test_composite.py
+++ b/tests/types/test_composite.py
@@ -127,8 +127,8 @@ class TestCompositeTypeInsideArray(TestCase):
     def test_parameter_processing(self):
         account = self.Account(
             balances=[
-                self.type.type_cls('USD', 15),
-                self.type.type_cls('AUD', 20)
+                self.type.type_cls(Currency('USD'), 15),
+                self.type.type_cls(Currency('AUD'), 20)
             ]
         )