Fixed _IntegerType, _StringType etc. being rendered on MySQL

agronholm · agronholm · commit 8ab2d49b0b86 · 2013-06-12T22:48:39.000+03:00
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -6,6 +6,8 @@ Version history
 
 * Fixed TypeError when inflect could not determine the singular name of a table for a many-to-1 relationship
 
+* Fixed _IntegerType, _StringType etc. being rendered instead of proper types on MySQL
+
 
 1.1.0
 -----
diff --git a/sqlacodegen/__init__.py b/sqlacodegen/__init__.py
@@ -1 +1 @@
-version = '1.1.1.pre1'
+version = '1.1.1'
diff --git a/sqlacodegen/codegen.py b/sqlacodegen/codegen.py
@@ -173,7 +173,7 @@ def __init__(self, table):
             for supercls in cls.__mro__:
                 if hasattr(supercls, '__visit_name__'):
                     cls = supercls
-                if supercls.__name__ != supercls.__name__.upper():
+                if supercls.__name__ != supercls.__name__.upper() and not supercls.__name__.startswith('_'):
                     break
 
             column.type = column.type.adapt(cls)
diff --git a/test/test_codegen.py b/test/test_codegen.py
@@ -9,6 +9,7 @@
 from sqlalchemy.types import INTEGER, SMALLINT, VARCHAR, NUMERIC
 from sqlalchemy.dialects.postgresql.base import BIGINT, DOUBLE_PRECISION, BOOLEAN, ENUM
 from sqlalchemy.dialects.mysql.base import TINYINT
+from sqlalchemy.dialects.mysql import base as mysql
 
 from sqlacodegen.codegen import CodeGenerator
 
@@ -124,6 +125,28 @@ def test_column_adaptation(self):
     Column('id', BigInteger),
     Column('length', Float)
 )
+""")
+
+    def test_mysql_column_types(self):
+        Table(
+            'simple_items', self.metadata,
+            Column('id', mysql.INTEGER),
+            Column('name', mysql.VARCHAR(255))
+        )
+
+        eq_(self.generate_code(), """\
+# coding: utf-8
+from sqlalchemy import Column, Integer, MetaData, String, Table
+
+
+metadata = MetaData()
+
+
+t_simple_items = Table(
+    'simple_items', metadata,
+    Column('id', Integer),
+    Column('name', String(255))
+)
 """)
 
     def test_constraints_table(self):

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-version = '1.1.1.pre1'`
	`1`	`+version = '1.1.1'`