X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/eb93dc6790c6735a20ab5c30130ec013118e41ff..7cc280391d740fe3ed8fb4cae7a4cae2bce9fda6:/pokedex/db/tables.py?ds=sidebyside diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index dfbb951..8ae80d8 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -18,8 +18,14 @@ class Ability(TableBase): id = Column(Integer, primary_key=True, nullable=False) name = Column(Unicode(24), nullable=False) generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False) + effect = Column(rst.RstTextColumn(5120), nullable=False) + short_effect = Column(rst.RstTextColumn(255), nullable=False) + +class AbilityFlavorText(TableBase): + __tablename__ = 'ability_flavor_text' + ability_id = Column(Integer, ForeignKey('abilities.id'), primary_key=True, nullable=False, autoincrement=False) + version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False) flavor_text = Column(Unicode(64), nullable=False) - effect = Column(Unicode(255), nullable=False) class Berry(TableBase): __tablename__ = 'berries' @@ -629,8 +635,11 @@ class Version(TableBase): ### Relations down here, to avoid ordering problems +Ability.flavor_text = relation(AbilityFlavorText, order_by=AbilityFlavorText.version_group_id, backref='abilities') Ability.generation = relation(Generation, backref='abilities') +AbilityFlavorText.version_group = relation(VersionGroup) + Berry.berry_firmness = relation(BerryFirmness, backref='berries') Berry.firmness = association_proxy('berry_firmness', 'name') Berry.flavors = relation(BerryFlavor, order_by=BerryFlavor.contest_type_id, backref='berry')