veniasilente/veekun_pokedex
1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-08-20 18:16:34 +00:00
Code Issues Projects Releases Wiki Activity

Make the rest of the tests pass.

Browse source
This commit is contained in:
Lynn "Zhorken" Vaughan 2013-11-09 03:49:09 -05:00
parent 7f22ad2c86
commit 5ec50ea26c
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/main-tables.rst
View file

@ -150,6 +150,7 @@ Association tables
.. dex-table:: NatureBattleStylePreference .. dex-table:: NatureBattleStylePreference
.. dex-table:: NaturePokeathlonStat .. dex-table:: NaturePokeathlonStat
.. dex-table:: PokeathlonStat .. dex-table:: PokeathlonStat
.. dex-table:: PokedexVersionGroup
.. dex-table:: PokemonAbility .. dex-table:: PokemonAbility
.. dex-table:: PokemonEggGroup .. dex-table:: PokemonEggGroup
.. dex-table:: PokemonFormPokeathlonStat .. dex-table:: PokemonFormPokeathlonStat

4
pokedex/db/tables.py
View file

@ -1512,7 +1512,7 @@ class PokedexVersionGroup(TableBase):
pokedex_id = Column(Integer, ForeignKey('pokedexes.id'), primary_key=True, pokedex_id = Column(Integer, ForeignKey('pokedexes.id'), primary_key=True,
info=dict(description=u'The ID of the Pokédex.')) info=dict(description=u'The ID of the Pokédex.'))
version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True,
info=dict(descruption=u'The ID of the version group.')) info=dict(description=u'The ID of the version group.'))
class Pokemon(TableBase): class Pokemon(TableBase):
u"""A Pokémon. The core to this whole mess. u"""A Pokémon. The core to this whole mess.
@ -2102,7 +2102,7 @@ class VersionGroup(TableBase):
id = Column(Integer, primary_key=True, nullable=False, id = Column(Integer, primary_key=True, nullable=False,
info=dict(description=u"This version group's unique ID.")) info=dict(description=u"This version group's unique ID."))
identifier = Column(Unicode(20), nullable=False, unique=True, identifier = Column(Unicode(20), nullable=False, unique=True,
info=dict(description=u"This version group's unique textual identifier.")) info=dict(description=u"This version group's unique textual identifier.", format='identifier'))
generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False, generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False,
info=dict(description=u"The ID of the generation the games in this group belong to.")) info=dict(description=u"The ID of the generation the games in this group belong to."))
order = Column(Integer, nullable=True, order = Column(Integer, nullable=True,

4
pokedex/tests/test_lookup.py
View file

@ -21,8 +21,8 @@ lookup = PokedexLookup()
# Forms # Forms
(u'Rotom', 'pokemon_species', 479), (u'Rotom', 'pokemon_species', 479),
(u'Wash Rotom', 'pokemon_forms', 708), (u'Wash Rotom', 'pokemon_forms', 10059),
(u'East Shellos', 'pokemon_forms', 688), (u'East Shellos', 'pokemon_forms', 10039),
# Other languages # Other languages
(u'イーブイ', 'pokemon_species', 133), (u'イーブイ', 'pokemon_species', 133),