Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Version history
===============

**UNRELEASED**

- Fixed ``Index`` kwargs (e.g. ``mysql_length``) being ignored during code generation
(PR by @luliangce)

**3.2.0**

- Dropped support for Python 3.9
Expand Down
5 changes: 4 additions & 1 deletion src/sqlacodegen/generators.py
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,10 @@ def render_table(self, table: Table) -> str:

def render_index(self, index: Index) -> str:
extra_args = [repr(col.name) for col in index.columns]
kwargs = {}
kwargs = {
key: repr(value) if isinstance(value, str) else value
for key, value in sorted(index.kwargs.items())
}
if index.unique:
kwargs["unique"] = True

Expand Down
39 changes: 37 additions & 2 deletions tests/test_generator_declarative.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,41 @@ class SimpleItems(Base):
)


def test_index_with_kwargs(generator: CodeGenerator) -> None:
simple_items = Table(
"simple_items",
generator.metadata,
Column("id", INTEGER, primary_key=True),
Column("name", VARCHAR),
)
simple_items.indexes.add(
Index("idx_name", simple_items.c.name, postgresql_using="gist", mysql_length=10)
)

validate_code(
generator.generate(),
"""\
from typing import Optional

from sqlalchemy import Index, Integer, String
from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column

class Base(DeclarativeBase):
pass


class SimpleItems(Base):
__tablename__ = 'simple_items'
__table_args__ = (
Index('idx_name', 'name', mysql_length=10, postgresql_using='gist'),
)

id: Mapped[int] = mapped_column(Integer, primary_key=True)
name: Mapped[Optional[str]] = mapped_column(String)
""",
)


def test_constraints(generator: CodeGenerator) -> None:
Table(
"simple_items",
Expand Down Expand Up @@ -1971,8 +2006,8 @@ class Base(DeclarativeBase):
class SpatialTable(Base):
__tablename__ = 'spatial_table'
__table_args__ = (
Index('idx_spatial_table_geog', 'geog'),
Index('idx_spatial_table_geom', 'geom')
Index('idx_spatial_table_geog', 'geog', postgresql_using='gist'),
Index('idx_spatial_table_geom', 'geom', postgresql_using='gist')
)

id: Mapped[int] = mapped_column(Integer, primary_key=True)
Expand Down