X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/b668cf69b068d647af6d9cb394dbff7c2d0a78bf..6e5bc73b215330da36dde873b584ac92ab5d72b9:/pokedex/db/tables.py?ds=sidebyside diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index 08a9809..f921e90 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -126,7 +126,7 @@ create_translation_table('ability_names', Ability, 'names', create_translation_table('ability_prose', Ability, 'prose', effect = Column(markdown.MarkdownColumn(5120), nullable=True, info=dict(description="A detailed description of this ability's effect", format='markdown')), - short_effect = Column(markdown.MarkdownColumn(255), nullable=True, + short_effect = Column(markdown.MarkdownColumn(512), nullable=True, info=dict(description="A short summary of this ability's effect", format='markdown')), ) @@ -808,34 +808,6 @@ create_translation_table('move_effect_prose', MoveEffect, 'prose', info=dict(description="A detailed description of the effect", format='plaintext')), ) -class MoveEffectCategory(TableBase): - u"""Category of a move effect - """ - __tablename__ = 'move_effect_categories' - __singlename__ = 'move_effect_category' - id = Column(Integer, primary_key=True, nullable=False, - info=dict(description="A numeric ID")) - identifier = Column(Unicode(64), nullable=False, - info=dict(description="An identifier", format='identifier')) - can_affect_user = Column(Boolean, nullable=False, - info=dict(description="Set if the user can be affected")) - -create_translation_table('move_effect_category_prose', MoveEffectCategory, 'prose', - name = Column(Unicode(64), nullable=False, index=True, - info=dict(description="The name", format='plaintext', official=False)), -) - -class MoveEffectCategoryMap(TableBase): - u"""Maps a move effect category to a move effect - """ - __tablename__ = 'move_effect_category_map' - move_effect_id = Column(Integer, ForeignKey('move_effects.id'), primary_key=True, nullable=False, - info=dict(description="ID of the move effect")) - move_effect_category_id = Column(Integer, ForeignKey('move_effect_categories.id'), primary_key=True, nullable=False, - info=dict(description="ID of the category")) - affects_user = Column(Boolean, primary_key=True, nullable=False, - info=dict(description="Set if the user is affected")) - class MoveEffectChangelog(TableBase): """History of changes to move effects across main game versions.""" __tablename__ = 'move_effect_changelog' @@ -882,7 +854,7 @@ create_translation_table('move_flag_type_prose', MoveFlagType, 'prose', relation_lazy='joined', name = Column(Unicode(32), nullable=True, index=True, info=dict(description="The name", format='plaintext', official=False)), - description = Column(markdown.MarkdownColumn(128), nullable=True, + description = Column(markdown.MarkdownColumn(256), nullable=True, info=dict(description="A short description of the flag", format='markdown')), ) @@ -1096,6 +1068,8 @@ class Pokemon(TableBase): info=dict(description=u"ID of the generation this species first appeared in")) evolution_chain_id = Column(Integer, ForeignKey('evolution_chains.id'), info=dict(description=u"ID of the species' evolution chain (a.k.a. family)")) + evolves_from_pokemon_id = Column(Integer, ForeignKey('pokemon.id'), nullable=True, + info=dict(description=u"The Pokémon species from which this one evolves")) height = Column(Integer, nullable=False, info=dict(description=u"The height of the Pokémon, in decimeters (tenths of a meter)")) weight = Column(Integer, nullable=False, @@ -1277,9 +1251,9 @@ class PokemonEvolution(TableBase): Any condition may be null if it does not apply for a particular Pokémon. """ __tablename__ = 'pokemon_evolution' - from_pokemon_id = Column(Integer, ForeignKey('pokemon.id'), nullable=False, - info=dict(description=u"The ID of the pre-evolution Pokémon.")) - to_pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False, + id = Column(Integer, primary_key=True, nullable=False, + info=dict(description=u"A numeric ID")) + evolved_pokemon_id = Column(Integer, ForeignKey('pokemon.id'), nullable=False, info=dict(description=u"The ID of the post-evolution Pokémon.")) evolution_trigger_id = Column(Integer, ForeignKey('evolution_triggers.id'), nullable=False, info=dict(description=u"The ID of the evolution trigger.")) @@ -1902,12 +1876,9 @@ MoveChangelog.effect_map = markdown.MoveEffectPropertyMap('effect_map') MoveChangelog.short_effect = markdown.MoveEffectProperty('short_effect') MoveChangelog.short_effect_map = markdown.MoveEffectPropertyMap('short_effect_map') -MoveEffect.category_map = relation(MoveEffectCategoryMap) -MoveEffect.categories = association_proxy('category_map', 'category') MoveEffect.changelog = relation(MoveEffectChangelog, order_by=MoveEffectChangelog.changed_in_version_group_id.desc(), backref='move_effect') -MoveEffectCategoryMap.category = relation(MoveEffectCategory) MoveEffectChangelog.changed_in = relation(VersionGroup, innerjoin=True, lazy='joined', @@ -2019,11 +1990,13 @@ Pokemon.egg_groups = relation(EggGroup, Pokemon.evolution_chain = relation(EvolutionChain, innerjoin=True, backref=backref('pokemon', order_by=Pokemon.order.asc())) -Pokemon.child_pokemon = relation(Pokemon, - primaryjoin=Pokemon.id==PokemonEvolution.from_pokemon_id, - secondary=PokemonEvolution.__table__, - secondaryjoin=PokemonEvolution.to_pokemon_id==Pokemon.id, - backref=backref('parent_pokemon', uselist=False)) +Pokemon.parent_pokemon = relation(Pokemon, + primaryjoin=Pokemon.evolves_from_pokemon_id==Pokemon.id, + remote_side=[Pokemon.id], + backref='child_pokemon') +Pokemon.evolutions = relation(PokemonEvolution, + primaryjoin=Pokemon.id==PokemonEvolution.evolved_pokemon_id, + backref=backref('evolved_pokemon', innerjoin=True, lazy='joined')) Pokemon.flavor_text = relation(PokemonFlavorText, order_by=PokemonFlavorText.version_id.asc(), backref='pokemon') @@ -2059,20 +2032,6 @@ Pokemon.types = relation(Type, PokemonDexNumber.pokedex = relation(Pokedex, innerjoin=True, lazy='joined') -PokemonEvolution.from_pokemon = relation(Pokemon, - primaryjoin=PokemonEvolution.from_pokemon_id==Pokemon.id, - innerjoin=True, - backref='child_evolutions') -PokemonEvolution.to_pokemon = relation(Pokemon, - primaryjoin=PokemonEvolution.to_pokemon_id==Pokemon.id, - innerjoin=True, - backref=backref('parent_evolution', uselist=False)) -PokemonEvolution.child_evolutions = relation(PokemonEvolution, - primaryjoin=PokemonEvolution.from_pokemon_id==PokemonEvolution.to_pokemon_id, - foreign_keys=[PokemonEvolution.to_pokemon_id], - backref=backref('parent_evolution', - remote_side=[PokemonEvolution.from_pokemon_id], - uselist=False)) PokemonEvolution.trigger = relation(EvolutionTrigger, innerjoin=True, lazy='joined', backref='evolutions')