Fixed some MySQL import problems.

[zzz-pokedex.git] / pokedex / db / tables.py

diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index 1829f25..7bf30c4 100644 (file)
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -101,6 +101,7 @@ class Pokemon(TableBase):
     weight = Column(Integer, nullable=False)
     species = Column(Unicode(16), nullable=False)
     color = Column(Unicode(6), nullable=False)
     weight = Column(Integer, nullable=False)
     species = Column(Unicode(16), nullable=False)
     color = Column(Unicode(6), nullable=False)

+    pokemon_shape_id = Column(Integer, ForeignKey('pokemon_shapes.id'), nullable=False)

     habitat = Column(Unicode(16), nullable=False)
     gender_rate = Column(Integer, nullable=False)
     capture_rate = Column(Integer, nullable=False)
     habitat = Column(Unicode(16), nullable=False)
     gender_rate = Column(Integer, nullable=False)
     capture_rate = Column(Integer, nullable=False)


@@ -113,45 +114,51 @@ class Pokemon(TableBase):
 
 class PokemonAbility(TableBase):
     __tablename__ = 'pokemon_abilities'
 
 class PokemonAbility(TableBase):
     __tablename__ = 'pokemon_abilities'

-    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False)
+    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False)

     ability_id = Column(Integer, ForeignKey('abilities.id'), nullable=False)
     ability_id = Column(Integer, ForeignKey('abilities.id'), nullable=False)

-    slot = Column(Integer, primary_key=True, nullable=False)
+    slot = Column(Integer, primary_key=True, nullable=False, autoincrement=False)

 
 class PokemonDexNumber(TableBase):
     __tablename__ = 'pokemon_dex_numbers'
 
 class PokemonDexNumber(TableBase):
     __tablename__ = 'pokemon_dex_numbers'

-    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False)
-    generation_id = Column(Integer, ForeignKey('generations.id'), primary_key=True, nullable=False)
+    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False)
+    generation_id = Column(Integer, ForeignKey('generations.id'), primary_key=True, nullable=False, autoincrement=False)

     pokedex_number = Column(Integer, nullable=False)
 
 class PokemonEggGroup(TableBase):
     __tablename__ = 'pokemon_egg_groups'
     pokedex_number = Column(Integer, nullable=False)
 
 class PokemonEggGroup(TableBase):
     __tablename__ = 'pokemon_egg_groups'

-    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False)
-    egg_group_id = Column(Integer, ForeignKey('egg_groups.id'), primary_key=True, nullable=False)
+    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False)
+    egg_group_id = Column(Integer, ForeignKey('egg_groups.id'), primary_key=True, nullable=False, autoincrement=False)

 
 class PokemonFlavorText(TableBase):
     __tablename__ = 'pokemon_flavor_text'
 
 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)
+    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False)
+    version_id = Column(Integer, ForeignKey('versions.id'), primary_key=True, nullable=False, autoincrement=False)
+    flavor_text = Column(Unicode(255), nullable=False)

 
 class PokemonName(TableBase):
     __tablename__ = 'pokemon_names'
 
 class PokemonName(TableBase):
     __tablename__ = 'pokemon_names'

-    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False)
-    language_id = Column(Integer, ForeignKey('languages.id'), primary_key=True, nullable=False)
+    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False)
+    language_id = Column(Integer, ForeignKey('languages.id'), primary_key=True, nullable=False, autoincrement=False)

     name = Column(Unicode(16), nullable=False)
 
     name = Column(Unicode(16), nullable=False)
 

+class PokemonShape(TableBase):
+    __tablename__ = 'pokemon_shapes'
+    id = Column(Integer, primary_key=True, nullable=False)
+    name = Column(Unicode(24), nullable=False)
+    awesome_name = Column(Unicode(16), nullable=False)
+

 class PokemonStat(TableBase):
     __tablename__ = 'pokemon_stats'
 class PokemonStat(TableBase):
     __tablename__ = 'pokemon_stats'

