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
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Version history
``**kwargs`` in their initializers (such as MySQL ``CHAR`` with ``collation``) while
preserving existing ``*args`` rendering behavior (PR by @hyoj0942)
- Fixed missing metadata argument when rendering plain tables with the SQLModel
generator
- Added support for self-referential tables in the SQLModel generator (PR by @sheinbergon)

**4.0.1**

Expand Down
9 changes: 6 additions & 3 deletions src/sqlacodegen/generators.py
Original file line number Diff line number Diff line change
Expand Up @@ -1737,13 +1737,16 @@ def render_relationship_arguments(
) -> Mapping[str, Any]:
def render_column_attrs(column_attrs: list[ColumnAttribute]) -> str:
rendered = []
render_as_string = False
for attr in column_attrs:
if attr.model is relationship.source:
if not self.explicit_foreign_keys and attr.model is relationship.source:
rendered.append(attr.name)
else:
rendered.append(repr(f"{attr.model.name}.{attr.name}"))
rendered.append(f"{attr.model.name}.{attr.name}")
render_as_string = True

return "[" + ", ".join(rendered) + "]"
joined = "[" + ", ".join(rendered) + "]"
return repr(joined) if render_as_string else joined

def render_foreign_keys(column_attrs: list[ColumnAttribute]) -> str:
rendered = []
Expand Down
82 changes: 82 additions & 0 deletions tests/test_generator_sqlmodel.py
Original file line number Diff line number Diff line change
Expand Up @@ -387,3 +387,85 @@ def test_fallback_table(generator: CodeGenerator) -> None:
)
""",
)


def test_onetomany_selfref(generator: CodeGenerator) -> None:
Table(
"simple_items",
generator.metadata,
Column("id", INTEGER, primary_key=True),
Column("parent_item_id", INTEGER),
ForeignKeyConstraint(["parent_item_id"], ["simple_items.id"]),
)

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

from sqlalchemy import Column, ForeignKey, Integer
from sqlmodel import Field, Relationship, SQLModel

class SimpleItems(SQLModel, table=True):
__tablename__ = 'simple_items'

id: int = Field(sa_column=Column('id', Integer, primary_key=True))
parent_item_id: Optional[int] = Field(default=None, sa_column=Column(\
'parent_item_id', ForeignKey('simple_items.id')))

parent_item: Optional['SimpleItems'] = Relationship(\
back_populates='parent_item_reverse', sa_relationship_kwargs={\
'remote_side': '[SimpleItems.id]'})
parent_item_reverse: list['SimpleItems'] = Relationship(\
back_populates='parent_item', sa_relationship_kwargs={\
'remote_side': '[SimpleItems.parent_item_id]'})
""",
)


def test_onetomany_selfref_multi(generator: CodeGenerator) -> None:
Table(
"simple_items_selfref",
generator.metadata,
Column("id", INTEGER, primary_key=True),
Column("parent_item_id", INTEGER),
Column("top_item_id", INTEGER),
ForeignKeyConstraint(["parent_item_id"], ["simple_items_selfref.id"]),
ForeignKeyConstraint(["top_item_id"], ["simple_items_selfref.id"]),
)

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

from sqlalchemy import Column, ForeignKey, Integer
from sqlmodel import Field, Relationship, SQLModel

class SimpleItemsSelfref(SQLModel, table=True):
__tablename__ = 'simple_items_selfref'

id: int = Field(sa_column=Column('id', Integer, primary_key=True))
parent_item_id: Optional[int] = Field(default=None, sa_column=Column(\
'parent_item_id', ForeignKey('simple_items_selfref.id')))
top_item_id: Optional[int] = Field(default=None, sa_column=Column(\
'top_item_id', ForeignKey('simple_items_selfref.id')))

parent_item: Optional['SimpleItemsSelfref'] = Relationship(\
back_populates='parent_item_reverse', sa_relationship_kwargs={\
'remote_side': '[SimpleItemsSelfref.id]', \
'foreign_keys': '[SimpleItemsSelfref.parent_item_id]'})
parent_item_reverse: list['SimpleItemsSelfref'] = Relationship(\
back_populates='parent_item', sa_relationship_kwargs={\
'remote_side': '[SimpleItemsSelfref.parent_item_id]', \
'foreign_keys': '[SimpleItemsSelfref.parent_item_id]'})
top_item: Optional['SimpleItemsSelfref'] = Relationship(\
back_populates='top_item_reverse', sa_relationship_kwargs={\
'remote_side': '[SimpleItemsSelfref.id]', \
'foreign_keys': '[SimpleItemsSelfref.top_item_id]'})
top_item_reverse: list['SimpleItemsSelfref'] = Relationship(\
back_populates='top_item', sa_relationship_kwargs={\
'remote_side': '[SimpleItemsSelfref.top_item_id]', \
'foreign_keys': '[SimpleItemsSelfref.top_item_id]'})
""",
)
Loading