Fix a many-to-many join bug with evolutions.

[zzz-pokedex.git] / pokedex / db / tables.py

diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index 39a2948..5de85f9 100644 (file)
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -174,11 +174,10 @@ class EvolutionChain(TableBase):
     steps_to_hatch = Column(Integer, nullable=False)
     baby_trigger_item = Column(Unicode(12))
 
-class EvolutionMethod(TableBase):
-    __tablename__ = 'evolution_methods'
+class EvolutionTrigger(TableBase):
+    __tablename__ = 'evolution_triggers'
     id = Column(Integer, primary_key=True, nullable=False)
-    name = Column(Unicode(64), nullable=False)
-    description = Column(Unicode(255), nullable=False)
+    identifier = Column(Unicode(16), nullable=False)
 
 class Experience(TableBase):
     __tablename__ = 'experience'
@@ -338,7 +337,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):
@@ -428,9 +427,6 @@ class Pokemon(TableBase):
     forme_base_pokemon_id = Column(Integer, ForeignKey('pokemon.id'))
     generation_id = Column(Integer, ForeignKey('generations.id'))
     evolution_chain_id = Column(Integer, ForeignKey('evolution_chains.id'))
-    evolution_parent_pokemon_id = Column(Integer, ForeignKey('pokemon.id'))
-    evolution_method_id = Column(Integer, ForeignKey('evolution_methods.id'))
-    evolution_parameter = Column(Unicode(32))
     height = Column(Integer, nullable=False)
     weight = Column(Integer, nullable=False)
     species = Column(Unicode(16), nullable=False)
@@ -514,6 +510,23 @@ class PokemonEggGroup(TableBase):
     pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False)
     egg_group_id = Column(Integer, ForeignKey('egg_groups.id'), primary_key=True, nullable=False, autoincrement=False)
 
+class PokemonEvolution(TableBase):
+    __tablename__ = 'pokemon_evolution'
+    from_pokemon_id = Column(Integer, ForeignKey('pokemon.id'), nullable=False)
+    to_pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False)
+    evolution_trigger_id = Column(Integer, ForeignKey('evolution_triggers.id'), nullable=False)
+    trigger_item_id = Column(Integer, ForeignKey('items.id'), nullable=True)
+    minimum_level = Column(Integer, nullable=True)
+    gender = Column(Enum('male', 'female', name='pokemon_evolution_gender'), nullable=True)
+    location_id = Column(Integer, ForeignKey('locations.id'), nullable=True)
+    held_item_id = Column(Integer, ForeignKey('items.id'), nullable=True)
+    time_of_day = Column(Enum('morning', 'day', 'night', name='pokemon_evolution_time_of_day'), nullable=True)
+    known_move_id = Column(Integer, ForeignKey('moves.id'), nullable=True)
+    minimum_happiness = Column(Integer, nullable=True)
+    minimum_beauty = Column(Integer, nullable=True)
+    relative_physical_stats = Column(Integer, nullable=True)
+    party_pokemon_id = Column(Integer, ForeignKey('pokemon.id'), nullable=True)
+
 class PokemonFlavorText(TableBase):
     __tablename__ = 'pokemon_flavor_text'
     pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False)
@@ -716,7 +729,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 +751,7 @@ MoveEffectCategoryMap.category = relation(MoveEffectCategory)
 
 MoveFlag.flag = relation(MoveFlagType)
 
-MoveFlavorText.generation = relation(Generation)
+MoveFlavorText.version_group = relation(VersionGroup)
 
 MoveName.language = relation(Language)
 
@@ -781,10 +794,14 @@ Pokemon.egg_groups = relation(EggGroup, secondary=PokemonEggGroup.__table__,
                                         order_by=PokemonEggGroup.egg_group_id,
                                         backref='pokemon')
 Pokemon.evolution_chain = relation(EvolutionChain, backref='pokemon')
-Pokemon.evolution_method = relation(EvolutionMethod)
-Pokemon.evolution_children = relation(Pokemon, primaryjoin=Pokemon.id==Pokemon.evolution_parent_pokemon_id,
-                                               backref=backref('evolution_parent',
-                                                               remote_side=[Pokemon.id]))
+Pokemon.evolution_children = relation(Pokemon,
+    primaryjoin=Pokemon.id==PokemonEvolution.from_pokemon_id,
+    secondary=PokemonEvolution.__table__,
+    secondaryjoin=PokemonEvolution.to_pokemon_id==Pokemon.id,
+    backref=backref('evolution_parent',
+        uselist=False,
+    ),
+)
 Pokemon.flavor_text = relation(PokemonFlavorText, order_by=PokemonFlavorText.version_id.asc(), backref='pokemon')
 Pokemon.foreign_names = relation(PokemonName, backref='pokemon')
 Pokemon.pokemon_habitat = relation(PokemonHabitat, backref='pokemon')
@@ -797,6 +814,38 @@ Pokemon.types = relation(Type, secondary=PokemonType.__table__, order_by=Pokemon
 
 PokemonDexNumber.pokedex = relation(Pokedex)
 
+PokemonEvolution.from_pokemon = relation(Pokemon,
+    primaryjoin=PokemonEvolution.from_pokemon_id==Pokemon.id,
+    backref='child_evolutions',
+)
+PokemonEvolution.to_pokemon = relation(Pokemon,
+    primaryjoin=PokemonEvolution.to_pokemon_id==Pokemon.id,
+    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, backref='evolutions')
+PokemonEvolution.trigger_item = relation(Item,
+    primaryjoin=PokemonEvolution.trigger_item_id==Item.id,
+    backref='triggered_evolutions',
+)
+PokemonEvolution.held_item = relation(Item,
+    primaryjoin=PokemonEvolution.held_item_id==Item.id,
+    backref='required_for_evolutions',
+)
+PokemonEvolution.location = relation(Location, backref='triggered_evolutions')
+PokemonEvolution.known_move = relation(Move, backref='triggered_evolutions')
+PokemonEvolution.party_pokemon = relation(Pokemon,
+    primaryjoin=PokemonEvolution.party_pokemon_id==Pokemon.id,
+    backref='triggered_evolutions',
+)
+
 PokemonFlavorText.version = relation(Version)
 
 PokemonItem.item = relation(Item, backref='pokemon')