Fixed unique index and unconventionally named index (#196)

Author: leonarduschen

src/sqlacodegen/generators.py

@@ -373,15 +373,19 @@ def render_column(self, column: Column[Any], show_name: bool) -> str:
             for c in column.table.constraints
         )
         is_unique = is_unique or any(
-            i.unique and set(i.columns) == {column} for i in column.table.indexes
+            i.unique and set(i.columns) == {column} and uses_default_name(i)
+            for i in column.table.indexes
         )
         is_primary = any(
             isinstance(c, PrimaryKeyConstraint)
             and column.name in c.columns
             and uses_default_name(c)
             for c in column.table.constraints
         )
-        has_index = any(set(i.columns) == {column} for i in column.table.indexes)
+        has_index = any(
+            set(i.columns) == {column} and uses_default_name(i)
+            for i in column.table.indexes
+        )
 
         if show_name:
             args.append(repr(column.name))
@@ -407,7 +411,7 @@ def render_column(self, column: Column[Any], show_name: bool) -> str:
         if is_unique:
             column.unique = True
             kwargs["unique"] = True
-        elif has_index:
+        if has_index:
             column.index = True
             kwarg.append("index")
             kwargs["index"] = True
@@ -1100,7 +1104,7 @@ def render_table_args(self, table: Table) -> str:
 
         # Render indexes
         for index in sorted(table.indexes, key=lambda i: i.name):
-            if len(index.columns) > 1:
+            if len(index.columns) > 1 or not uses_default_name(index):
                 args.append(self.render_index(index))
 
         if table.schema:

tests/test_generators.py

@@ -326,7 +326,7 @@ def test_indexes(self, generator: CodeGenerator) -> None:
                 'simple_items', metadata,
                 Column('id', Integer),
                 Column('number', Integer, index=True),
-                Column('text', String, unique=True),
+                Column('text', String, unique=True, index=True),
                 Index('ix_empty'),
                 Index('ix_text_number', 'text', 'number', unique=True)
             )
@@ -1000,12 +1000,14 @@ def test_indexes(self, generator: CodeGenerator) -> None:
             class SimpleItems(Base):
                 __tablename__ = 'simple_items'
                 __table_args__ = (
-                    Index('idx_text_number', 'text', 'number'),
+                    Index('idx_number', 'number'),
+                    Index('idx_text', 'text', unique=True),
+                    Index('idx_text_number', 'text', 'number')
                 )
 
                 id = Column(Integer, primary_key=True)
-                number = Column(Integer, index=True)
-                text = Column(String, unique=True)
+                number = Column(Integer)
+                text = Column(String)
             """,
         )