More concise declarative output.

https://code.google.com/p/sqlalchemy-migrate/issues/detail?id=122

1 files changed, 11 insertions, 18 deletions

diff --git a/migrate/versioning/genmodel.py b/migrate/versioning/genmodel.py
index 5c235da..826575a 100644
--- a/migrate/versioning/genmodel.py
+++ b/migrate/versioning/genmodel.py
@@ -59,7 +59,7 @@ class ModelGenerator(object):
                 pass
             else:
                 kwarg.append('default')
-        ks = ', '.join('%s=%r' % (k, getattr(col, k)) for k in kwarg)
+        args = ['%s=%r' % (k, getattr(col, k)) for k in kwarg]
 
         # crs: not sure if this is good idea, but it gets rid of extra
         # u''
@@ -73,28 +73,21 @@ class ModelGenerator(object):
                     type_ = cls()
                 break
 
-        data = {
-            'name': name,
-            'type': type_,
-            'constraints': ', '.join([repr(cn) for cn in col.constraints]),
-            'args': ks and ks or ''}
+        type_repr = repr(type_)
+        if type_repr.endswith('()'):
+            type_repr = type_repr[:-2]
 
-        if data['constraints']:
-            if data['args']:
-                data['args'] = ',' + data['args']
+        constraints = [repr(cn) for cn in col.constraints]
 
-        if data['constraints'] or data['args']:
-            data['maybeComma'] = ','
-        else:
-            data['maybeComma'] = ''
+        data = {
+            'name': name,
+            'commonStuff': ', '.join([type_repr] + args + constraints),
+        }
 
-        commonStuff = """ %(maybeComma)s %(constraints)s %(args)s)""" % data
-        commonStuff = commonStuff.strip()
-        data['commonStuff'] = commonStuff
         if self.declarative:
-            return """%(name)s = Column(%(type)r%(commonStuff)s""" % data
+            return """%(name)s = Column(%(commonStuff)s)""" % data
         else:
-            return """Column(%(name)r, %(type)r%(commonStuff)s""" % data
+            return """Column(%(name)r, %(commonStuff)s)""" % data
 
     def getTableDefn(self, table):
         out = []