From 7677696cba1813630b653fe0af3338d37ea63730 Mon Sep 17 00:00:00 2001 From: Eevee Date: Tue, 25 May 2010 00:09:29 -0700 Subject: [PATCH 1/1] Pokemon.evolution_* => Pokemon.*_pokemon --- pokedex/db/tables.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index 5de85f9..4299668 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -794,13 +794,11 @@ 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_children = relation(Pokemon, +Pokemon.child_pokemon = 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, - ), + backref=backref('parent_pokemon', uselist=False), ) Pokemon.flavor_text = relation(PokemonFlavorText, order_by=PokemonFlavorText.version_id.asc(), backref='pokemon') Pokemon.foreign_names = relation(PokemonName, backref='pokemon') -- 2.7.4