X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/a1fea05db3370fc99269a35bcbcd7892b4014229..cfa8ca3c4c5718d724ec7a7a11d438af585a35e7:/pokedex/db/tables.py?ds=sidebyside diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index a42c8f7..928c7ee 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -32,7 +32,7 @@ from sqlalchemy.ext.associationproxy import association_proxy from sqlalchemy.orm import backref, relation from sqlalchemy.orm.session import Session from sqlalchemy.orm.interfaces import AttributeExtension -from sqlalchemy.sql import and_ +from sqlalchemy.sql import and_, or_ from sqlalchemy.schema import ColumnDefault from sqlalchemy.types import * @@ -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')), ) @@ -805,7 +805,7 @@ create_translation_table('move_effect_prose', MoveEffect, 'prose', short_effect = Column(Unicode(256), nullable=True, info=dict(description="A short summary of the effect", format='plaintext')), effect = Column(Unicode(5120), nullable=True, - info=dict(description="A detailed description of the effect", format='plaintext')), + info=dict(description="A detailed description of the effect", format='markdown')), ) class MoveEffectChangelog(TableBase): @@ -854,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')), ) @@ -1068,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, @@ -1249,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.")) @@ -1318,13 +1320,6 @@ class PokemonForm(TableBase): info=dict(description=u'The order in which forms should be sorted. Multiple forms may have equal order, in which case they should fall back on sorting by name.')) @property - def pokemon(self): - u"""Returns the Pokémon for this form, using the form base as fallback. - """ - - return self.unique_pokemon or self.form_base_pokemon - - @property def full_name(self): u"""Returns the full name of this form, e.g. "Plant Cloak".""" @@ -1988,11 +1983,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') @@ -2028,20 +2025,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') @@ -2070,6 +2053,12 @@ PokemonForm.form_base_pokemon = relation(Pokemon, PokemonForm.unique_pokemon = relation(Pokemon, primaryjoin=PokemonForm.unique_pokemon_id==Pokemon.id, backref=backref('unique_form', uselist=False)) +PokemonForm.pokemon = relation(Pokemon, + primaryjoin=or_( + PokemonForm.unique_pokemon_id==Pokemon.id, + and_(PokemonForm.unique_pokemon_id==None, + PokemonForm.form_base_pokemon_id==Pokemon.id) + ), uselist=False) PokemonForm.version_group = relation(VersionGroup, innerjoin=True) PokemonForm.form_group = association_proxy('form_base_pokemon', 'form_group')