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

Drop Generation.canonical_pokedex.

Browse source 
Generation VI doesn't have a canonical pokedex (it has three). We don't
use this anywhere and as far as i can tell we never have. We can revive
it in another form if and when we find we need it.

Conflicts:
	pokedex/data/csv/generations.csv
	pokedex/db/tables.py
This commit is contained in:
Andrew Ekstedt 2013-10-18 17:49:41 -07:00
parent 56aca8e9c3
commit 38ce28e48f
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pokedex/data/csv/generations.csv
View file

@ -1,7 +1,7 @@
id,main_region_id,canonical_pokedex_id,identifier id,main_region_id,identifier
1,1,2,generation-i 1,1,generation-i
2,2,7,generation-ii 2,2,generation-ii
3,3,4,generation-iii 3,3,generation-iii
4,4,6,generation-iv 4,4,generation-iv
5,5,8,generation-v 5,5,generation-v
6,6,12,generation-vi 6,6,generation-vi

1 id main_region_id canonical_pokedex_id identifier
2 1 1 2 generation-i
3 2 2 7 generation-ii
4 3 3 4 generation-iii
5 4 4 6 generation-iv
6 5 5 8 generation-v
7 6 6 12 generation-vi

4
pokedex/db/tables.py
View file

@ -862,8 +862,6 @@ class Generation(TableBase):
info=dict(description="A numeric ID")) info=dict(description="A numeric ID"))
main_region_id = Column(Integer, ForeignKey('regions.id'), nullable=False, main_region_id = Column(Integer, ForeignKey('regions.id'), nullable=False,
info=dict(description="ID of the region this generation's main games take place in")) info=dict(description="ID of the region this generation's main games take place in"))
canonical_pokedex_id = Column(Integer, ForeignKey('pokedexes.id'), nullable=False,
info=dict(description=u"ID of the Pokédex this generation's main games use by default"))
identifier = Column(Unicode(16), nullable=False, identifier = Column(Unicode(16), nullable=False,
info=dict(description=u'An identifier', format='identifier')) info=dict(description=u'An identifier', format='identifier'))
@ -2273,8 +2271,6 @@ Experience.growth_rate = relationship(GrowthRate,
backref='experience_table') backref='experience_table')
Generation.canonical_pokedex = relationship(Pokedex,
backref='canonical_for_generation')
Generation.versions = relationship(Version, Generation.versions = relationship(Version,
secondary=VersionGroup.__table__, secondary=VersionGroup.__table__,
innerjoin=True) innerjoin=True)