Remove some innerjoins which no longer hold.

This commit is contained in:
Andrew Ekstedt 2013-10-19 15:22:16 -07:00
parent 8a05436945
commit fdf87cf8ce

View file

@ -2479,7 +2479,6 @@ Pokedex.version_groups = relationship(VersionGroup,
Pokemon.all_abilities = relationship(Ability, Pokemon.all_abilities = relationship(Ability,
secondary=PokemonAbility.__table__, secondary=PokemonAbility.__table__,
order_by=PokemonAbility.slot.asc(), order_by=PokemonAbility.slot.asc(),
innerjoin=True,
backref=backref('all_pokemon', order_by=Pokemon.order.asc()), backref=backref('all_pokemon', order_by=Pokemon.order.asc()),
doc=u"All abilities the Pokémon can have, including the Hidden Ability") doc=u"All abilities the Pokémon can have, including the Hidden Ability")
Pokemon.abilities = relationship(Ability, Pokemon.abilities = relationship(Ability,
@ -2488,7 +2487,6 @@ Pokemon.abilities = relationship(Ability,
Pokemon.id == PokemonAbility.pokemon_id, Pokemon.id == PokemonAbility.pokemon_id,
PokemonAbility.is_hidden == False, PokemonAbility.is_hidden == False,
), ),
innerjoin=True,
order_by=PokemonAbility.slot.asc(), order_by=PokemonAbility.slot.asc(),
backref=backref('pokemon', order_by=Pokemon.order.asc()), backref=backref('pokemon', order_by=Pokemon.order.asc()),
doc=u"Abilities the Pokémon can have in the wild") doc=u"Abilities the Pokémon can have in the wild")
@ -2503,7 +2501,6 @@ Pokemon.hidden_ability = relationship(Ability,
doc=u"The Pokémon's Hidden Ability") doc=u"The Pokémon's Hidden Ability")
Pokemon.pokemon_abilities = relationship(PokemonAbility, Pokemon.pokemon_abilities = relationship(PokemonAbility,
order_by=PokemonAbility.slot.asc(), order_by=PokemonAbility.slot.asc(),
innerjoin=True,
backref=backref('pokemon', order_by=Pokemon.order.asc()), backref=backref('pokemon', order_by=Pokemon.order.asc()),
doc=u"All abilities the Pokémon can have, as bridge rows") doc=u"All abilities the Pokémon can have, as bridge rows")
Pokemon.forms = relationship(PokemonForm, Pokemon.forms = relationship(PokemonForm,
@ -2521,7 +2518,6 @@ Pokemon.items = relationship(PokemonItem,
order_by=PokemonItem.rarity.desc(), order_by=PokemonItem.rarity.desc(),
doc=u"Info about items this pokémon holds in the wild") doc=u"Info about items this pokémon holds in the wild")
Pokemon.stats = relationship(PokemonStat, Pokemon.stats = relationship(PokemonStat,
innerjoin=True,
order_by=PokemonStat.stat_id.asc(), order_by=PokemonStat.stat_id.asc(),
backref='pokemon') backref='pokemon')
Pokemon.species = relationship(PokemonSpecies, Pokemon.species = relationship(PokemonSpecies,
@ -2630,7 +2626,6 @@ PokemonSpecies.color = relationship(PokemonColor,
backref='species') backref='species')
PokemonSpecies.egg_groups = relationship(EggGroup, PokemonSpecies.egg_groups = relationship(EggGroup,
secondary=PokemonEggGroup.__table__, secondary=PokemonEggGroup.__table__,
innerjoin=True,
order_by=PokemonEggGroup.egg_group_id.asc(), order_by=PokemonEggGroup.egg_group_id.asc(),
backref=backref('species', order_by=PokemonSpecies.order.asc())) backref=backref('species', order_by=PokemonSpecies.order.asc()))
PokemonSpecies.forms = relationship(PokemonForm, PokemonSpecies.forms = relationship(PokemonForm,
@ -2652,7 +2647,6 @@ PokemonSpecies.default_pokemon = relationship(Pokemon,
Pokemon.is_default==True), Pokemon.is_default==True),
uselist=False, lazy='joined') uselist=False, lazy='joined')
PokemonSpecies.evolution_chain = relationship(EvolutionChain, PokemonSpecies.evolution_chain = relationship(EvolutionChain,
innerjoin=True,
backref=backref('species', order_by=PokemonSpecies.id.asc())) backref=backref('species', order_by=PokemonSpecies.id.asc()))
PokemonSpecies.dex_numbers = relationship(PokemonDexNumber, PokemonSpecies.dex_numbers = relationship(PokemonDexNumber,
innerjoin=True, innerjoin=True,