-    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False)
-    stat_id = Column(Integer, ForeignKey('stats.id'), primary_key=True, nullable=False)
+    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False)
+    stat_id = Column(Integer, ForeignKey('stats.id'), primary_key=True, nullable=False, autoincrement=False)

     base_stat = Column(Integer, nullable=False)
     effort = Column(Integer, nullable=False)
 
 class PokemonType(TableBase):
     __tablename__ = 'pokemon_types'
     base_stat = Column(Integer, nullable=False)
     effort = Column(Integer, nullable=False)
 
 class PokemonType(TableBase):
     __tablename__ = 'pokemon_types'

-    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False)
+    pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False)

     type_id = Column(Integer, ForeignKey('types.id'), nullable=False)
     type_id = Column(Integer, ForeignKey('types.id'), nullable=False)

-    slot = Column(Integer, primary_key=True, nullable=False)
+    slot = Column(Integer, primary_key=True, nullable=False, autoincrement=False)

 
 class Stat(TableBase):
     __tablename__ = 'stats'
 
 class Stat(TableBase):
     __tablename__ = 'stats'


@@ -160,8 +167,8 @@ class Stat(TableBase):
 
 class TypeEfficacy(TableBase):
     __tablename__ = 'type_efficacy'
 
 class TypeEfficacy(TableBase):
     __tablename__ = 'type_efficacy'

-    damage_type_id = Column(Integer, ForeignKey('types.id'), primary_key=True, nullable=False)
-    target_type_id = Column(Integer, ForeignKey('types.id'), primary_key=True, nullable=False)
+    damage_type_id = Column(Integer, ForeignKey('types.id'), primary_key=True, nullable=False, autoincrement=False)
+    target_type_id = Column(Integer, ForeignKey('types.id'), primary_key=True, nullable=False, autoincrement=False)

     damage_factor = Column(Integer, nullable=False)
 
 class Type(TableBase):
     damage_factor = Column(Integer, nullable=False)
 
 class Type(TableBase):


@@ -183,18 +190,26 @@ class Version(TableBase):
 
 
 ### Relations down here, to avoid ordering problems
 
 
 ### Relations down here, to avoid ordering problems

+EvolutionChain.growth_rate = relation(GrowthRate, backref='evolution_chains')

 Pokemon.abilities = relation(Ability, secondary=PokemonAbility.__table__,
                                       order_by=PokemonAbility.slot,
                                       backref='pokemon')
 Pokemon.dex_numbers = relation(PokemonDexNumber, backref='pokemon')
 Pokemon.abilities = relation(Ability, secondary=PokemonAbility.__table__,
                                       order_by=PokemonAbility.slot,
                                       backref='pokemon')
 Pokemon.dex_numbers = relation(PokemonDexNumber, backref='pokemon')

+Pokemon.egg_groups = relation(EggGroup, secondary=PokemonEggGroup.__table__,
+                                        order_by=PokemonEggGroup.egg_group_id,
+                                        backref='pokemon')

 Pokemon.evolution_chain = relation(EvolutionChain, 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.foreign_names = relation(PokemonName, backref='pokemon')
 Pokemon.generation = relation(Generation, backref='pokemon')

+Pokemon.shape = relation(PokemonShape, backref='pokemon')

 Pokemon.stats = relation(PokemonStat, backref='pokemon')
 Pokemon.types = relation(Type, secondary=PokemonType.__table__)
 
 PokemonDexNumber.generation = relation(Generation)
 
 Pokemon.stats = relation(PokemonStat, backref='pokemon')
 Pokemon.types = relation(Type, secondary=PokemonType.__table__)
 
 PokemonDexNumber.generation = relation(Generation)
 

+PokemonFlavorText.version = relation(Version)
+

 PokemonName.language = relation(Language)
 
 PokemonStat.stat = relation(Stat)
 PokemonName.language = relation(Language)
 
 PokemonStat.stat = relation(Stat)