From: Eevee <git@veekun.com>
Date: Sat, 28 Nov 2009 10:14:39 +0000 (-0800)
Subject: Added PokemonMove.machine relation.
X-Git-Tag: veekun-promotions/2010050901~125
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/78fcf39b790c65c1c387bd4147f124e3ac71fdba

Added PokemonMove.machine relation.
---

diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index 01cc6a0..3e58c1c 100644
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -4,6 +4,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.sql import and_
 from sqlalchemy.types import *
 from sqlalchemy.databases.mysql import *
 
@@ -534,6 +535,11 @@ PokemonFormSprite.introduced_in = relation(VersionGroup)
 
 PokemonMove.pokemon = relation(Pokemon, backref='pokemon_moves')
 PokemonMove.version_group = relation(VersionGroup)
+PokemonMove.machine = relation(Machine, backref='pokemon_moves',
+                               primaryjoin=and_(Machine.version_group_id==PokemonMove.version_group_id,
+                                                Machine.move_id==PokemonMove.move_id),
+                                foreign_keys=[Machine.version_group_id, Machine.move_id],
+                                uselist=False)
 PokemonMove.move = relation(Move, backref='pokemon_moves')
 PokemonMove.method = relation(PokemonMoveMethod)