Fixed missing server_default in primary key columns

agronholm · agronholm · commit 0b58124aa2bc · 2014-01-03T07:32:58.000+02:00
Fixed server defaults being expressed as string literals
diff --git a/sqlacodegen/codegen.py b/sqlacodegen/codegen.py
@@ -15,10 +15,10 @@
 import sqlalchemy
 
 try:
-    from sqlalchemy.sql.expression import TextClause
+    from sqlalchemy.sql.expression import text, TextClause
 except ImportError:
     # SQLAlchemy < 0.8
-    from sqlalchemy.sql.expression import _TextClause as TextClause
+    from sqlalchemy.sql.expression import text, _TextClause as TextClause
 
 
 _re_boolean_check_constraint = re.compile(r"(?:(?:.*?)\.)?(.*?) IN \(0, 1\)")
@@ -134,16 +134,16 @@ def _render_column(column, show_name):
     elif has_index:
         column.index = True
         kwarg.append('index')
-    if column.server_default and not is_sole_pk:
-        column.server_default = _get_compiled_expression(column.server_default.arg)
-        kwarg.append('server_default')
 
     return 'Column({0})'.format(', '.join(
         ([repr(column.name)] if show_name else []) +
         ([_render_column_type(column.type)] if render_coltype else []) +
         [_render_constraint(x) for x in dedicated_fks] +
         [repr(x) for x in column.constraints] +
-        ['{0}={1}'.format(k, repr(getattr(column, k))) for k in kwarg]))
+        ['{0}={1}'.format(k, repr(getattr(column, k))) for k in kwarg] +
+        (['server_default=text("{0}")'.format(_get_compiled_expression(column.server_default.arg))] if
+         column.server_default else [])
+    ))
 
 
 def _render_constraint(constraint):
diff --git a/test/test_codegen.py b/test/test_codegen.py
@@ -6,6 +6,7 @@
 from sqlalchemy.engine import create_engine
 from sqlalchemy.schema import (MetaData, Table, Column, CheckConstraint, UniqueConstraint, Index, ForeignKey,
                                ForeignKeyConstraint)
+from sqlalchemy.sql.expression import text
 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
@@ -959,3 +960,25 @@ class OtherItem(Base):
 
     id = Column(Integer, primary_key=True)
 """
+
+    def test_pk_default(self):
+        Table(
+            'simple_items', self.metadata,
+            Column('id', INTEGER, primary_key=True, server_default=text('uuid_generate_v4()'))
+        )
+
+        assert self.generate_code() == """\
+# coding: utf-8
+from sqlalchemy import Column, Integer
+from sqlalchemy.ext.declarative import declarative_base
+
+
+Base = declarative_base()
+metadata = Base.metadata
+
+
+class SimpleItem(Base):
+    __tablename__ = 'simple_items'
+
+    id = Column(Integer, primary_key=True, server_default=text("uuid_generate_v4()"))
+"""
