From fe54b591448fd91f26528fd3f8394dc6a42eaea9 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 9 Jan 2015 11:26:36 -0500
Subject: [PATCH] - changelog:  Fixed issue in autogenerate type rendering
 where types that belong to modules that have the name "sqlalchemy" in them
 would be mistaken as being part of the ``sqlalchemy.`` namespace.  Pull req
 courtesy Bartosz Burclaf.  fixes #261

---
 alembic/__init__.py          |  2 +-
 docs/build/changelog.rst     | 13 +++++++++++++
 tests/test_autogen_render.py | 25 +++++++++++++++++++++++--
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/alembic/__init__.py b/alembic/__init__.py
index b834521c..d6003811 100644
--- a/alembic/__init__.py
+++ b/alembic/__init__.py
@@ -1,6 +1,6 @@
 from os import path
 
-__version__ = '0.7.3'
+__version__ = '0.7.4'
 
 package_dir = path.abspath(path.dirname(__file__))
 
diff --git a/docs/build/changelog.rst b/docs/build/changelog.rst
index 5cf83d8b..63567098 100644
--- a/docs/build/changelog.rst
+++ b/docs/build/changelog.rst
@@ -3,6 +3,19 @@
 ==========
 Changelog
 ==========
+.. changelog::
+    :version: 0.7.4
+
+    .. change::
+      :tags: bug, autogenerate
+      :tickets: 261
+      :pullreq: github:17
+
+      Fixed issue in autogenerate type rendering where types that belong
+      to modules that have the name "sqlalchemy" in them would be mistaken
+      as being part of the ``sqlalchemy.`` namespace.  Pull req courtesy
+      Bartosz Burclaf.
+
 .. changelog::
     :version: 0.7.3
     :released: December 30, 2014
diff --git a/tests/test_autogen_render.py b/tests/test_autogen_render.py
index e020cec9..b3e8c4c4 100644
--- a/tests/test_autogen_render.py
+++ b/tests/test_autogen_render.py
@@ -9,6 +9,7 @@ from sqlalchemy import MetaData, Column, Table, String, \
     PrimaryKeyConstraint, Index, func, text, DefaultClause
 
 from sqlalchemy.types import TIMESTAMP
+from sqlalchemy.types import UserDefinedType
 from sqlalchemy.dialects import mysql, postgresql
 from sqlalchemy.engine.default import DefaultDialect
 from sqlalchemy.sql import and_, column, literal_column, false
@@ -892,9 +893,29 @@ unique=False, """
             "sa.Integer()"
         )
 
-    def test_repr_user_type_user_prefix_None(self):
-        from sqlalchemy.types import UserDefinedType
+    def test_repr_custom_type_w_sqla_prefix(self):
+        autogen_context = {
+            'opts': {
+                'sqlalchemy_module_prefix': 'sa.',
+                'alembic_module_prefix': 'op.',
+                'user_module_prefix': None
+            },
+            'dialect': mysql.dialect()
+        }
 
+        class MyType(UserDefinedType):
+            pass
+
+        MyType.__module__ = "sqlalchemy_util.types"
+
+        type_ = MyType()
+
+        eq_ignore_whitespace(
+            autogenerate.render._repr_type(type_, autogen_context),
+            "sqlalchemy_util.types.MyType()"
+        )
+
+    def test_repr_user_type_user_prefix_None(self):
         class MyType(UserDefinedType):
 
             def get_col_spec(self):
-- 
2.47.2