X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/896564aaefb6388ca6557e1a1b6bbe1d8ff3d90d..d5cd8c61d19faea1735a77d5041dd98661e1644a:/pokedex/db/tables.py?ds=inline diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index b0e9c24..8ae80d8 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -6,7 +6,6 @@ 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 * from pokedex.db import rst @@ -18,8 +17,39 @@ class Ability(TableBase): __singlename__ = 'ability' id = Column(Integer, primary_key=True, nullable=False) name = Column(Unicode(24), nullable=False) + generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False) + effect = Column(rst.RstTextColumn(5120), nullable=False) + short_effect = Column(rst.RstTextColumn(255), nullable=False) + +class AbilityFlavorText(TableBase): + __tablename__ = 'ability_flavor_text' + ability_id = Column(Integer, ForeignKey('abilities.id'), primary_key=True, nullable=False, autoincrement=False) + version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False) flavor_text = Column(Unicode(64), nullable=False) - effect = Column(Unicode(255), nullable=False) + +class Berry(TableBase): + __tablename__ = 'berries' + id = Column(Integer, primary_key=True, nullable=False) + item_id = Column(Integer, ForeignKey('items.id'), nullable=False) + firmness_id = Column(Integer, ForeignKey('berry_firmness.id'), nullable=False) + natural_gift_power = Column(Integer, nullable=True) + natural_gift_type_id = Column(Integer, ForeignKey('types.id'), nullable=True) + size = Column(Integer, nullable=False) + max_harvest = Column(Integer, nullable=False) + growth_time = Column(Integer, nullable=False) + soil_dryness = Column(Integer, nullable=False) + smoothness = Column(Integer, nullable=False) + +class BerryFirmness(TableBase): + __tablename__ = 'berry_firmness' + id = Column(Integer, primary_key=True, nullable=False) + name = Column(Unicode(10), nullable=False) + +class BerryFlavor(TableBase): + __tablename__ = 'berry_flavors' + berry_id = Column(Integer, ForeignKey('berries.id'), primary_key=True, nullable=False, autoincrement=False) + contest_type_id = Column(Integer, ForeignKey('contest_types.id'), primary_key=True, nullable=False, autoincrement=False) + flavor = Column(Integer, nullable=False) class ContestCombo(TableBase): __tablename__ = 'contest_combos' @@ -34,6 +64,13 @@ class ContestEffect(TableBase): flavor_text = Column(Unicode(64), nullable=False) effect = Column(Unicode(255), nullable=False) +class ContestType(TableBase): + __tablename__ = 'contest_types' + id = Column(Integer, primary_key=True, nullable=False) + name = Column(Unicode(6), nullable=False) + flavor = Column(Unicode(6), nullable=False) + color = Column(Unicode(6), nullable=False) + class EggGroup(TableBase): __tablename__ = 'egg_groups' id = Column(Integer, primary_key=True, nullable=False) @@ -58,7 +95,7 @@ class Encounter(TableBase): A slot (20% walking in grass) and any appropriate world conditions (no swarm) are thus enough to define a specific encounter. - + Well, okay, almost: each slot actually appears twice. """ @@ -89,7 +126,7 @@ class EncounterConditionValue(TableBase): id = Column(Integer, primary_key=True, nullable=False) encounter_condition_id = Column(Integer, ForeignKey('encounter_conditions.id'), primary_key=False, nullable=False, autoincrement=False) name = Column(Unicode(64), nullable=False) - default = Column(Boolean, nullable=False) + is_default = Column(Boolean, nullable=False) class EncounterConditionValueMap(TableBase): """Maps encounters to the specific conditions under which they occur.""" @@ -119,7 +156,8 @@ class EncounterSlot(TableBase): id = Column(Integer, primary_key=True, nullable=False) version_group_id = Column(Integer, ForeignKey('version_groups.id'), nullable=False, autoincrement=False) encounter_terrain_id = Column(Integer, ForeignKey('encounter_terrain.id'), primary_key=False, nullable=False, autoincrement=False) - rarity = Column(Integer, nullable=False, autoincrement=False) + slot = Column(Integer, nullable=True) + rarity = Column(Integer, nullable=False) class EncounterSlotCondition(TableBase): """Lists all conditions that affect each slot.""" @@ -141,11 +179,18 @@ class EvolutionMethod(TableBase): name = Column(Unicode(64), nullable=False) description = Column(Unicode(255), nullable=False) +class Experience(TableBase): + __tablename__ = 'experience' + growth_rate_id = Column(Integer, ForeignKey('growth_rates.id'), primary_key=True, nullable=False) + level = Column(Integer, primary_key=True, nullable=False, autoincrement=False) + experience = Column(Integer, nullable=False) + class Generation(TableBase): __tablename__ = 'generations' id = Column(Integer, primary_key=True, nullable=False) + main_region_id = Column(Integer, ForeignKey('regions.id')) + canonical_pokedex_id = Column(Integer, ForeignKey('pokedexes.id')) name = Column(Unicode(16), nullable=False) - main_region = Column(Unicode(16), nullable=False) class GrowthRate(TableBase): """`formula` is written in LaTeX math notation.""" @@ -159,10 +204,60 @@ class Item(TableBase): __singlename__ = 'item' id = Column(Integer, primary_key=True, nullable=False) name = Column(Unicode(16), nullable=False) + category_id = Column(Integer, ForeignKey('item_categories.id'), nullable=False) + cost = Column(Integer, nullable=False) + fling_power = Column(Integer, nullable=True) + fling_effect_id = Column(Integer, ForeignKey('item_fling_effects.id'), nullable=True) + effect = Column(rst.RstTextColumn(5120), nullable=False) + + @property + def appears_underground(self): + return any(flag.identifier == u'underground' for flag in self.flags) + +class ItemCategory(TableBase): + __tablename__ = 'item_categories' + id = Column(Integer, primary_key=True, nullable=False) + pocket_id = Column(Integer, ForeignKey('item_pockets.id'), nullable=False) + name = Column(Unicode(16), nullable=False) + +class ItemFlag(TableBase): + __tablename__ = 'item_flags' + id = Column(Integer, primary_key=True, nullable=False) + identifier = Column(Unicode(24), nullable=False) + name = Column(Unicode(64), nullable=False) + +class ItemFlagMap(TableBase): + __tablename__ = 'item_flag_map' + item_id = Column(Integer, ForeignKey('items.id'), primary_key=True, autoincrement=False, nullable=False) + item_flag_id = Column(Integer, ForeignKey('item_flags.id'), primary_key=True, autoincrement=False, nullable=False) + +class ItemFlavorText(TableBase): + __tablename__ = 'item_flavor_text' + item_id = Column(Integer, ForeignKey('items.id'), primary_key=True, autoincrement=False, nullable=False) + version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, autoincrement=False, nullable=False) + flavor_text = Column(Unicode(255), nullable=False) + +class ItemFlingEffect(TableBase): + __tablename__ = 'item_fling_effects' + id = Column(Integer, primary_key=True, nullable=False) + effect = Column(Unicode(255), nullable=False) + +class ItemInternalID(TableBase): + __tablename__ = 'item_internal_ids' + item_id = Column(Integer, ForeignKey('items.id'), primary_key=True, autoincrement=False, nullable=False) + generation_id = Column(Integer, ForeignKey('generations.id'), primary_key=True, autoincrement=False, nullable=False) + internal_id = Column(Integer, nullable=False) + +class ItemPocket(TableBase): + __tablename__ = 'item_pockets' + id = Column(Integer, primary_key=True, nullable=False) + identifier = Column(Unicode(16), nullable=False) + name = Column(Unicode(16), nullable=False) class Language(TableBase): __tablename__ = 'languages' id = Column(Integer, primary_key=True, nullable=False) + iso639 = Column(Unicode(2), nullable=False) iso3166 = Column(Unicode(2), nullable=False) name = Column(Unicode(16), nullable=False) @@ -170,7 +265,7 @@ class Location(TableBase): __tablename__ = 'locations' __singlename__ = 'location' id = Column(Integer, primary_key=True, nullable=False) - generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False) + region_id = Column(Integer, ForeignKey('regions.id')) name = Column(Unicode(64), nullable=False) class LocationArea(TableBase): @@ -183,7 +278,8 @@ class LocationArea(TableBase): class LocationAreaEncounterRate(TableBase): __tablename__ = 'location_area_encounter_rates' location_area_id = Column(Integer, ForeignKey('location_areas.id'), primary_key=True, nullable=False, autoincrement=False) - encounter_type_id = Column(Integer, ForeignKey('encounter_terrain.id'), primary_key=True, nullable=False, autoincrement=False) + encounter_terrain_id = Column(Integer, ForeignKey('encounter_terrain.id'), primary_key=True, nullable=False, autoincrement=False) + version_id = Column(Integer, ForeignKey('versions.id'), primary_key=True, autoincrement=False) rate = Column(Integer, nullable=True) class Machine(TableBase): @@ -192,6 +288,11 @@ class Machine(TableBase): version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False) move_id = Column(Integer, ForeignKey('moves.id'), nullable=False) +class MoveBattleStyle(TableBase): + __tablename__ = 'move_battle_styles' + id = Column(Integer, primary_key=True, nullable=False) + name = Column(Unicode(8), nullable=False) + class MoveEffectCategory(TableBase): __tablename__ = 'move_effect_categories' id = Column(Integer, primary_key=True, nullable=False) @@ -260,10 +361,50 @@ class Move(TableBase): 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) + contest_type_id = Column(Integer, ForeignKey('contest_types.id'), nullable=True) contest_effect_id = Column(Integer, ForeignKey('contest_effects.id'), nullable=True) super_contest_effect_id = Column(Integer, ForeignKey('super_contest_effects.id'), nullable=False) +class Nature(TableBase): + __tablename__ = 'natures' + __singlename__ = 'nature' + id = Column(Integer, primary_key=True, nullable=False) + name = Column(Unicode(8), nullable=False) + decreased_stat_id = Column(Integer, ForeignKey('stats.id'), nullable=False) + increased_stat_id = Column(Integer, ForeignKey('stats.id'), nullable=False) + hates_flavor_id = Column(Integer, ForeignKey('contest_types.id'), nullable=False) + likes_flavor_id = Column(Integer, ForeignKey('contest_types.id'), nullable=False) + +class NatureBattleStylePreference(TableBase): + __tablename__ = 'nature_battle_style_preferences' + nature_id = Column(Integer, ForeignKey('natures.id'), primary_key=True, nullable=False) + move_battle_style_id = Column(Integer, ForeignKey('move_battle_styles.id'), primary_key=True, nullable=False) + low_hp_preference = Column(Integer, nullable=False) + high_hp_preference = Column(Integer, nullable=False) + +class NaturePokeathlonStat(TableBase): + __tablename__ = 'nature_pokeathlon_stats' + nature_id = Column(Integer, ForeignKey('natures.id'), primary_key=True, nullable=False) + pokeathlon_stat_id = Column(Integer, ForeignKey('pokeathlon_stats.id'), primary_key=True, nullable=False) + max_change = Column(Integer, nullable=False) + +class PokeathlonStat(TableBase): + __tablename__ = 'pokeathlon_stats' + id = Column(Integer, primary_key=True, nullable=False) + name = Column(Unicode(8), nullable=False) + +class Pokedex(TableBase): + __tablename__ = 'pokedexes' + id = Column(Integer, primary_key=True, nullable=False) + region_id = Column(Integer, ForeignKey('regions.id'), nullable=True) + name = Column(Unicode(16), nullable=False) + description = Column(Unicode(512)) + +class PokedexVersionGroup(TableBase): + __tablename__ = 'pokedex_version_groups' + pokedex_id = Column(Integer, ForeignKey('pokedexes.id'), primary_key=True, nullable=False, autoincrement=False) + version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False) + class Pokemon(TableBase): """The core to this whole mess. @@ -287,14 +428,13 @@ class Pokemon(TableBase): height = Column(Integer, nullable=False) weight = Column(Integer, nullable=False) species = Column(Unicode(16), nullable=False) - color = Column(Unicode(6), nullable=False) + color_id = Column(Integer, ForeignKey('pokemon_colors.id'), nullable=False) pokemon_shape_id = Column(Integer, ForeignKey('pokemon_shapes.id'), nullable=False) - habitat = Column(Unicode(16), nullable=False) + habitat_id = Column(Integer, ForeignKey('pokemon_habitats.id'), nullable=True) gender_rate = Column(Integer, nullable=False) capture_rate = Column(Integer, nullable=False) base_experience = Column(Integer, nullable=False) base_happiness = Column(Integer, nullable=False) - gen1_internal_id = Column(Integer) is_baby = Column(Boolean, nullable=False) has_gen4_fem_sprite = Column(Boolean, nullable=False) has_gen4_fem_back_sprite = Column(Boolean, nullable=False) @@ -316,7 +456,7 @@ class Pokemon(TableBase): """Returns the name of this Pokémon, including its Forme, if any.""" if self.forme_name: - return "%s %s" % (self.forme_name.capitalize(), self.name) + return "%s %s" % (self.forme_name.title(), self.name) return self.name @property @@ -330,16 +470,37 @@ class Pokemon(TableBase): return self + ### Not forms! + + def stat(self, stat_name): + """Returns a PokemonStat record for the given stat name (or Stat row + object). Uses the normal has-many machinery, so all the stats are + effectively cached. + """ + if isinstance(stat_name, Stat): + stat_name = stat_name.name + + for pokemon_stat in self.stats: + if pokemon_stat.stat.name == stat_name: + return pokemon_stat + + return None + class PokemonAbility(TableBase): __tablename__ = 'pokemon_abilities' pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False) ability_id = Column(Integer, ForeignKey('abilities.id'), nullable=False) slot = Column(Integer, primary_key=True, nullable=False, autoincrement=False) +class PokemonColor(TableBase): + __tablename__ = 'pokemon_colors' + id = Column(Integer, primary_key=True, nullable=False, autoincrement=False) + name = Column(Unicode(6), nullable=False) + class PokemonDexNumber(TableBase): __tablename__ = 'pokemon_dex_numbers' 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_id = Column(Integer, ForeignKey('pokedexes.id'), primary_key=True, nullable=False, autoincrement=False) pokedex_number = Column(Integer, nullable=False) class PokemonEggGroup(TableBase): @@ -356,6 +517,7 @@ class PokemonFlavorText(TableBase): class PokemonFormGroup(TableBase): __tablename__ = 'pokemon_form_groups' pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False) + is_battle_only = Column(Boolean, nullable=False) description = Column(Unicode(512), nullable=False) class PokemonFormSprite(TableBase): @@ -364,6 +526,12 @@ class PokemonFormSprite(TableBase): pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False) introduced_in_version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False) name = Column(Unicode(16), nullable=True) + is_default = Column(Boolean, nullable=True) + +class PokemonHabitat(TableBase): + __tablename__ = 'pokemon_habitats' + id = Column(Integer, primary_key=True, nullable=False, autoincrement=False) + name = Column(Unicode(16), nullable=False) class PokemonItem(TableBase): __tablename__ = 'pokemon_items' @@ -412,6 +580,12 @@ class PokemonType(TableBase): type_id = Column(Integer, ForeignKey('types.id'), nullable=False) slot = Column(Integer, primary_key=True, nullable=False, autoincrement=False) +class Region(TableBase): + """Major areas of the world: Kanto, Johto, etc.""" + __tablename__ = 'regions' + id = Column(Integer, primary_key=True, nullable=False) + name = Column(Unicode(16), nullable=False) + class Stat(TableBase): __tablename__ = 'stats' id = Column(Integer, primary_key=True, nullable=False) @@ -448,6 +622,11 @@ class VersionGroup(TableBase): id = Column(Integer, primary_key=True, nullable=False) generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False) +class VersionGroupRegion(TableBase): + __tablename__ = 'version_group_regions' + version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False) + region_id = Column(Integer, ForeignKey('regions.id'), primary_key=True, nullable=False) + class Version(TableBase): __tablename__ = 'versions' id = Column(Integer, primary_key=True, nullable=False) @@ -456,6 +635,18 @@ class Version(TableBase): ### Relations down here, to avoid ordering problems +Ability.flavor_text = relation(AbilityFlavorText, order_by=AbilityFlavorText.version_group_id, backref='abilities') +Ability.generation = relation(Generation, backref='abilities') + +AbilityFlavorText.version_group = relation(VersionGroup) + +Berry.berry_firmness = relation(BerryFirmness, backref='berries') +Berry.firmness = association_proxy('berry_firmness', 'name') +Berry.flavors = relation(BerryFlavor, order_by=BerryFlavor.contest_type_id, backref='berry') +Berry.natural_gift_type = relation(Type) + +BerryFlavor.contest_type = relation(ContestType) + ContestCombo.first = relation(Move, primaryjoin=ContestCombo.first_move_id==Move.id, backref='contest_combo_first') ContestCombo.second = relation(Move, primaryjoin=ContestCombo.second_move_id==Move.id, @@ -482,7 +673,30 @@ EncounterSlotCondition.condition = relation(EncounterCondition, EvolutionChain.growth_rate = relation(GrowthRate, backref='evolution_chains') +Experience.growth_rate = relation(GrowthRate, backref='experience_table') + +Generation.canonical_pokedex = relation(Pokedex, backref='canonical_for_generation') Generation.versions = relation(Version, secondary=VersionGroup.__table__) +Generation.main_region = relation(Region) + +GrowthRate.max_experience_obj = relation(Experience, primaryjoin=and_(Experience.growth_rate_id == GrowthRate.id, Experience.level == 100), uselist=False) +GrowthRate.max_experience = association_proxy('max_experience_obj', 'experience') + +Item.berry = relation(Berry, uselist=False, backref='item') +Item.flags = relation(ItemFlag, secondary=ItemFlagMap.__table__) +Item.flavor_text = relation(ItemFlavorText, order_by=ItemFlavorText.version_group_id.asc(), backref='item') +Item.fling_effect = relation(ItemFlingEffect, backref='items') +Item.category = relation(ItemCategory) +Item.pocket = association_proxy('category', 'pocket') + +ItemCategory.items = relation(Item, order_by=Item.name) +ItemCategory.pocket = relation(ItemPocket) + +ItemFlavorText.version_group = relation(VersionGroup) + +ItemPocket.categories = relation(ItemCategory, order_by=ItemCategory.name) + +Location.region = relation(Region, backref='locations') LocationArea.location = relation(Location, backref='areas') @@ -491,6 +705,7 @@ Machine.version_group = relation(VersionGroup) Move.contest_effect = relation(ContestEffect, backref='moves') Move.contest_combo_next = association_proxy('contest_combo_first', 'second') Move.contest_combo_prev = association_proxy('contest_combo_second', 'first') +Move.contest_type = relation(ContestType, backref='moves') Move.damage_class = relation(MoveDamageClass, backref='moves') Move.flags = association_proxy('move_flags', 'flag') Move.flavor_text = relation(MoveFlavorText, order_by=MoveFlavorText.generation_id, backref='move') @@ -519,13 +734,41 @@ MoveFlavorText.generation = relation(Generation) MoveName.language = relation(Language) +Nature.decreased_stat = relation(Stat, primaryjoin=Nature.decreased_stat_id==Stat.id, + backref='decreasing_natures') +Nature.increased_stat = relation(Stat, primaryjoin=Nature.increased_stat_id==Stat.id, + backref='increasing_natures') +Nature.hates_flavor = relation(ContestType, primaryjoin=Nature.hates_flavor_id==ContestType.id, + backref='hating_natures') +Nature.likes_flavor = relation(ContestType, primaryjoin=Nature.likes_flavor_id==ContestType.id, + backref='liking_natures') +Nature.battle_style_preferences = relation(NatureBattleStylePreference, + order_by=NatureBattleStylePreference.move_battle_style_id, + backref='nature') +Nature.pokeathlon_effects = relation(NaturePokeathlonStat, order_by=NaturePokeathlonStat.pokeathlon_stat_id) + +NatureBattleStylePreference.battle_style = relation(MoveBattleStyle, backref='nature_preferences') + +NaturePokeathlonStat.pokeathlon_stat = relation(PokeathlonStat, backref='nature_effects') + +Pokedex.region = relation(Region, backref='pokedexes') +Pokedex.version_groups = relation(VersionGroup, secondary=PokedexVersionGroup.__table__, backref='pokedexes') + Pokemon.abilities = relation(Ability, secondary=PokemonAbility.__table__, order_by=PokemonAbility.slot, backref='pokemon') Pokemon.formes = relation(Pokemon, primaryjoin=Pokemon.id==Pokemon.forme_base_pokemon_id, backref=backref('forme_base_pokemon', remote_side=[Pokemon.id])) +Pokemon.pokemon_color = relation(PokemonColor, backref='pokemon') +Pokemon.color = association_proxy('pokemon_color', 'name') Pokemon.dex_numbers = relation(PokemonDexNumber, backref='pokemon') +Pokemon.default_form_sprite = relation(PokemonFormSprite, + primaryjoin=and_( + Pokemon.id==PokemonFormSprite.pokemon_id, + PokemonFormSprite.is_default==True, + ), + uselist=False) Pokemon.egg_groups = relation(EggGroup, secondary=PokemonEggGroup.__table__, order_by=PokemonEggGroup.egg_group_id, backref='pokemon') @@ -534,15 +777,17 @@ Pokemon.evolution_method = relation(EvolutionMethod) Pokemon.evolution_children = relation(Pokemon, primaryjoin=Pokemon.id==Pokemon.evolution_parent_pokemon_id, backref=backref('evolution_parent', remote_side=[Pokemon.id])) -Pokemon.flavor_text = relation(PokemonFlavorText, order_by=PokemonFlavorText.pokemon_id, backref='pokemon') +Pokemon.flavor_text = relation(PokemonFlavorText, order_by=PokemonFlavorText.version_id.asc(), backref='pokemon') Pokemon.foreign_names = relation(PokemonName, backref='pokemon') -Pokemon.items = relation(PokemonItem) +Pokemon.pokemon_habitat = relation(PokemonHabitat, backref='pokemon') +Pokemon.habitat = association_proxy('pokemon_habitat', 'name') +Pokemon.items = relation(PokemonItem, 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) +PokemonDexNumber.pokedex = relation(Pokedex) PokemonFlavorText.version = relation(Version) @@ -568,6 +813,12 @@ PokemonName.language = relation(Language) PokemonStat.stat = relation(Stat) +# This is technically a has-many; Generation.main_region_id -> Region.id +Region.generation = relation(Generation, uselist=False) +Region.version_group_regions = relation(VersionGroupRegion, backref='region', + order_by='VersionGroupRegion.version_group_id') +Region.version_groups = association_proxy('version_group_regions', 'version_group') + SuperContestCombo.first = relation(Move, primaryjoin=SuperContestCombo.first_move_id==Move.id, backref='super_contest_combo_first') SuperContestCombo.second = relation(Move, primaryjoin=SuperContestCombo.second_move_id==Move.id, @@ -589,3 +840,5 @@ Version.version_group = relation(VersionGroup, backref='versions') Version.generation = association_proxy('version_group', 'generation') VersionGroup.generation = relation(Generation, backref='version_groups') +VersionGroup.version_group_regions = relation(VersionGroupRegion, backref='version_group') +VersionGroup.regions = association_proxy('version_group_regions', 'region')