projects
/
zzz-pokedex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed evolution_methods table. #42
[zzz-pokedex.git]
/
pokedex
/
db
/
tables.py
diff --git
a/pokedex/db/tables.py
b/pokedex/db/tables.py
index
82159d3
..
d57efed
100644
(file)
--- a/
pokedex/db/tables.py
+++ b/
pokedex/db/tables.py
@@
-174,12
+174,6
@@
class EvolutionChain(TableBase):
steps_to_hatch = Column(Integer, nullable=False)
baby_trigger_item = Column(Unicode(12))
steps_to_hatch = Column(Integer, nullable=False)
baby_trigger_item = Column(Unicode(12))
-class EvolutionMethod(TableBase):
- __tablename__ = 'evolution_methods'
- id = Column(Integer, primary_key=True, nullable=False)
- name = Column(Unicode(64), nullable=False)
- description = Column(Unicode(255), nullable=False)
-
class EvolutionTrigger(TableBase):
__tablename__ = 'evolution_triggers'
id = Column(Integer, primary_key=True, nullable=False)
class EvolutionTrigger(TableBase):
__tablename__ = 'evolution_triggers'
id = Column(Integer, primary_key=True, nullable=False)
@@
-800,7
+794,6
@@
Pokemon.egg_groups = relation(EggGroup, secondary=PokemonEggGroup.__table__,
order_by=PokemonEggGroup.egg_group_id,
backref='pokemon')
Pokemon.evolution_chain = relation(EvolutionChain, backref='pokemon')
order_by=PokemonEggGroup.egg_group_id,
backref='pokemon')
Pokemon.evolution_chain = relation(EvolutionChain, backref='pokemon')
-Pokemon.evolution_method = relation(EvolutionMethod)
Pokemon.evolution_children = relation(Pokemon,
secondary=PokemonEvolution.__table__,
primaryjoin=Pokemon.id==PokemonEvolution.from_pokemon_id,
Pokemon.evolution_children = relation(Pokemon,
secondary=PokemonEvolution.__table__,
primaryjoin=Pokemon.id==PokemonEvolution.from_pokemon_id,