From: Eevee <git@veekun.com>
Date: Fri, 28 Jan 2011 04:27:42 +0000 (-0800)
Subject: Remove useless encounter_slot_conditions table.  #297
X-Git-Tag: veekun-promotions/2011021501~19
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/08ed701502c20612ef794f27a58a6909664cccf3

Remove useless encounter_slot_conditions table.  #297
---

diff --git a/pokedex/data/csv/encounter_slot_conditions.csv b/pokedex/data/csv/encounter_slot_conditions.csv
deleted file mode 100644
index e07ea9d..0000000
--- a/pokedex/data/csv/encounter_slot_conditions.csv
+++ /dev/null
@@ -1,29 +0,0 @@
-encounter_slot_id,encounter_condition_id
-1,1
-2,1
-3,2
-4,2
-5,3
-6,3
-9,4
-10,4
-11,3
-12,3
-33,1
-33,2
-34,1
-34,2
-35,2
-35,5
-36,2
-36,5
-37,2
-37,5
-38,2
-38,5
-39,2
-40,2
-41,2
-42,2
-43,2
-44,2
diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index 635b967..c025059 100644
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -283,15 +283,6 @@ class EncounterSlot(TableBase):
     rarity = Column(Integer, nullable=False,
         info=dict(description="The chance of the encounter as a percentage"))
 
-class EncounterSlotCondition(TableBase):
-    u"""A condition that affects an encounter slot.
-    """
-    __tablename__ = 'encounter_slot_conditions'
-    encounter_slot_id = Column(Integer, ForeignKey('encounter_slots.id'), primary_key=True, nullable=False, autoincrement=False,
-        info=dict(description="The ID of the encounter slot"))
-    encounter_condition_id = Column(Integer, ForeignKey('encounter_conditions.id'), primary_key=True, nullable=False, autoincrement=False,
-        info=dict(description="The ID of the encounter condition"))
-
 class EvolutionChain(TableBase):
     u"""A family of Pokémon that are linked by evolution
     """
@@ -1379,11 +1370,6 @@ EncounterConditionValueMap.condition_value = relation(EncounterConditionValue,
 EncounterSlot.terrain = relation(EncounterTerrain, backref='slots')
 EncounterSlot.version_group = relation(VersionGroup)
 
-EncounterSlot.condition_map = relation(EncounterSlotCondition, backref='slot')
-EncounterSlot.conditions = association_proxy('condition_map', 'condition')
-EncounterSlotCondition.condition = relation(EncounterCondition,
-                                            backref='slot_map')
-
 EvolutionChain.growth_rate = relation(GrowthRate, backref='evolution_chains')
 EvolutionChain.baby_trigger_item = relation(Item, backref='evolution_chains')
 EvolutionChain.pokemon = relation(Pokemon, order_by=Pokemon.order, back_populates='evolution_chain')