Skip to content
Merged
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
===============

**4.0.0rc2**

- Add ``values_callable`` lambda to generated native enums column definitions.
This allows for proper enum value insertion when working with ORM models (PR by @sheinbergon)

**4.0.0rc1**

- **BACKWARD INCOMPATIBLE** ``TablesGenerator.render_column_type()`` was changed to
Expand Down
3 changes: 1 addition & 2 deletions src/sqlacodegen/generators.py
Original file line number Diff line number Diff line change
Expand Up @@ -547,8 +547,7 @@ def render_column_type(self, column: Column[Any]) -> str:
):
# Import SQLAlchemy Enum (will be handled in collect_imports)
self.add_import(Enum)
# Return the Python enum class as the type parameter
return f"Enum({enum_class_name})"
return f"Enum({enum_class_name}, values_callable=lambda cls: [member.value for member in cls])"

args = []
kwargs: dict[str, Any] = {}
Expand Down
20 changes: 10 additions & 10 deletions tests/test_generator_declarative.py
Original file line number Diff line number Diff line change
Expand Up @@ -2063,14 +2063,14 @@ class Accounts(Base):
__tablename__ = 'accounts'

id: Mapped[int] = mapped_column(Integer, primary_key=True)
status: Mapped[StatusEnum] = mapped_column(Enum(StatusEnum), nullable=False)
status: Mapped[StatusEnum] = mapped_column(Enum(StatusEnum, values_callable=lambda cls: [member.value for member in cls]), nullable=False)


class Users(Base):
__tablename__ = 'users'

id: Mapped[int] = mapped_column(Integer, primary_key=True)
status: Mapped[StatusEnum] = mapped_column(Enum(StatusEnum), nullable=False)
status: Mapped[StatusEnum] = mapped_column(Enum(StatusEnum, values_callable=lambda cls: [member.value for member in cls]), nullable=False)
""",
)

Expand Down Expand Up @@ -2109,7 +2109,7 @@ class Users(Base):
__tablename__ = 'users'

id: Mapped[int] = mapped_column(Integer, primary_key=True)
status: Mapped[UsersStatus] = mapped_column(Enum(UsersStatus), nullable=False)
status: Mapped[UsersStatus] = mapped_column(Enum(UsersStatus, values_callable=lambda cls: [member.value for member in cls]), nullable=False)
""",
)

Expand Down Expand Up @@ -2160,14 +2160,14 @@ class A(Base):
__tablename__ = 'a'

id: Mapped[int] = mapped_column(Integer, primary_key=True)
b_c: Mapped[ABC] = mapped_column(Enum(ABC), nullable=False)
b_c: Mapped[ABC] = mapped_column(Enum(ABC, values_callable=lambda cls: [member.value for member in cls]), nullable=False)


class AB(Base):
__tablename__ = 'a_b'

id: Mapped[int] = mapped_column(Integer, primary_key=True)
c: Mapped[ABC] = mapped_column(Enum(ABC), nullable=False)
c: Mapped[ABC] = mapped_column(Enum(ABC, values_callable=lambda cls: [member.value for member in cls]), nullable=False)
""",
)

Expand Down Expand Up @@ -2223,14 +2223,14 @@ class A(Base):
__tablename__ = 'a'

id: Mapped[int] = mapped_column(Integer, primary_key=True)
b_c: Mapped[ABC1] = mapped_column(Enum(ABC1), nullable=False)
b_c: Mapped[ABC1] = mapped_column(Enum(ABC1, values_callable=lambda cls: [member.value for member in cls]), nullable=False)


class AB(Base):
__tablename__ = 'a_b'

id: Mapped[int] = mapped_column(Integer, primary_key=True)
c: Mapped[ABC] = mapped_column(Enum(ABC), nullable=False)
c: Mapped[ABC] = mapped_column(Enum(ABC, values_callable=lambda cls: [member.value for member in cls]), nullable=False)
""",
)

Expand Down Expand Up @@ -2269,7 +2269,7 @@ class Users(Base):
)

id: Mapped[int] = mapped_column(Integer, primary_key=True)
status: Mapped[UsersStatus] = mapped_column(Enum(UsersStatus), nullable=False)
status: Mapped[UsersStatus] = mapped_column(Enum(UsersStatus, values_callable=lambda cls: [member.value for member in cls]), nullable=False)
""",
)

Expand Down Expand Up @@ -2357,7 +2357,7 @@ class Accounts(Base):
)

id: Mapped[int] = mapped_column(Integer, primary_key=True)
status: Mapped[AccountsStatus] = mapped_column(Enum(AccountsStatus), nullable=False)
status: Mapped[AccountsStatus] = mapped_column(Enum(AccountsStatus, values_callable=lambda cls: [member.value for member in cls]), nullable=False)


class Users(Base):
Expand All @@ -2367,6 +2367,6 @@ class Users(Base):
)

id: Mapped[int] = mapped_column(Integer, primary_key=True)
status: Mapped[UsersStatus] = mapped_column(Enum(UsersStatus), nullable=False)
status: Mapped[UsersStatus] = mapped_column(Enum(UsersStatus, values_callable=lambda cls: [member.value for member in cls]), nullable=False)
""",
)
2 changes: 1 addition & 1 deletion tests/test_generator_sqlmodel.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,6 @@ class Accounts(SQLModel, table=True):
)

id: int = Field(sa_column=Column('id', Integer, primary_key=True))
status: AccountsStatus = Field(sa_column=Column('status', Enum(AccountsStatus), nullable=False))
status: AccountsStatus = Field(sa_column=Column('status', Enum(AccountsStatus, values_callable=lambda cls: [member.value for member in cls]), nullable=False))
""",
)
8 changes: 4 additions & 4 deletions tests/test_generator_tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class Blah(str, enum.Enum):

t_simple_items = Table(
'simple_items', metadata,
Column('enum', Enum(Blah)),
Column('enum', Enum(Blah, values_callable=lambda cls: [member.value for member in cls])),
Column('bool', Boolean),
Column('vector', VECTOR(3)),
Column('number', Numeric(10, asdecimal=False)),
Expand Down Expand Up @@ -266,7 +266,7 @@ class SimpleItemsStatus(str, enum.Enum):
t_simple_items = Table(
'simple_items', metadata,
Column('id', Integer, primary_key=True),
Column('status', Enum(SimpleItemsStatus)),
Column('status', Enum(SimpleItemsStatus, values_callable=lambda cls: [member.value for member in cls])),
CheckConstraint("simple_items.status IN ('active', 'inactive', 'pending')")
)
""",
Expand Down Expand Up @@ -308,13 +308,13 @@ class StatusEnum(str, enum.Enum):
t_accounts = Table(
'accounts', metadata,
Column('id', Integer, primary_key=True),
Column('status', Enum(StatusEnum))
Column('status', Enum(StatusEnum, values_callable=lambda cls: [member.value for member in cls]))
)

t_users = Table(
'users', metadata,
Column('id', Integer, primary_key=True),
Column('status', Enum(StatusEnum))
Column('status', Enum(StatusEnum, values_callable=lambda cls: [member.value for member in cls]))
)
""",
)
Expand Down