X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/3031a2e3f412d6fd4ef397f5336792638d849e83..2efa91d9daf718debf9ed920efaf02a155054cac:/pokedex/db/tables.py

diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index cedc6a4..a7dd9c8 100644
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -2,10 +2,13 @@
 
 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 *
 
+from pokedex.db import rst
+
 metadata = MetaData()
 TableBase = declarative_base(metadata=metadata)
 
@@ -162,12 +165,18 @@ class Machine(TableBase):
     generation_id = Column(Integer, ForeignKey('generations.id'), primary_key=True, nullable=False, autoincrement=False)
     move_id = Column(Integer, ForeignKey('moves.id'), nullable=False)
 
+class MoveDamageClass(TableBase):
+    __tablename__ = 'move_damage_classes'
+    id = Column(Integer, primary_key=True, nullable=False)
+    name = Column(Unicode(8), nullable=False)
+    description = Column(Unicode(64), nullable=False)
+
 class MoveEffect(TableBase):
     __tablename__ = 'move_effects'
     id = Column(Integer, primary_key=True, nullable=False)
     priority = Column(SmallInteger, nullable=False)
     short_effect = Column(Unicode(128), nullable=False)
-    effect = Column(Unicode(255), nullable=False)
+    effect = Column(Unicode(5120), nullable=False)
 
 class MoveTarget(TableBase):
     __tablename__ = 'move_targets'
@@ -179,12 +188,13 @@ 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)
     accuracy = Column(SmallInteger)
     target_id = Column(Integer, ForeignKey('move_targets.id'), nullable=False)
-    category = Column(Unicode(8), nullable=False)
+    damage_class_id = Column(Integer, ForeignKey('move_damage_classes.id'), nullable=False)
     effect_id = Column(Integer, ForeignKey('move_effects.id'), nullable=False)
     effect_chance = Column(Integer)
     contest_type = Column(Unicode(8), nullable=False)
@@ -380,13 +390,22 @@ 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.effect = relation(MoveEffect, backref='moves')
+Move.damage_class = relation(MoveDamageClass, backref='moves')
+Move.move_effect = relation(MoveEffect, backref='moves')
+Move.generation = relation(Generation, backref='moves')
 Move.machines = relation(Machine, backref='move')
+Move.target = relation(MoveTarget, backref='moves')
+Move.type = relation(Type, backref='moves')
+
+Move.effect = rst.MoveEffectProperty()
+Move.priority = association_proxy('move_effect', 'priority')
+Move.short_effect = association_proxy('move_effect', 'short_effect')
 
 Pokemon.abilities = relation(Ability, secondary=PokemonAbility.__table__,
                                       order_by=PokemonAbility.slot,
@@ -440,8 +459,7 @@ 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')
+Version.generation = association_proxy('version_group', 'generation')
 
 VersionGroup.generation = relation(Generation, backref='version_groups')