X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/39855b0c9c17580de488142e2bcddcf88e884911..d5cf1a25f761c252b7c3f5ab08cfe4617cbf85ee:/pokedex/db/tables.py diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py index ae3cb99..d56bf65 100644 --- a/pokedex/db/tables.py +++ b/pokedex/db/tables.py @@ -30,22 +30,14 @@ import collections from functools import partial from sqlalchemy import Column, ForeignKey, MetaData, PrimaryKeyConstraint, Table, UniqueConstraint -from sqlalchemy.ext.declarative import ( - declarative_base, declared_attr, DeclarativeMeta, - ) +from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.ext.associationproxy import association_proxy -from sqlalchemy.orm import ( - backref, compile_mappers, eagerload_all, relation, class_mapper, synonym, mapper, - ) -from sqlalchemy.orm.session import Session, object_session +from sqlalchemy.orm import backref, relation +from sqlalchemy.orm.session import Session from sqlalchemy.orm.interfaces import AttributeExtension -from sqlalchemy.orm.collections import attribute_mapped_collection, MappedCollection, collection, collection_adapter -from sqlalchemy.ext.associationproxy import _AssociationDict, association_proxy from sqlalchemy.sql import and_ -from sqlalchemy.sql.expression import ColumnOperators, bindparam from sqlalchemy.schema import ColumnDefault from sqlalchemy.types import * -from inspect import isclass from pokedex.db import markdown, multilang @@ -99,7 +91,7 @@ class Language(TableBase): create_translation_table = partial(multilang.create_translation_table, language_class=Language) -create_translation_table('language_texts', Language, 'names', +create_translation_table('language_names', Language, 'names', name = Column(Unicode(16), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=True)), ) @@ -118,7 +110,7 @@ class Ability(TableBase): generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False, info=dict(description="The ID of the generation this ability was introduced in", detail=True)) -create_translation_table('ability_texts', Ability, 'names', +create_translation_table('ability_names', Ability, 'names', name = Column(Unicode(24), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=True)), ) @@ -195,7 +187,7 @@ class BerryFirmness(TableBase): identifier = Column(Unicode(10), nullable=False, info=dict(description="An identifier", format='identifier')) -create_translation_table('berry_firmness_texts', BerryFirmness, 'names', +create_translation_table('berry_firmness_names', BerryFirmness, 'names', name = Column(Unicode(10), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=True)), ) @@ -233,10 +225,10 @@ class ContestEffect(TableBase): info=dict(description="The base number of hearts the user's opponent loses")) create_translation_table('contest_effect_prose', ContestEffect, 'prose', - effect = Column(Unicode(255), nullable=False, - info=dict(description="A detailed description of the effect", format='plaintext')), flavor_text = Column(Unicode(64), nullable=False, info=dict(description="The in-game description of this effect", official=True, format='gametext')), + effect = Column(Unicode(255), nullable=False, + info=dict(description="A detailed description of the effect", format='plaintext')), ) class ContestType(TableBase): @@ -249,13 +241,13 @@ class ContestType(TableBase): identifier = Column(Unicode(6), nullable=False, info=dict(description="An identifier", format='identifier')) -create_translation_table('contest_type_texts', ContestType, 'names', +create_translation_table('contest_type_names', ContestType, 'names', + name = Column(Unicode(6), nullable=False, index=True, + info=dict(description="The name", format='plaintext', official=True)), flavor = Column(Unicode(6), nullable=False, info=dict(description="The name of the corresponding Berry flavor", official=True, format='plaintext')), color = Column(Unicode(6), nullable=False, info=dict(description=u"The name of the corresponding Pokéblock color", official=True, format='plaintext')), - name = Column(Unicode(6), nullable=False, index=True, - info=dict(description="The name", format='plaintext', official=True)), ) class EggGroup(TableBase): @@ -446,7 +438,7 @@ class Generation(TableBase): identifier = Column(Unicode(16), nullable=False, info=dict(description=u'An identifier', format='identifier')) -create_translation_table('generation_texts', Generation, 'names', +create_translation_table('generation_names', Generation, 'names', name = Column(Unicode(16), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=True)), ) @@ -492,7 +484,7 @@ class Item(TableBase): """ return any(flag.identifier == u'underground' for flag in self.flags) -create_translation_table('item_texts', Item, 'names', +create_translation_table('item_names', Item, 'names', name = Column(Unicode(20), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=True)), ) @@ -574,15 +566,15 @@ create_translation_table('item_fling_effect_prose', ItemFlingEffect, 'prose', info=dict(description="Description of the effect", format='plaintext')), ) -class ItemInternalID(TableBase): +class ItemGameIndex(TableBase): u"""The internal ID number a game uses for an item """ - __tablename__ = 'item_internal_ids' + __tablename__ = 'item_game_indices' item_id = Column(Integer, ForeignKey('items.id'), primary_key=True, autoincrement=False, nullable=False, info=dict(description="The database ID of the item")) generation_id = Column(Integer, ForeignKey('generations.id'), primary_key=True, autoincrement=False, nullable=False, info=dict(description="ID of the generation of games")) - internal_id = Column(Integer, nullable=False, + game_index = Column(Integer, nullable=False, info=dict(description="Internal ID of the item in the generation")) class ItemPocket(TableBase): @@ -595,7 +587,7 @@ class ItemPocket(TableBase): identifier = Column(Unicode(16), nullable=False, info=dict(description="An identifier of this pocket", format='identifier')) -create_translation_table('item_pocket_texts', ItemPocket, 'names', +create_translation_table('item_pocket_names', ItemPocket, 'names', name = Column(Unicode(16), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=True)), ) @@ -612,7 +604,7 @@ class Location(TableBase): identifier = Column(Unicode(64), nullable=False, info=dict(description="An identifier", format='identifier')) -create_translation_table('location_texts', Location, 'names', +create_translation_table('location_names', Location, 'names', name = Column(Unicode(64), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=True)), ) @@ -626,7 +618,7 @@ class LocationArea(TableBase): info=dict(description="A numeric ID")) location_id = Column(Integer, ForeignKey('locations.id'), nullable=False, info=dict(description="ID of the location this area is part of")) - internal_id = Column(Integer, nullable=False, + game_index = Column(Integer, nullable=False, info=dict(description="ID the games ude for this area")) identifier = Column(Unicode(64), nullable=True, info=dict(description="An identifier", format='identifier')) @@ -648,15 +640,15 @@ class LocationAreaEncounterRate(TableBase): rate = Column(Integer, nullable=True, info=dict(description="The encounter rate")) # units? -class LocationInternalID(TableBase): +class LocationGameIndex(TableBase): u"""IDs the games use internally for locations """ - __tablename__ = 'location_internal_ids' + __tablename__ = 'location_game_indices' location_id = Column(Integer, ForeignKey('locations.id'), nullable=False, primary_key=True, info=dict(description="Database ID of the locaion")) generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False, primary_key=True, info=dict(description="ID of the generation this entry to")) - internal_id = Column(Integer, nullable=False, + game_index = Column(Integer, nullable=False, info=dict(description="Internal game ID of the location")) class Machine(TableBase): @@ -855,7 +847,7 @@ class MoveMetaAilment(TableBase): identifier = Column(Unicode(24), nullable=False, info=dict(description="An identifier", format='identifier')) -create_translation_table('move_meta_ailment_texts', MoveMetaAilment, 'names', +create_translation_table('move_meta_ailment_names', MoveMetaAilment, 'names', name = Column(Unicode(24), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=True)), ) @@ -935,7 +927,7 @@ class Move(TableBase): super_contest_effect_id = Column(Integer, ForeignKey('super_contest_effects.id'), nullable=True, info=dict(description="ID of the move's Super Contest effect")) -create_translation_table('move_texts', Move, 'names', +create_translation_table('move_names', Move, 'names', name = Column(Unicode(24), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=True)) ) @@ -987,7 +979,7 @@ class Nature(TableBase): """ return self.increased_stat_id == self.decreased_stat_id -create_translation_table('nature_texts', Nature, 'names', +create_translation_table('nature_names', Nature, 'names', name = Column(Unicode(8), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=True)), ) @@ -1029,7 +1021,7 @@ class PokeathlonStat(TableBase): identifier = Column(Unicode(8), nullable=False, info=dict(description="An identifier", format='identifier')) -create_translation_table('pokeathlon_stat_texts', PokeathlonStat, 'names', +create_translation_table('pokeathlon_stat_names', PokeathlonStat, 'names', name = Column(Unicode(8), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=True)), ) @@ -1175,7 +1167,7 @@ class Pokemon(TableBase): else: return None -create_translation_table('pokemon_texts', Pokemon, 'names', +create_translation_table('pokemon_names', Pokemon, 'names', name = Column(Unicode(20), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=True)), species = Column(Unicode(16), nullable=False, @@ -1209,7 +1201,7 @@ class PokemonColor(TableBase): identifier = Column(Unicode(6), nullable=False, info=dict(description=u"An identifier", format='identifier')) -create_translation_table('pokemon_color_texts', PokemonColor, 'names', +create_translation_table('pokemon_color_names', PokemonColor, 'names', name = Column(Unicode(6), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=True)), ) @@ -1337,7 +1329,7 @@ class PokemonForm(TableBase): else: return self.form_base_pokemon.name -create_translation_table('pokemon_form_texts', PokemonForm, 'names', +create_translation_table('pokemon_form_names', PokemonForm, 'names', name = Column(Unicode(16), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=True)), ) @@ -1384,20 +1376,20 @@ class PokemonHabitat(TableBase): identifier = Column(Unicode(16), nullable=False, info=dict(description=u"An identifier", format='identifier')) -create_translation_table('pokemon_habitat_texts', PokemonHabitat, 'names', +create_translation_table('pokemon_habitat_names', PokemonHabitat, 'names', name = Column(Unicode(16), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=True)), ) -class PokemonInternalID(TableBase): +class PokemonGameIndex(TableBase): u"""The number of a Pokémon a game uses internally """ - __tablename__ = 'pokemon_internal_ids' + __tablename__ = 'pokemon_game_indices' pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, autoincrement=False, nullable=False, info=dict(description=u"Database ID of the Pokémon")) generation_id = Column(Integer, ForeignKey('generations.id'), primary_key=True, autoincrement=False, nullable=False, info=dict(description=u"Database ID of the generation")) - internal_id = Column(Integer, nullable=False, + game_index = Column(Integer, nullable=False, info=dict(description=u"Internal ID the generation's games use for the Pokémon")) class PokemonItem(TableBase): @@ -1464,10 +1456,10 @@ class PokemonShape(TableBase): info=dict(description=u"An identifier", format='identifier')) create_translation_table('pokemon_shape_prose', PokemonShape, 'prose', - awesome_name = Column(Unicode(16), nullable=False, - info=dict(description=u"A splendiferous name of the body shape", format='plaintext')), name = Column(Unicode(24), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=False)), + awesome_name = Column(Unicode(16), nullable=False, + info=dict(description=u"A splendiferous name of the body shape", format='plaintext')), ) class PokemonStat(TableBase): @@ -1504,7 +1496,7 @@ class Region(TableBase): identifier = Column(Unicode(16), nullable=False, info=dict(description=u"An identifier", format='identifier')) -create_translation_table('region_texts', Region, 'names', +create_translation_table('region_names', Region, 'names', name = Column(Unicode(16), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=True)), ) @@ -1521,7 +1513,7 @@ class Stat(TableBase): identifier = Column(Unicode(16), nullable=False, info=dict(description=u"An identifier", format='identifier')) -create_translation_table('stat_texts', Stat, 'names', +create_translation_table('stat_names', Stat, 'names', name = Column(Unicode(16), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=True)), ) @@ -1539,7 +1531,7 @@ class StatHint(TableBase): gene_mod_5 = Column(Integer, nullable=False, index=True, info=dict(description=u"Value of the highest stat modulo 5")) -create_translation_table('stat_hint_texts', StatHint, 'names', +create_translation_table('stat_hint_names', StatHint, 'names', message = Column(Unicode(24), nullable=False, index=True, info=dict(description=u"The text displayed", official=True, format='plaintext')), ) @@ -1594,7 +1586,7 @@ class Type(TableBase): damage_class_id = Column(Integer, ForeignKey('move_damage_classes.id'), nullable=True, info=dict(description=u"The ID of the damage class this type's moves had before Generation IV, null if not applicable (e.g. ???).")) -create_translation_table('type_texts', Type, 'names', +create_translation_table('type_names', Type, 'names', name = Column(Unicode(12), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=True)), ) @@ -1630,7 +1622,7 @@ class Version(TableBase): identifier = Column(Unicode(32), nullable=False, info=dict(description=u'And identifier', format='identifier')) -create_translation_table('version_texts', Version, 'names', +create_translation_table('version_names', Version, 'names', name = Column(Unicode(32), nullable=False, index=True, info=dict(description="The name", format='plaintext', official=True)), ) @@ -1643,29 +1635,6 @@ Ability.changelog = relation(AbilityChangelog, ) Ability.flavor_text = relation(AbilityFlavorText, order_by=AbilityFlavorText.version_group_id, backref='ability') Ability.generation = relation(Generation, backref='abilities') -Ability.all_pokemon = relation(Pokemon, - secondary=PokemonAbility.__table__, - order_by=Pokemon.order, - #back_populates='all_abilities', -) -Ability.pokemon = relation(Pokemon, - secondary=PokemonAbility.__table__, - primaryjoin=and_( - PokemonAbility.ability_id == Ability.id, - PokemonAbility.is_dream == False - ), - order_by=Pokemon.order, - #back_populates='abilities', -) -Ability.dream_pokemon = relation(Pokemon, - secondary=PokemonAbility.__table__, - primaryjoin=and_( - PokemonAbility.ability_id == Ability.id, - PokemonAbility.is_dream == True - ), - order_by=Pokemon.order, - #back_populates='dream_ability', -) AbilityChangelog.changed_in = relation(VersionGroup, backref='ability_changelog') @@ -1701,7 +1670,6 @@ EncounterSlot.version_group = relation(VersionGroup) 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') Experience.growth_rate = relation(GrowthRate, backref='experience_table') @@ -1726,8 +1694,8 @@ ItemCategory.pocket = relation(ItemPocket) ItemFlavorText.version_group = relation(VersionGroup) ItemFlavorText.language = relation(Language) -ItemInternalID.item = relation(Item, backref='internal_ids') -ItemInternalID.generation = relation(Generation) +ItemGameIndex.item = relation(Item, backref='game_indices') +ItemGameIndex.generation = relation(Generation) ItemPocket.categories = relation(ItemCategory, order_by=ItemCategory.identifier) @@ -1735,8 +1703,8 @@ Location.region = relation(Region, backref='locations') LocationArea.location = relation(Location, backref='areas') -LocationInternalID.location = relation(Location, backref='internal_ids') -LocationInternalID.generation = relation(Generation) +LocationGameIndex.location = relation(Location, backref='game_indices') +LocationGameIndex.generation = relation(Generation) Machine.item = relation(Item) Machine.version_group = relation(VersionGroup) @@ -1762,12 +1730,22 @@ Move.super_contest_effect = relation(SuperContestEffect, backref='moves') Move.super_contest_combo_next = association_proxy('super_contest_combo_first', 'second') Move.super_contest_combo_prev = association_proxy('super_contest_combo_second', 'first') Move.target = relation(MoveTarget, backref='moves') -Move.type = relation(Type)#, back_populates='moves') +Move.type = relation(Type, backref='moves') + +Move.effect = markdown.MoveEffectProperty('effect') +Move.effect_map = markdown.MoveEffectProperty('effect_map') +Move.short_effect = markdown.MoveEffectProperty('short_effect') +Move.short_effect_map = markdown.MoveEffectProperty('short_effect_map') MoveChangelog.changed_in = relation(VersionGroup, backref='move_changelog') MoveChangelog.move_effect = relation(MoveEffect, backref='move_changelog') MoveChangelog.type = relation(Type, backref='move_changelog') +MoveChangelog.effect = markdown.MoveEffectProperty('effect') +MoveChangelog.effect_map = markdown.MoveEffectProperty('effect_map') +MoveChangelog.short_effect = markdown.MoveEffectProperty('short_effect') +MoveChangelog.short_effect_map = markdown.MoveEffectProperty('short_effect_map') + MoveEffect.category_map = relation(MoveEffectCategoryMap) MoveEffect.categories = association_proxy('category_map', 'category') MoveEffect.changelog = relation(MoveEffectChangelog, @@ -1806,11 +1784,14 @@ NatureBattleStylePreference.battle_style = relation(MoveBattleStyle, backref='na NaturePokeathlonStat.pokeathlon_stat = relation(PokeathlonStat, backref='nature_effects') Pokedex.region = relation(Region, backref='pokedexes') -Pokedex.version_groups = relation(VersionGroup, order_by=VersionGroup.id)#, back_populates='pokedex') +Pokedex.version_groups = relation(VersionGroup, order_by=VersionGroup.id, backref='pokedex') Pokemon.all_abilities = relation(Ability, secondary=PokemonAbility.__table__, order_by=PokemonAbility.slot, + backref=backref('all_pokemon', + order_by=Pokemon.order, + ), ) Pokemon.abilities = relation(Ability, secondary=PokemonAbility.__table__, @@ -1819,6 +1800,9 @@ Pokemon.abilities = relation(Ability, PokemonAbility.is_dream == False, ), order_by=PokemonAbility.slot, + backref=backref('pokemon', + order_by=Pokemon.order, + ), ) Pokemon.dream_ability = relation(Ability, secondary=PokemonAbility.__table__, @@ -1827,6 +1811,9 @@ Pokemon.dream_ability = relation(Ability, PokemonAbility.is_dream == True, ), uselist=False, + backref=backref('dream_pokemon', + order_by=Pokemon.order, + ), ) Pokemon.pokemon_color = relation(PokemonColor, backref='pokemon') Pokemon.color = association_proxy('pokemon_color', 'name') @@ -1834,7 +1821,7 @@ Pokemon.dex_numbers = relation(PokemonDexNumber, order_by=PokemonDexNumber.poked Pokemon.egg_groups = relation(EggGroup, secondary=PokemonEggGroup.__table__, order_by=PokemonEggGroup.egg_group_id, backref=backref('pokemon', order_by=Pokemon.order)) -Pokemon.evolution_chain = relation(EvolutionChain)#, back_populates='pokemon') +Pokemon.evolution_chain = relation(EvolutionChain, backref=backref('pokemon', order_by=Pokemon.order)) Pokemon.child_pokemon = relation(Pokemon, primaryjoin=Pokemon.id==PokemonEvolution.from_pokemon_id, secondary=PokemonEvolution.__table__, @@ -1854,9 +1841,11 @@ Pokemon.items = relation(PokemonItem, backref='pokemon') Pokemon.generation = relation(Generation, backref='pokemon') Pokemon.shape = relation(PokemonShape, backref='pokemon') Pokemon.stats = relation(PokemonStat, backref='pokemon', order_by=PokemonStat.stat_id.asc()) -Pokemon.types = relation(Type, secondary=PokemonType.__table__, - order_by=PokemonType.slot.asc(), - )#back_populates='pokemon') +Pokemon.types = relation(Type, + secondary=PokemonType.__table__, + order_by=PokemonType.slot.asc(), + backref=backref('pokemon', order_by=Pokemon.order), +) PokemonDexNumber.pokedex = relation(Pokedex) @@ -1953,26 +1942,10 @@ Type.target_efficacies = relation(TypeEfficacy, Type.generation = relation(Generation, backref='types') Type.damage_class = relation(MoveDamageClass, backref='types') -Type.pokemon = relation(Pokemon, secondary=PokemonType.__table__, - order_by=Pokemon.order, - )#back_populates='types') -Type.moves = relation(Move, back_populates='type', order_by=Move.id) -Version.version_group = relation(VersionGroup)#, back_populates='versions') Version.generation = association_proxy('version_group', 'generation') -VersionGroup.versions = relation(Version, order_by=Version.id, back_populates='version_group') +VersionGroup.versions = relation(Version, order_by=Version.id, backref='version_group') VersionGroup.generation = relation(Generation, backref='version_groups') VersionGroup.version_group_regions = relation(VersionGroupRegion, backref='version_group') VersionGroup.regions = association_proxy('version_group_regions', 'region') -VersionGroup.pokedex = relation(Pokedex, back_populates='version_groups') - -Move.effect = markdown.MoveEffectProperty('effect') -Move.effect_map = markdown.MoveEffectProperty('effect_map') -Move.short_effect = markdown.MoveEffectProperty('short_effect') -Move.short_effect_map = markdown.MoveEffectProperty('short_effect_map') - -MoveChangelog.effect = markdown.MoveEffectProperty('effect') -MoveChangelog.effect_map = markdown.MoveEffectProperty('effect_map') -MoveChangelog.short_effect = markdown.MoveEffectProperty('short_effect') -MoveChangelog.short_effect_map = markdown.MoveEffectProperty('short_effect_map')