From: Zhorken Date: Thu, 20 May 2010 00:49:48 +0000 (-0400) Subject: Link move flavour text to version groups. #169 X-Git-Tag: veekun-promotions/2010060201~25 X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/ea94f4be8b53b5708b22a1fa6336d89452a0ff21?ds=sidebyside Link move flavour text to version groups. #169 --- diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index 39a2948..e0b03fd 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -338,7 +338,7 @@ class MoveFlagType(TableBase): class MoveFlavorText(TableBase): __tablename__ = 'move_flavor_text' move_id = Column(Integer, ForeignKey('moves.id'), primary_key=True, nullable=False, autoincrement=False) - generation_id = Column(Integer, ForeignKey('generations.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(255), nullable=False) class MoveName(TableBase): @@ -716,7 +716,7 @@ Move.contest_combo_prev = association_proxy('contest_combo_second', 'first') Move.contest_type = relation(ContestType, backref='moves') Move.damage_class = relation(MoveDamageClass, backref='moves') Move.flags = association_proxy('move_flags', 'flag') -Move.flavor_text = relation(MoveFlavorText, order_by=MoveFlavorText.generation_id, backref='move') +Move.flavor_text = relation(MoveFlavorText, order_by=MoveFlavorText.version_group_id, backref='move') Move.foreign_names = relation(MoveName, backref='pokemon') Move.generation = relation(Generation, backref='moves') Move.machines = relation(Machine, backref='move') @@ -738,7 +738,7 @@ MoveEffectCategoryMap.category = relation(MoveEffectCategory) MoveFlag.flag = relation(MoveFlagType) -MoveFlavorText.generation = relation(Generation) +MoveFlavorText.version_group = relation(VersionGroup) MoveName.language = relation(Language)