From 774690026c61cffe47d74ec7c7217821be012fbe Mon Sep 17 00:00:00 2001 From: Eevee Date: Fri, 6 Mar 2009 19:14:42 -0800 Subject: [PATCH] Added habitat sprites. Renamed flavor to flavor_text. pokemon_flavor_text.flavor -> pokemon_flavor_text.flavor_text --- pokedex/data/csv/pokemon_flavor_text.csv | 2 +- pokedex/db/tables.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pokedex/data/csv/pokemon_flavor_text.csv b/pokedex/data/csv/pokemon_flavor_text.csv index 50f6b43..15b65bb 100644 --- a/pokedex/data/csv/pokemon_flavor_text.csv +++ b/pokedex/data/csv/pokemon_flavor_text.csv @@ -1,4 +1,4 @@ -pokemon_id,version_id,flavor +pokemon_id,version_id,flavor_text 1,1,A strange seed was planted in its back at birth. The plant sprouts and grows with this Pokemon. 1,3,"It can go for days without eating a single morsel. In the bulb on its back, it stores energy." 1,4,The seed on its back is filled with nutrients. The seed grows steadily larger as its body grows. diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index f804eb2..4c38755 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -133,7 +133,7 @@ class PokemonFlavorText(TableBase): __tablename__ = 'pokemon_flavor_text' pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False) version_id = Column(Integer, ForeignKey('versions.id'), primary_key=True, nullable=False) - flavor = Column(Unicode(255), nullable=False) + flavor_text = Column(Unicode(255), nullable=False) class PokemonName(TableBase): __tablename__ = 'pokemon_names' @@ -199,6 +199,7 @@ Pokemon.egg_groups = relation(EggGroup, secondary=PokemonEggGroup.__table__, order_by=PokemonEggGroup.egg_group_id, backref='pokemon') Pokemon.evolution_chain = relation(EvolutionChain, backref='pokemon') +Pokemon.flavor_text = relation(PokemonFlavorText, backref='pokemon') Pokemon.foreign_names = relation(PokemonName, backref='pokemon') Pokemon.generation = relation(Generation, backref='pokemon') Pokemon.shape = relation(PokemonShape, backref='pokemon') @@ -207,6 +208,8 @@ Pokemon.types = relation(Type, secondary=PokemonType.__table__) PokemonDexNumber.generation = relation(Generation) +PokemonFlavorText.version = relation(Version) + PokemonName.language = relation(Language) PokemonStat.stat = relation(Stat)