From: Lynn "Zhorken" Vaughan Date: Mon, 31 Jan 2011 21:36:20 +0000 (-0500) Subject: Make Type.moves a proper relation with an order_by. X-Git-Tag: veekun-promotions/2011021501~13 X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/8e3697d8cc803ba77326f63ae948fceb610bccc4 Make Type.moves a proper relation with an order_by. --- diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index 1bbab38..e4dd61b 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -1434,7 +1434,7 @@ Move.super_contest_effect = relation(SuperContestEffect, backref='moves') Move.super_contest_combo_next = association_proxy('super_contest_combo_first', 'second') Move.super_contest_combo_prev = association_proxy('super_contest_combo_second', 'first') Move.target = relation(MoveTarget, backref='moves') -Move.type = relation(Type, backref='moves') +Move.type = relation(Type, back_populates='moves') Move.effect = markdown.MoveEffectProperty('effect') Move.short_effect = markdown.MoveEffectProperty('short_effect') @@ -1628,6 +1628,7 @@ Type.foreign_names = relation(TypeName, backref='type') Type.pokemon = relation(Pokemon, secondary=PokemonType.__table__, order_by=Pokemon.order, back_populates='types') +Type.moves = relation(Move, back_populates='type', order_by=Move.name) TypeName.language = relation(Language)