X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/dcf2481cea826b6a1d0ae19d8db295b22d024bc0..81970e6c67c9bd670835f76bb32a357916ab6c5b:/pokedex/db/tables.py?ds=sidebyside

diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index 3a82fa2..928c7ee 100644
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -32,7 +32,7 @@ from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm import backref, relation
 from sqlalchemy.orm.session import Session
 from sqlalchemy.orm.interfaces import AttributeExtension
-from sqlalchemy.sql import and_
+from sqlalchemy.sql import and_, or_
 from sqlalchemy.schema import ColumnDefault
 from sqlalchemy.types import *
 
@@ -126,7 +126,7 @@ create_translation_table('ability_names', Ability, 'names',
 create_translation_table('ability_prose', Ability, 'prose',
     effect = Column(markdown.MarkdownColumn(5120), nullable=True,
         info=dict(description="A detailed description of this ability's effect", format='markdown')),
-    short_effect = Column(markdown.MarkdownColumn(255), nullable=True,
+    short_effect = Column(markdown.MarkdownColumn(512), nullable=True,
         info=dict(description="A short summary of this ability's effect", format='markdown')),
 )
 
@@ -805,7 +805,7 @@ create_translation_table('move_effect_prose', MoveEffect, 'prose',
     short_effect = Column(Unicode(256), nullable=True,
         info=dict(description="A short summary of the effect", format='plaintext')),
     effect = Column(Unicode(5120), nullable=True,
-        info=dict(description="A detailed description of the effect", format='plaintext')),
+        info=dict(description="A detailed description of the effect", format='markdown')),
 )
 
 class MoveEffectChangelog(TableBase):
@@ -854,7 +854,7 @@ create_translation_table('move_flag_type_prose', MoveFlagType, 'prose',
     relation_lazy='joined',
     name = Column(Unicode(32), nullable=True, index=True,
         info=dict(description="The name", format='plaintext', official=False)),
-    description = Column(markdown.MarkdownColumn(128), nullable=True,
+    description = Column(markdown.MarkdownColumn(256), nullable=True,
         info=dict(description="A short description of the flag", format='markdown')),
 )
 
@@ -1320,13 +1320,6 @@ class PokemonForm(TableBase):
         info=dict(description=u'The order in which forms should be sorted.  Multiple forms may have equal order, in which case they should fall back on sorting by name.'))
 
     @property
-    def pokemon(self):
-        u"""Returns the Pokémon for this form, using the form base as fallback.
-        """
-
-        return self.unique_pokemon or self.form_base_pokemon
-
-    @property
     def full_name(self):
         u"""Returns the full name of this form, e.g. "Plant Cloak"."""
 
@@ -2060,6 +2053,12 @@ PokemonForm.form_base_pokemon = relation(Pokemon,
 PokemonForm.unique_pokemon = relation(Pokemon,
     primaryjoin=PokemonForm.unique_pokemon_id==Pokemon.id,
     backref=backref('unique_form', uselist=False))
+PokemonForm.pokemon = relation(Pokemon,
+    primaryjoin=or_(
+        PokemonForm.unique_pokemon_id==Pokemon.id,
+        and_(PokemonForm.unique_pokemon_id==None, 
+            PokemonForm.form_base_pokemon_id==Pokemon.id)
+        ), uselist=False)
 PokemonForm.version_group = relation(VersionGroup,
     innerjoin=True)
 PokemonForm.form_group = association_proxy('form_base_pokemon', 'form_group')