Fixed enum column rendering on non-default schema (#368)

Fixes #510.

Author: agronholm

CHANGES.rst

@@ -4,6 +4,8 @@ Version history
 **UNRELEASED**
 
 - Dropped support for Python 3.8
+- Fixed two rendering issues in ``ENUM`` columns when a non-default schema is used: an
+  unwarranted positional argument and missing the ``schema`` argument
 
 **3.0.0rc5**
 

src/sqlacodegen/generators.py

@@ -512,6 +512,7 @@ def render_column_type(self, coltype: object) -> str:
             if param.name.startswith("_"):
                 continue
             elif param.kind in (Parameter.VAR_POSITIONAL, Parameter.VAR_KEYWORD):
+                use_kwargs = True
                 continue
 
             value = getattr(coltype, param.name, missing)
@@ -535,8 +536,11 @@ def render_column_type(self, coltype: object) -> str:
             varargs_repr = [repr(arg) for arg in getattr(coltype, vararg)]
             args.extend(varargs_repr)
 
-        if isinstance(coltype, Enum) and coltype.name is not None:
-            kwargs["name"] = repr(coltype.name)
+        # These arguments cannot be autodetected from the Enum initializer
+        if isinstance(coltype, Enum):
+            for colname in "name", "schema":
+                if (value := getattr(coltype, colname)) is not None:
+                    kwargs[colname] = repr(value)
 
         if isinstance(coltype, JSONB):
             # Remove astext_type if it's the default
@@ -683,6 +687,8 @@ def get_adapted_type(self, coltype: Any) -> Any:
                 kw = {}
                 if supercls is Enum:
                     kw["name"] = coltype.name
+                    if coltype.schema:
+                        kw["schema"] = coltype.schema
 
                 try:
                     new_coltype = coltype.adapt(supercls)

tests/test_generator_tables.py

@@ -39,9 +39,10 @@ def test_fancy_coltypes(generator: CodeGenerator) -> None:
     Table(
         "simple_items",
         generator.metadata,
-        Column("enum", postgresql.ENUM("A", "B", name="blah")),
+        Column("enum", postgresql.ENUM("A", "B", name="blah", schema="someschema")),
         Column("bool", postgresql.BOOLEAN),
         Column("number", NUMERIC(10, asdecimal=False)),
+        schema="someschema",
     )
 
     validate_code(
@@ -54,9 +55,10 @@ def test_fancy_coltypes(generator: CodeGenerator) -> None:
 
         t_simple_items = Table(
             'simple_items', metadata,
-            Column('enum', Enum('A', 'B', name='blah')),
+            Column('enum', Enum('A', 'B', name='blah', schema='someschema')),
             Column('bool', Boolean),
-            Column('number', Numeric(10, asdecimal=False))
+            Column('number', Numeric(10, asdecimal=False)),
+            schema='someschema'
         )
         """,
     )