X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/b07723b13003bcd3f197d321101ab15008cf5185..d56ba048f474402e936a6da82e8d0f9facb7feb9:/pokedex/db/tables.py

diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index c2a0609..57207dd 100644
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -2,6 +2,7 @@
 
 from sqlalchemy import Column, ForeignKey, MetaData, Table
 from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm import backref, relation
 from sqlalchemy.types import *
 from sqlalchemy.databases.mysql import *
@@ -127,10 +128,11 @@ class Generation(TableBase):
     main_region = Column(Unicode(16), nullable=False)
 
 class GrowthRate(TableBase):
+    """`formula` is written in LaTeX math notation."""
     __tablename__ = 'growth_rates'
     id = Column(Integer, primary_key=True, nullable=False)
-    name = Column(Unicode(16), nullable=False)
-    formula = Column(Unicode(255), nullable=False)
+    name = Column(Unicode(20), nullable=False)
+    formula = Column(Unicode(500), nullable=False)
 
 class Item(TableBase):
     __tablename__ = 'items'
@@ -155,6 +157,12 @@ class LocationArea(TableBase):
     internal_id = Column(Integer, nullable=False)
     name = Column(Unicode(64), nullable=True)
 
+class Machine(TableBase):
+    __tablename__ = 'machines'
+    machine_number = Column(Integer, primary_key=True, nullable=False, autoincrement=False)
+    generation_id = Column(Integer, ForeignKey('generations.id'), primary_key=True, nullable=False, autoincrement=False)
+    move_id = Column(Integer, ForeignKey('moves.id'), nullable=False)
+
 class MoveEffect(TableBase):
     __tablename__ = 'move_effects'
     id = Column(Integer, primary_key=True, nullable=False)
@@ -172,6 +180,7 @@ class Move(TableBase):
     __tablename__ = 'moves'
     id = Column(Integer, primary_key=True, nullable=False)
     name = Column(Unicode(12), nullable=False)
+    generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False)
     type_id = Column(Integer, ForeignKey('types.id'), nullable=False)
     power = Column(SmallInteger)
     pp = Column(SmallInteger, nullable=False)
@@ -296,7 +305,7 @@ class PokemonMove(TableBase):
     version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False)
     move_id = Column(Integer, ForeignKey('moves.id'), primary_key=True, nullable=False, autoincrement=False, index=True)
     pokemon_move_method_id = Column(Integer, ForeignKey('pokemon_move_methods.id'), primary_key=True, nullable=False, autoincrement=False)
-    level = Column(Integer, primary_key=True, nullable=True)
+    level = Column(Integer, primary_key=True, nullable=True, autoincrement=False)
     order = Column(Integer, nullable=True)
 
 class PokemonMoveMethod(TableBase):
@@ -358,6 +367,8 @@ class Version(TableBase):
     version_group_id = Column(Integer, ForeignKey('version_groups.id'), nullable=False)
     name = Column(Unicode(32), nullable=False)
 
+    generation = association_proxy('version_group', 'generation')
+
 
 ### Relations down here, to avoid ordering problems
 Encounter.pokemon = relation(Pokemon, backref='encounters')
@@ -373,9 +384,17 @@ EncounterTypeSlot.type = relation(EncounterType, backref='slots')
 
 EvolutionChain.growth_rate = relation(GrowthRate, backref='evolution_chains')
 
+Generation.versions = relation(Version, secondary=VersionGroup.__table__)
+
 LocationArea.location = relation(Location, backref='areas')
 
+Machine.generation = relation(Generation)
+
 Move.type = relation(Type, backref='moves')
+Move.generation = relation(Generation, backref='moves')
+Move.target = relation(MoveTarget, backref='moves')
+Move.effect = relation(MoveEffect, backref='moves')
+Move.machines = relation(Machine, backref='move')
 
 Pokemon.abilities = relation(Ability, secondary=PokemonAbility.__table__,
                                       order_by=PokemonAbility.slot,
@@ -429,6 +448,6 @@ Type.target_efficacies = relation(TypeEfficacy,
                                       ==TypeEfficacy.target_type_id,
                                   backref='target_type')
 
-Version.generation = relation(Generation, secondary=VersionGroup.__table__,
-                              backref='versions')
 Version.version_group = relation(VersionGroup, backref='versions')
+
+VersionGroup.generation = relation(Generation, backref='version_groups')