Speed up `import pokedex.db` slightly.

[zzz-pokedex.git] / pokedex / db / tables.py
diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py

index 20fcbea..d9905b6 100644 (file)
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -15,14 +15,11 @@ Columns have a info dictionary with these keys:
    - identifier: A fan-made identifier in the [-_a-z0-9]* format. Not intended
      for translation.
    - latex: A formula in LaTeX syntax.
    - identifier: A fan-made identifier in the [-_a-z0-9]* format. Not intended
      for translation.
    - latex: A formula in LaTeX syntax.
+- ripped: True for text that has been ripped from the games, and can be ripped
+  again for new versions or languages
  
  
-A localizable text column is visible as two properties:
-The plural-name property (e.g. Pokemon.names) is a language-to-name dictionary:
-  bulbasaur.names['en'] == "Bulbasaur" and bulbasaur.names['de'] == "Bisasam".
-  You can use Pokemon.names['en'] to filter a query.
-The singular-name property returns the name in the default language, English.
-  For example bulbasaur.name == "Bulbasaur"
-  Setting pokedex.db.tables.default_lang changes the default language.
+See `pokedex.db.multilang` for how localizable text columns work.  The session
+classes in that module can be used to change the default language.
  """
  # XXX: Check if "gametext" is set correctly everywhere
  
  """
  # XXX: Check if "gametext" is set correctly everywhere
  
@@ -30,33 +27,16 @@ import collections
  from functools import partial
  
  from sqlalchemy import Column, ForeignKey, MetaData, PrimaryKeyConstraint, Table, UniqueConstraint
  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, DeclarativeMeta
  from sqlalchemy.ext.associationproxy import association_proxy
  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.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 import and_
-from sqlalchemy.sql.expression import ColumnOperators, bindparam
  from sqlalchemy.schema import ColumnDefault
  from sqlalchemy.types import *
  from sqlalchemy.schema import ColumnDefault
  from sqlalchemy.types import *
-from inspect import isclass
-
-from pokedex.db import markdown
-
-# A list of all table classes will live in table_classes
-table_classes = []
  
  
-class TableMetaclass(DeclarativeMeta):
-    def __init__(cls, name, bases, attrs):
-        super(TableMetaclass, cls).__init__(name, bases, attrs)
-        if hasattr(cls, '__tablename__'):
-            table_classes.append(cls)
+from pokedex.db import markdown, multilang
  
  class TableSuperclass(object):
      """Superclass for declarative tables, to give them some generic niceties
  
  class TableSuperclass(object):
      """Superclass for declarative tables, to give them some generic niceties
@@ -82,36 +62,44 @@ class TableSuperclass(object):
      def __str__(self):
          return unicode(self).encode('utf8')
  
      def __str__(self):
          return unicode(self).encode('utf8')
  
+mapped_classes = []
+class TableMetaclass(DeclarativeMeta):
+    def __init__(cls, name, bases, attrs):
+        super(TableMetaclass, cls).__init__(name, bases, attrs)
+        if hasattr(cls, '__tablename__'):
+            mapped_classes.append(cls)
+            cls.translation_classes = []
+
  metadata = MetaData()
  TableBase = declarative_base(metadata=metadata, cls=TableSuperclass, metaclass=TableMetaclass)
  
  metadata = MetaData()
  TableBase = declarative_base(metadata=metadata, cls=TableSuperclass, metaclass=TableMetaclass)
  
-### Helper classes
-class LanguageSpecific(object):
-    """Mixin for prose and text tables"""
-    @declared_attr
-    def language_id(cls):
-        return Column(Integer, ForeignKey('languages.id'), primary_key=True, nullable=False,
-            info=dict(description="The language"))
-
-class LanguageSpecificColumn(object):
-    """A column that will not appear in the table it's defined in, but in a related one"""
-    _ordering = [1]
-    def __init__(self, *args, **kwargs):
-        self.args = args
-        self.plural = kwargs.pop('plural')
-        self.kwargs = kwargs
-        self.order = self._ordering[0]
-        self._ordering[0] += 1
  
  
-    def makeSAColumn(self):
-        return Column(*self.args, **self.kwargs)
+### Need Language first, to create the partial() below
  
  
-class ProseColumn(LanguageSpecificColumn):
-    """A column that will appear in the corresponding _prose table"""
+class Language(TableBase):
+    u"""A language the Pokémon games have been translated into
+    """
+    __tablename__ = 'languages'
+    __singlename__ = 'language'
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
+        info=dict(description="A numeric ID"))
+    iso639 = Column(Unicode(2), nullable=False,
+        info=dict(description="The two-letter code of the country where this language is spoken. Note that it is not unique.", format='identifier'))
+    iso3166 = Column(Unicode(2), nullable=False,
+        info=dict(description="The two-letter code of the language. Note that it is not unique.", format='identifier'))
+    identifier = Column(Unicode(16), nullable=False,
+        info=dict(description="An identifier", format='identifier'))
+    official = Column(Boolean, nullable=False, index=True,
+        info=dict(description=u"True iff games are produced in the language."))
+    order = Column(Integer, nullable=True,
+        info=dict(description=u"Order for sorting in foreign name lists."))
  
  
-class TextColumn(LanguageSpecificColumn):
-    """A column that will appear in the corresponding _text table"""
+create_translation_table = partial(multilang.create_translation_table, language_class=Language)
  
  
+create_translation_table('language_names', Language, 'names',
+    name = Column(Unicode(16), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=True)),
+)
  
  ### The actual tables
  
  
  ### The actual tables
  
@@ -120,33 +108,42 @@ class Ability(TableBase):
      """
      __tablename__ = 'abilities'
      __singlename__ = 'ability'
      """
      __tablename__ = 'abilities'
      __singlename__ = 'ability'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="This ability's unique ID; matches the games' internal ID"))
      identifier = Column(Unicode(24), nullable=False,
          info=dict(description="An identifier", format='identifier'))
      generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False,
          info=dict(description="The ID of the generation this ability was introduced in", detail=True))
          info=dict(description="This ability's unique ID; matches the games' internal ID"))
      identifier = Column(Unicode(24), nullable=False,
          info=dict(description="An identifier", format='identifier'))
      generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False,
          info=dict(description="The ID of the generation this ability was introduced in", detail=True))
-    effect = ProseColumn(markdown.MarkdownColumn(5120), plural='effects', nullable=False,
-        info=dict(description="A detailed description of this ability's effect", format='markdown'))
-    short_effect = ProseColumn(markdown.MarkdownColumn(255), plural='short_effects', nullable=False,
-        info=dict(description="A short summary of this ability's effect", format='markdown'))
-    name = TextColumn(Unicode(24), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
+
+create_translation_table('ability_names', Ability, 'names',
+    relation_lazy='joined',
+    name = Column(Unicode(24), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=True, ripped=True)),
+)
+create_translation_table('ability_prose', Ability, 'prose',
+    effect = Column(markdown.MarkdownColumn(5120), nullable=False,
+        info=dict(description="A detailed description of this ability's effect", format='markdown')),
+    short_effect = Column(markdown.MarkdownColumn(255), nullable=False,
+        info=dict(description="A short summary of this ability's effect", format='markdown')),
+)
  
  class AbilityChangelog(TableBase):
      """History of changes to abilities across main game versions."""
      __tablename__ = 'ability_changelog'
      __singlename__ = 'ability_changelog'
  
  class AbilityChangelog(TableBase):
      """History of changes to abilities across main game versions."""
      __tablename__ = 'ability_changelog'
      __singlename__ = 'ability_changelog'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="This change's unique ID"))
      ability_id = Column(Integer, ForeignKey('abilities.id'), nullable=False,
          info=dict(description="The ID of the ability that changed"))
      changed_in_version_group_id = Column(Integer, ForeignKey('version_groups.id'), nullable=False,
          info=dict(description="The ID of the version group in which the ability changed"))
          info=dict(description="This change's unique ID"))
      ability_id = Column(Integer, ForeignKey('abilities.id'), nullable=False,
          info=dict(description="The ID of the ability that changed"))
      changed_in_version_group_id = Column(Integer, ForeignKey('version_groups.id'), nullable=False,
          info=dict(description="The ID of the version group in which the ability changed"))
-    effect = ProseColumn(markdown.MarkdownColumn(255), plural='effects', nullable=False,
+
+create_translation_table('ability_changelog_prose', AbilityChangelog, 'prose',
+    effect = Column(markdown.MarkdownColumn(255), nullable=False,
          info=dict(description="A description of the old behavior", format='markdown'))
          info=dict(description="A description of the old behavior", format='markdown'))
+)
  
  
-class AbilityFlavorText(TableBase, LanguageSpecific):
+class AbilityFlavorText(TableBase):
      u"""In-game flavor text of an ability
      """
      __tablename__ = 'ability_flavor_text'
      u"""In-game flavor text of an ability
      """
      __tablename__ = 'ability_flavor_text'
@@ -154,6 +151,8 @@ class AbilityFlavorText(TableBase, LanguageSpecific):
          info=dict(description="The ID of the ability"))
      version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="The ID of the version group this flavor text is taken from"))
          info=dict(description="The ID of the ability"))
      version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="The ID of the version group this flavor text is taken from"))
+    language_id = Column(Integer, ForeignKey('languages.id'), primary_key=True, nullable=False, autoincrement=False,
+        info=dict(description="The language"))
      flavor_text = Column(Unicode(64), nullable=False,
          info=dict(description="The actual flavor text", official=True, format='gametext'))
  
      flavor_text = Column(Unicode(64), nullable=False,
          info=dict(description="The actual flavor text", official=True, format='gametext'))
  
@@ -163,7 +162,7 @@ class Berry(TableBase):
      For data common to all items, such as the name, see the corresponding item entry.
      """
      __tablename__ = 'berries'
      For data common to all items, such as the name, see the corresponding item entry.
      """
      __tablename__ = 'berries'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="This Berry's in-game number"))
      item_id = Column(Integer, ForeignKey('items.id'), nullable=False,
          info=dict(description="The ID of the item that represents this Berry"))
          info=dict(description="This Berry's in-game number"))
      item_id = Column(Integer, ForeignKey('items.id'), nullable=False,
          info=dict(description="The ID of the item that represents this Berry"))
@@ -189,12 +188,16 @@ class BerryFirmness(TableBase):
      """
      __tablename__ = 'berry_firmness'
      __singlename__ = 'berry_firmness'
      """
      __tablename__ = 'berry_firmness'
      __singlename__ = 'berry_firmness'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A unique ID for this firmness"))
      identifier = Column(Unicode(10), nullable=False,
          info=dict(description="An identifier", format='identifier'))
          info=dict(description="A unique ID for this firmness"))
      identifier = Column(Unicode(10), nullable=False,
          info=dict(description="An identifier", format='identifier'))
-    name = TextColumn(Unicode(10), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
+
+create_translation_table('berry_firmness_names', BerryFirmness, 'names',
+    relation_lazy='joined',
+    name = Column(Unicode(10), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=True)),
+)
  
  class BerryFlavor(TableBase):
      u"""A Berry flavor level.
  
  class BerryFlavor(TableBase):
      u"""A Berry flavor level.
@@ -221,32 +224,39 @@ class ContestEffect(TableBase):
      """
      __tablename__ = 'contest_effects'
      __singlename__ = 'contest_effect'
      """
      __tablename__ = 'contest_effects'
      __singlename__ = 'contest_effect'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A unique ID for this effect"))
      appeal = Column(SmallInteger, nullable=False,
          info=dict(description="The base number of hearts the user of this move gets"))
      jam = Column(SmallInteger, nullable=False,
          info=dict(description="The base number of hearts the user's opponent loses"))
          info=dict(description="A unique ID for this effect"))
      appeal = Column(SmallInteger, nullable=False,
          info=dict(description="The base number of hearts the user of this move gets"))
      jam = Column(SmallInteger, nullable=False,
          info=dict(description="The base number of hearts the user's opponent loses"))
-    flavor_text = ProseColumn(Unicode(64), plural='flavor_texts', nullable=False,
-        info=dict(description="The in-game description of this effect", official=True, format='gametext'))
-    effect = ProseColumn(Unicode(255), plural='effects', nullable=False,
-        info=dict(description="A detailed description of the effect", format='plaintext'))
+
+create_translation_table('contest_effect_prose', ContestEffect, 'prose',
+    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):
      u"""A Contest type, such as "cool" or "smart", and their associated Berry flavors and Pokéblock colors.
      """
      __tablename__ = 'contest_types'
      __singlename__ = 'contest_type'
  
  class ContestType(TableBase):
      u"""A Contest type, such as "cool" or "smart", and their associated Berry flavors and Pokéblock colors.
      """
      __tablename__ = 'contest_types'
      __singlename__ = 'contest_type'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A unique ID for this Contest type"))
      identifier = Column(Unicode(6), nullable=False,
          info=dict(description="An identifier", format='identifier'))
          info=dict(description="A unique ID for this Contest type"))
      identifier = Column(Unicode(6), nullable=False,
          info=dict(description="An identifier", format='identifier'))
-    flavor = TextColumn(Unicode(6), nullable=False, plural='flavors',
-        info=dict(description="The name of the corresponding Berry flavor", official=True, format='plaintext'))
-    color = TextColumn(Unicode(6), nullable=False, plural='colors',
-        info=dict(description=u"The name of the corresponding Pokéblock color", official=True, format='plaintext'))
-    name = TextColumn(Unicode(6), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
+
+create_translation_table('contest_type_names', ContestType, 'names',
+    relation_lazy='joined',
+    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')),
+)
  
  class EggGroup(TableBase):
      u"""An Egg group. Usually, two Pokémon can breed if they share an Egg Group.
  
  class EggGroup(TableBase):
      u"""An Egg group. Usually, two Pokémon can breed if they share an Egg Group.
@@ -255,12 +265,16 @@ class EggGroup(TableBase):
      """
      __tablename__ = 'egg_groups'
      __singlename__ = 'egg_group'
      """
      __tablename__ = 'egg_groups'
      __singlename__ = 'egg_group'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A unique ID for this group"))
      identifier = Column(Unicode(16), nullable=False,
          info=dict(description=u"An identifier.", format='identifier'))
          info=dict(description="A unique ID for this group"))
      identifier = Column(Unicode(16), nullable=False,
          info=dict(description=u"An identifier.", format='identifier'))
-    name = ProseColumn(Unicode(16), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=False))
+
+create_translation_table('egg_group_prose', EggGroup, 'names',
+    relation_lazy='joined',
+    name = Column(Unicode(16), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=True)),
+)
  
  class Encounter(TableBase):
      u"""Encounters with wild Pokémon.
  
  class Encounter(TableBase):
      u"""Encounters with wild Pokémon.
@@ -287,7 +301,7 @@ class Encounter(TableBase):
      """
  
      __tablename__ = 'encounters'
      """
  
      __tablename__ = 'encounters'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A unique ID for this encounter"))
      version_id = Column(Integer, ForeignKey('versions.id'), nullable=False, autoincrement=False,
          info=dict(description="The ID of the version this applies to"))
          info=dict(description="A unique ID for this encounter"))
      version_id = Column(Integer, ForeignKey('versions.id'), nullable=False, autoincrement=False,
          info=dict(description="The ID of the version this applies to"))
@@ -308,12 +322,15 @@ class EncounterCondition(TableBase):
  
      __tablename__ = 'encounter_conditions'
      __singlename__ = 'encounter_condition'
  
      __tablename__ = 'encounter_conditions'
      __singlename__ = 'encounter_condition'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A unique ID for this condition"))
      identifier = Column(Unicode(64), nullable=False,
          info=dict(description="An identifier", format='identifier'))
          info=dict(description="A unique ID for this condition"))
      identifier = Column(Unicode(64), nullable=False,
          info=dict(description="An identifier", format='identifier'))
-    name = ProseColumn(Unicode(64), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=False))
+
+create_translation_table('encounter_condition_prose', EncounterCondition, 'prose',
+    name = Column(Unicode(64), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=False)),
+)
  
  class EncounterConditionValue(TableBase):
      u"""A possible state for a condition; for example, the state of 'swarm' could be 'swarm' or 'no swarm'.
  
  class EncounterConditionValue(TableBase):
      u"""A possible state for a condition; for example, the state of 'swarm' could be 'swarm' or 'no swarm'.
@@ -321,7 +338,7 @@ class EncounterConditionValue(TableBase):
  
      __tablename__ = 'encounter_condition_values'
      __singlename__ = 'encounter_condition_value'
  
      __tablename__ = 'encounter_condition_values'
      __singlename__ = 'encounter_condition_value'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
      encounter_condition_id = Column(Integer, ForeignKey('encounter_conditions.id'), primary_key=False, nullable=False, autoincrement=False,
          info=dict(description="The ID of the encounter condition this is a value of"))
          info=dict(description="A numeric ID"))
      encounter_condition_id = Column(Integer, ForeignKey('encounter_conditions.id'), primary_key=False, nullable=False, autoincrement=False,
          info=dict(description="The ID of the encounter condition this is a value of"))
@@ -329,8 +346,11 @@ class EncounterConditionValue(TableBase):
          info=dict(description="An identifier", format='identifier'))
      is_default = Column(Boolean, nullable=False,
          info=dict(description='Set if this value is the default state for the condition'))
          info=dict(description="An identifier", format='identifier'))
      is_default = Column(Boolean, nullable=False,
          info=dict(description='Set if this value is the default state for the condition'))
-    name = ProseColumn(Unicode(64), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=False))
+
+create_translation_table('encounter_condition_value_prose', EncounterConditionValue, 'prose',
+    name = Column(Unicode(64), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=False)),
+)
  
  class EncounterConditionValueMap(TableBase):
      u"""Maps encounters to the specific conditions under which they occur.
  
  class EncounterConditionValueMap(TableBase):
      u"""Maps encounters to the specific conditions under which they occur.
@@ -341,19 +361,6 @@ class EncounterConditionValueMap(TableBase):
      encounter_condition_value_id = Column(Integer, ForeignKey('encounter_condition_values.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="The ID of the encounter condition value"))
  
      encounter_condition_value_id = Column(Integer, ForeignKey('encounter_condition_values.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="The ID of the encounter condition value"))
  
-class EncounterTerrain(TableBase):
-    u"""A way the player can enter a wild encounter, e.g., surfing, fishing, or walking through tall grass.
-    """
-
-    __tablename__ = 'encounter_terrain'
-    __singlename__ = __tablename__
-    id = Column(Integer, primary_key=True, nullable=False,
-        info=dict(description="A unique ID for the terrain"))
-    identifier = Column(Unicode(64), nullable=False,
-        info=dict(description="An identifier", format='identifier'))
-    name = ProseColumn(Unicode(64), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=False))
-
  class EncounterSlot(TableBase):
      u"""An abstract "slot" within a terrain, associated with both some set of conditions and a rarity.
  
  class EncounterSlot(TableBase):
      u"""An abstract "slot" within a terrain, associated with both some set of conditions and a rarity.
  
@@ -362,7 +369,7 @@ class EncounterSlot(TableBase):
      """
  
      __tablename__ = 'encounter_slots'
      """
  
      __tablename__ = 'encounter_slots'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A unique ID for this slot"))
      version_group_id = Column(Integer, ForeignKey('version_groups.id'), nullable=False, autoincrement=False,
          info=dict(description="The ID of the version group this slot is in"))
          info=dict(description="A unique ID for this slot"))
      version_group_id = Column(Integer, ForeignKey('version_groups.id'), nullable=False, autoincrement=False,
          info=dict(description="The ID of the version group this slot is in"))
@@ -373,11 +380,27 @@ class EncounterSlot(TableBase):
      rarity = Column(Integer, nullable=False,
          info=dict(description="The chance of the encounter as a percentage"))
  
      rarity = Column(Integer, nullable=False,
          info=dict(description="The chance of the encounter as a percentage"))
  
+class EncounterTerrain(TableBase):
+    u"""A way the player can enter a wild encounter, e.g., surfing, fishing, or walking through tall grass.
+    """
+
+    __tablename__ = 'encounter_terrain'
+    __singlename__ = __tablename__
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
+        info=dict(description="A unique ID for the terrain"))
+    identifier = Column(Unicode(64), nullable=False,
+        info=dict(description="An identifier", format='identifier'))
+
+create_translation_table('encounter_terrain_prose', EncounterTerrain, 'prose',
+    name = Column(Unicode(64), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=False)),
+)
+
  class EvolutionChain(TableBase):
      u"""A family of Pokémon that are linked by evolution
      """
      __tablename__ = 'evolution_chains'
  class EvolutionChain(TableBase):
      u"""A family of Pokémon that are linked by evolution
      """
      __tablename__ = 'evolution_chains'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
      growth_rate_id = Column(Integer, ForeignKey('growth_rates.id'), nullable=False,
          info=dict(description="ID of the growth rate for this family"))
          info=dict(description="A numeric ID"))
      growth_rate_id = Column(Integer, ForeignKey('growth_rates.id'), nullable=False,
          info=dict(description="ID of the growth rate for this family"))
@@ -389,18 +412,21 @@ class EvolutionTrigger(TableBase):
      """
      __tablename__ = 'evolution_triggers'
      __singlename__ = 'evolution_trigger'
      """
      __tablename__ = 'evolution_triggers'
      __singlename__ = 'evolution_trigger'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(16), nullable=False,
          info=dict(description="An identifier", format='identifier'))
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(16), nullable=False,
          info=dict(description="An identifier", format='identifier'))
-    name = ProseColumn(Unicode(16), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=False))
+
+create_translation_table('evolution_trigger_prose', EvolutionTrigger, 'prose',
+    name = Column(Unicode(16), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=False)),
+)
  
  class Experience(TableBase):
      u"""EXP needed for a certain level with a certain growth rate
      """
      __tablename__ = 'experience'
  
  class Experience(TableBase):
      u"""EXP needed for a certain level with a certain growth rate
      """
      __tablename__ = 'experience'
-    growth_rate_id = Column(Integer, ForeignKey('growth_rates.id'), primary_key=True, nullable=False,
+    growth_rate_id = Column(Integer, ForeignKey('growth_rates.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="ID of the growth rate"))
      level = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="The level"))
          info=dict(description="ID of the growth rate"))
      level = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="The level"))
@@ -412,37 +438,44 @@ class Generation(TableBase):
      """
      __tablename__ = 'generations'
      __singlename__ = 'generation'
      """
      __tablename__ = 'generations'
      __singlename__ = 'generation'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
          info=dict(description="A numeric ID"))
-    main_region_id = Column(Integer, ForeignKey('regions.id'),
+    main_region_id = Column(Integer, ForeignKey('regions.id'), nullable=False,
          info=dict(description="ID of the region this generation's main games take place in"))
          info=dict(description="ID of the region this generation's main games take place in"))
-    canonical_pokedex_id = Column(Integer, ForeignKey('pokedexes.id'),
+    canonical_pokedex_id = Column(Integer, ForeignKey('pokedexes.id'), nullable=False,
          info=dict(description=u"ID of the Pokédex this generation's main games use by default"))
      identifier = Column(Unicode(16), nullable=False,
          info=dict(description=u'An identifier', format='identifier'))
          info=dict(description=u"ID of the Pokédex this generation's main games use by default"))
      identifier = Column(Unicode(16), nullable=False,
          info=dict(description=u'An identifier', format='identifier'))
-    name = TextColumn(Unicode(16), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
+
+create_translation_table('generation_names', Generation, 'names',
+    relation_lazy='joined',
+    name = Column(Unicode(16), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=True)),
+)
  
  class GrowthRate(TableBase):
      u"""Growth rate of a Pokémon, i.e. the EXP → level function.
      """
      __tablename__ = 'growth_rates'
      __singlename__ = 'growth_rate'
  
  class GrowthRate(TableBase):
      u"""Growth rate of a Pokémon, i.e. the EXP → level function.
      """
      __tablename__ = 'growth_rates'
      __singlename__ = 'growth_rate'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(20), nullable=False,
          info=dict(description="An identifier", format='identifier'))
      formula = Column(Unicode(500), nullable=False,
          info=dict(description="The formula", format='latex'))
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(20), nullable=False,
          info=dict(description="An identifier", format='identifier'))
      formula = Column(Unicode(500), nullable=False,
          info=dict(description="The formula", format='latex'))
-    name = ProseColumn(Unicode(20), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=False))
+
+create_translation_table('growth_rate_prose', GrowthRate, 'prose',
+    name = Column(Unicode(20), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=False)),
+)
  
  class Item(TableBase):
      u"""An Item from the games, like "Poké Ball" or "Bicycle".
      """
      __tablename__ = 'items'
      __singlename__ = 'item'
  
  class Item(TableBase):
      u"""An Item from the games, like "Poké Ball" or "Bicycle".
      """
      __tablename__ = 'items'
      __singlename__ = 'item'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(20), nullable=False,
          info=dict(description="An identifier", format='identifier'))
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(20), nullable=False,
          info=dict(description="An identifier", format='identifier'))
@@ -454,12 +487,6 @@ class Item(TableBase):
          info=dict(description=u"Power of the move Fling when used with this item."))
      fling_effect_id = Column(Integer, ForeignKey('item_fling_effects.id'), nullable=True,
          info=dict(description=u"ID of the fling-effect of the move Fling when used with this item. Note that these are different from move effects."))
          info=dict(description=u"Power of the move Fling when used with this item."))
      fling_effect_id = Column(Integer, ForeignKey('item_fling_effects.id'), nullable=True,
          info=dict(description=u"ID of the fling-effect of the move Fling when used with this item. Note that these are different from move effects."))
-    short_effect = ProseColumn(Unicode(256), plural='short_effects', nullable=False,
-        info=dict(description="A short summary of the effect", format='plaintext'))
-    effect = ProseColumn(markdown.MarkdownColumn(5120), plural='effects', nullable=False,
-        info=dict(description=u"Detailed description of the item's effect.", format='markdown'))
-    name = TextColumn(Unicode(20), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
  
      @property
      def appears_underground(self):
  
      @property
      def appears_underground(self):
@@ -467,34 +494,57 @@ class Item(TableBase):
          """
          return any(flag.identifier == u'underground' for flag in self.flags)
  
          """
          return any(flag.identifier == u'underground' for flag in self.flags)
  
+create_translation_table('item_names', Item, 'names',
+    relation_lazy='joined',
+    name = Column(Unicode(20), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=True, ripped=True)),
+)
+create_translation_table('item_prose', Item, 'prose',
+    short_effect = Column(markdown.MarkdownColumn(256), nullable=False,
+        info=dict(description="A short summary of the effect", format='plaintext')),
+    effect = Column(markdown.MarkdownColumn(5120), nullable=False,
+        info=dict(description=u"Detailed description of the item's effect.", format='markdown')),
+)
+create_translation_table('item_flavor_summaries', Item, 'flavor_summaries',
+    flavor_summary = Column(Unicode(512), nullable=True,
+        info=dict(description=u"Text containing facts from all flavor texts, for languages without official game translations", official=False, format='plaintext', ripped=True)),
+)
+
  class ItemCategory(TableBase):
      u"""An item category
      """
      # XXX: This is fanon, right?
      __tablename__ = 'item_categories'
      __singlename__ = 'item_category'
  class ItemCategory(TableBase):
      u"""An item category
      """
      # XXX: This is fanon, right?
      __tablename__ = 'item_categories'
      __singlename__ = 'item_category'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
      pocket_id = Column(Integer, ForeignKey('item_pockets.id'), nullable=False,
          info=dict(description="ID of the pocket these items go to"))
      identifier = Column(Unicode(16), nullable=False,
          info=dict(description="An identifier", format='identifier'))
          info=dict(description="A numeric ID"))
      pocket_id = Column(Integer, ForeignKey('item_pockets.id'), nullable=False,
          info=dict(description="ID of the pocket these items go to"))
      identifier = Column(Unicode(16), nullable=False,
          info=dict(description="An identifier", format='identifier'))
-    name = ProseColumn(Unicode(16), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=False))
+
+create_translation_table('item_category_prose', ItemCategory, 'prose',
+    relation_lazy='joined',
+    name = Column(Unicode(16), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=False)),
+)
  
  class ItemFlag(TableBase):
      u"""An item attribute such as "consumable" or "holdable".
      """
      __tablename__ = 'item_flags'
      __singlename__ = 'item_flag'
  
  class ItemFlag(TableBase):
      u"""An item attribute such as "consumable" or "holdable".
      """
      __tablename__ = 'item_flags'
      __singlename__ = 'item_flag'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(24), nullable=False,
          info=dict(description="Identifier of the flag", format='identifier'))
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(24), nullable=False,
          info=dict(description="Identifier of the flag", format='identifier'))
-    description = ProseColumn(Unicode(64), plural='descriptions', nullable=False,
-        info=dict(description="Short description of the flag", format='plaintext'))
-    name = ProseColumn(Unicode(24), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=False))
+
+create_translation_table('item_flag_prose', ItemFlag, 'prose',
+    name = Column(Unicode(24), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=False)),
+    description = Column(Unicode(64), nullable=False,
+        info=dict(description="Short description of the flag", format='plaintext')),
+)
  
  class ItemFlagMap(TableBase):
      u"""Maps an item flag to its item.
  
  class ItemFlagMap(TableBase):
      u"""Maps an item flag to its item.
@@ -505,15 +555,18 @@ class ItemFlagMap(TableBase):
      item_flag_id = Column(Integer, ForeignKey('item_flags.id'), primary_key=True, autoincrement=False, nullable=False,
          info=dict(description="The ID of the item flag"))
  
      item_flag_id = Column(Integer, ForeignKey('item_flags.id'), primary_key=True, autoincrement=False, nullable=False,
          info=dict(description="The ID of the item flag"))
  
-class ItemFlavorText(TableBase, LanguageSpecific):
+class ItemFlavorText(TableBase):
      u"""An in-game description of an item
      """
      __tablename__ = 'item_flavor_text'
      __singlename__ = 'item_flavor_text'
      u"""An in-game description of an item
      """
      __tablename__ = 'item_flavor_text'
      __singlename__ = 'item_flavor_text'
+    summary_column = Item.flavor_summaries_table, 'flavor_summary'
      item_id = Column(Integer, ForeignKey('items.id'), primary_key=True, autoincrement=False, nullable=False,
          info=dict(description="The ID of the item"))
      version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, autoincrement=False, nullable=False,
          info=dict(description="ID of the version group that sports this text"))
      item_id = Column(Integer, ForeignKey('items.id'), primary_key=True, autoincrement=False, nullable=False,
          info=dict(description="The ID of the item"))
      version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, autoincrement=False, nullable=False,
          info=dict(description="ID of the version group that sports this text"))
+    language_id = Column(Integer, ForeignKey('languages.id'), primary_key=True, nullable=False, autoincrement=False,
+        info=dict(description="The language"))
      flavor_text = Column(Unicode(255), nullable=False,
          info=dict(description="The flavor text itself", official=True, format='gametext'))
  
      flavor_text = Column(Unicode(255), nullable=False,
          info=dict(description="The flavor text itself", official=True, format='gametext'))
  
@@ -522,20 +575,23 @@ class ItemFlingEffect(TableBase):
      """
      __tablename__ = 'item_fling_effects'
      __singlename__ = 'item_fling_effect'
      """
      __tablename__ = 'item_fling_effects'
      __singlename__ = 'item_fling_effect'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
          info=dict(description="A numeric ID"))
-    effect = ProseColumn(Unicode(255), plural='effects', nullable=False,
-        info=dict(description="Description of the effect", format='plaintext'))
  
  
-class ItemInternalID(TableBase):
+create_translation_table('item_fling_effect_prose', ItemFlingEffect, 'prose',
+    effect = Column(Unicode(255), nullable=False,
+        info=dict(description="Description of the effect", format='plaintext')),
+)
+
+class ItemGameIndex(TableBase):
      u"""The internal ID number a game uses for an item
      """
      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"))
      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):
          info=dict(description="Internal ID of the item in the generation"))
  
  class ItemPocket(TableBase):
@@ -543,62 +599,54 @@ class ItemPocket(TableBase):
      """
      __tablename__ = 'item_pockets'
      __singlename__ = 'item_pocket'
      """
      __tablename__ = 'item_pockets'
      __singlename__ = 'item_pocket'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(16), nullable=False,
          info=dict(description="An identifier of this pocket", format='identifier'))
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(16), nullable=False,
          info=dict(description="An identifier of this pocket", format='identifier'))
-    name = TextColumn(Unicode(16), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
  
  
-class Language(TableBase):
-    u"""A language the Pokémon games have been transleted into
-    """
-    __tablename__ = 'languages'
-    __singlename__ = 'language'
-    id = Column(Integer, primary_key=True, nullable=False,
-        info=dict(description="A numeric ID"))
-    iso639 = Column(Unicode(2), nullable=False,
-        info=dict(description="The two-letter code of the country where this language is spoken. Note that it is not unique.", format='identifier'))
-    iso3166 = Column(Unicode(2), nullable=False,
-        info=dict(description="The two-letter code of the language. Note that it is not unique.", format='identifier'))
-    identifier = Column(Unicode(16), nullable=False,
-        info=dict(description="An identifier", format='identifier'))
-    official = Column(Boolean, nullable=False, index=True,
-        info=dict(description=u"True iff games are produced in the language."))
-    order = Column(Integer, nullable=True,
-        info=dict(description=u"Order for sorting in foreign name lists."))
-    name = TextColumn(Unicode(16), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
+create_translation_table('item_pocket_names', ItemPocket, 'names',
+    relation_lazy='joined',
+    name = Column(Unicode(16), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=True)),
+)
  
  class Location(TableBase):
      u"""A place in the Pokémon world
      """
      __tablename__ = 'locations'
      __singlename__ = 'location'
  
  class Location(TableBase):
      u"""A place in the Pokémon world
      """
      __tablename__ = 'locations'
      __singlename__ = 'location'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
      region_id = Column(Integer, ForeignKey('regions.id'),
          info=dict(description="ID of the region this location is in"))
      identifier = Column(Unicode(64), nullable=False,
          info=dict(description="An identifier", format='identifier'))
          info=dict(description="A numeric ID"))
      region_id = Column(Integer, ForeignKey('regions.id'),
          info=dict(description="ID of the region this location is in"))
      identifier = Column(Unicode(64), nullable=False,
          info=dict(description="An identifier", format='identifier'))
-    name = TextColumn(Unicode(64), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
+
+create_translation_table('location_names', Location, 'names',
+    relation_lazy='joined',
+    name = Column(Unicode(64), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=True)),
+)
  
  class LocationArea(TableBase):
      u"""A sub-area of a location
      """
      __tablename__ = 'location_areas'
      __singlename__ = 'location_area'
  
  class LocationArea(TableBase):
      u"""A sub-area of a location
      """
      __tablename__ = 'location_areas'
      __singlename__ = 'location_area'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          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"))
          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'))
          info=dict(description="ID the games ude for this area"))
      identifier = Column(Unicode(64), nullable=True,
          info=dict(description="An identifier", format='identifier'))
-    name = ProseColumn(Unicode(64), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=False))
+
+create_translation_table('location_area_prose', LocationArea, 'prose',
+    relation_lazy='joined',
+    name = Column(Unicode(64), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=False)),
+)
  
  class LocationAreaEncounterRate(TableBase):
      # XXX: What's this exactly? Someone add the docstring & revise the descriptions
  
  class LocationAreaEncounterRate(TableBase):
      # XXX: What's this exactly? Someone add the docstring & revise the descriptions
@@ -612,15 +660,15 @@ class LocationAreaEncounterRate(TableBase):
      rate = Column(Integer, nullable=True,
          info=dict(description="The encounter rate"))  # units?
  
      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
      """
      u"""IDs the games use internally for locations
      """
-    __tablename__ = 'location_internal_ids'
-    location_id = Column(Integer, ForeignKey('locations.id'), nullable=False, primary_key=True,
+    __tablename__ = 'location_game_indices'
+    location_id = Column(Integer, ForeignKey('locations.id'), nullable=False, primary_key=True, autoincrement=False,
          info=dict(description="Database ID of the locaion"))
          info=dict(description="Database ID of the locaion"))
-    generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False, primary_key=True,
+    generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False, primary_key=True, autoincrement=False,
          info=dict(description="ID of the generation this entry to"))
          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):
          info=dict(description="Internal game ID of the location"))
  
  class Machine(TableBase):
@@ -642,86 +690,170 @@ class Machine(TableBase):
          """
          return self.machine_number >= 100
  
          """
          return self.machine_number >= 100
  
+class Move(TableBase):
+    u"""A Move: technique or attack a Pokémon can learn to use
+    """
+    __tablename__ = 'moves'
+    __singlename__ = 'move'
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
+        info=dict(description="A numeric ID"))
+    identifier = Column(Unicode(24), nullable=False,
+        info=dict(description="An identifier", format='identifier'))
+    generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False,
+        info=dict(description="ID of the generation this move first appeared in"))
+    type_id = Column(Integer, ForeignKey('types.id'), nullable=False,
+        info=dict(description="ID of the move's elemental type"))
+    power = Column(SmallInteger, nullable=False,
+        info=dict(description="Base power of the move"))
+    pp = Column(SmallInteger, nullable=True,
+        info=dict(description="Base PP (Power Points) of the move, nullable if not applicable (e.g. Struggle and Shadow moves)."))
+    accuracy = Column(SmallInteger, nullable=True,
+        info=dict(description="Accuracy of the move; NULL means it never misses"))
+    priority = Column(SmallInteger, nullable=False,
+        info=dict(description="The move's priority bracket"))
+    target_id = Column(Integer, ForeignKey('move_targets.id'), nullable=False,
+        info=dict(description="ID of the target (range) of the move"))
+    damage_class_id = Column(Integer, ForeignKey('move_damage_classes.id'), nullable=False,
+        info=dict(description="ID of the damage class (physical/special) of the move"))
+    effect_id = Column(Integer, ForeignKey('move_effects.id'), nullable=False,
+        info=dict(description="ID of the move's effect"))
+    effect_chance = Column(Integer, nullable=True,
+        info=dict(description="The chance for a secondary effect. What this is a chance of is specified by the move's effect."))
+    contest_type_id = Column(Integer, ForeignKey('contest_types.id'), nullable=True,
+        info=dict(description="ID of the move's Contest type (e.g. cool or smart)"))
+    contest_effect_id = Column(Integer, ForeignKey('contest_effects.id'), nullable=True,
+        info=dict(description="ID of the move's Contest effect"))
+    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_names', Move, 'names',
+    relation_lazy='joined',
+    name = Column(Unicode(24), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=True, ripped=True))
+)
+create_translation_table('move_flavor_summaries', Move, 'flavor_summaries',
+    flavor_summary = Column(Unicode(512), nullable=True,
+        info=dict(description=u"Text containing facts from all flavor texts, for languages without official game translations", official=False, format='plaintext', ripped=True)),
+)
+
  class MoveBattleStyle(TableBase):
      u"""A battle style of a move"""  # XXX: Explain better
      __tablename__ = 'move_battle_styles'
      __singlename__ = 'move_battle_style'
  class MoveBattleStyle(TableBase):
      u"""A battle style of a move"""  # XXX: Explain better
      __tablename__ = 'move_battle_styles'
      __singlename__ = 'move_battle_style'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(8), nullable=False,
          info=dict(description="An identifier", format='identifier'))
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(8), nullable=False,
          info=dict(description="An identifier", format='identifier'))
-    name = ProseColumn(Unicode(8), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=False))
+
+create_translation_table('move_battle_style_prose', MoveBattleStyle, 'prose',
+    relation_lazy='joined',
+    name = Column(Unicode(8), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=False)),
+)
+
+class MoveChangelog(TableBase):
+    """History of changes to moves across main game versions."""
+    __tablename__ = 'move_changelog'
+    __singlename__ = 'move_changelog'
+    move_id = Column(Integer, ForeignKey('moves.id'), primary_key=True, nullable=False, autoincrement=False,
+        info=dict(description="ID of the move that changed"))
+    changed_in_version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False,
+        info=dict(description="ID of the version group in which the move changed"))
+    type_id = Column(Integer, ForeignKey('types.id'), nullable=True,
+        info=dict(description="Prior type of the move, or NULL if unchanged"))
+    power = Column(SmallInteger, nullable=True,
+        info=dict(description="Prior base power of the move, or NULL if unchanged"))
+    pp = Column(SmallInteger, nullable=True,
+        info=dict(description="Prior base PP of the move, or NULL if unchanged"))
+    accuracy = Column(SmallInteger, nullable=True,
+        info=dict(description="Prior accuracy of the move, or NULL if unchanged"))
+    effect_id = Column(Integer, ForeignKey('move_effects.id'), nullable=True,
+        info=dict(description="Prior ID of the effect, or NULL if unchanged"))
+    effect_chance = Column(Integer, nullable=True,
+        info=dict(description="Prior effect chance, or NULL if unchanged"))
+
+class MoveDamageClass(TableBase):
+    u"""Any of the damage classes moves can have, i.e. physical, special, or non-damaging.
+    """
+    __tablename__ = 'move_damage_classes'
+    __singlename__ = 'move_damage_class'
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
+        info=dict(description="A numeric ID"))
+    identifier = Column(Unicode(16), nullable=False,
+        info=dict(description="An identifier", format='identifier'))
+
+create_translation_table('move_damage_class_prose', MoveDamageClass, 'prose',
+    relation_lazy='joined',
+    name = Column(Unicode(16), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=False)),
+    description = Column(Unicode(64), nullable=False,
+        info=dict(description="A description of the class", format='plaintext')),
+)
+
+class MoveEffect(TableBase):
+    u"""An effect of a move
+    """
+    __tablename__ = 'move_effects'
+    __singlename__ = 'move_effect'
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
+        info=dict(description="A numeric ID"))
+
+create_translation_table('move_effect_prose', MoveEffect, 'prose',
+    short_effect = Column(Unicode(256), nullable=False,
+        info=dict(description="A short summary of the effect", format='plaintext')),
+    effect = Column(Unicode(5120), nullable=False,
+        info=dict(description="A detailed description of the effect", format='plaintext')),
+)
  
  class MoveEffectCategory(TableBase):
      u"""Category of a move effect
      """
      __tablename__ = 'move_effect_categories'
      __singlename__ = 'move_effect_category'
  
  class MoveEffectCategory(TableBase):
      u"""Category of a move effect
      """
      __tablename__ = 'move_effect_categories'
      __singlename__ = 'move_effect_category'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(64), nullable=False,
          info=dict(description="An identifier", format='identifier'))
      can_affect_user = Column(Boolean, nullable=False,
          info=dict(description="Set if the user can be affected"))
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(64), nullable=False,
          info=dict(description="An identifier", format='identifier'))
      can_affect_user = Column(Boolean, nullable=False,
          info=dict(description="Set if the user can be affected"))
-    name = ProseColumn(Unicode(64), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=False))
+
+create_translation_table('move_effect_category_prose', MoveEffectCategory, 'prose',
+    name = Column(Unicode(64), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=False)),
+)
  
  class MoveEffectCategoryMap(TableBase):
      u"""Maps a move effect category to a move effect
      """
      __tablename__ = 'move_effect_category_map'
  
  class MoveEffectCategoryMap(TableBase):
      u"""Maps a move effect category to a move effect
      """
      __tablename__ = 'move_effect_category_map'
-    move_effect_id = Column(Integer, ForeignKey('move_effects.id'), primary_key=True, nullable=False,
+    move_effect_id = Column(Integer, ForeignKey('move_effects.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="ID of the move effect"))
          info=dict(description="ID of the move effect"))
-    move_effect_category_id = Column(Integer, ForeignKey('move_effect_categories.id'), primary_key=True, nullable=False,
+    move_effect_category_id = Column(Integer, ForeignKey('move_effect_categories.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="ID of the category"))
          info=dict(description="ID of the category"))
-    affects_user = Column(Boolean, primary_key=True, nullable=False,
+    affects_user = Column(Boolean, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="Set if the user is affected"))
  
          info=dict(description="Set if the user is affected"))
  
-class MoveDamageClass(TableBase):
-    u"""Any of the damage classes moves can have, i.e. physical, special, or non-damaging.
-    """
-    __tablename__ = 'move_damage_classes'
-    __singlename__ = 'move_damage_class'
-    id = Column(Integer, primary_key=True, nullable=False,
-        info=dict(description="A numeric ID"))
-    identifier = Column(Unicode(16), nullable=False,
-        info=dict(description="An identifier", format='identifier'))
-    description = ProseColumn(Unicode(64), plural='descriptions', nullable=False,
-        info=dict(description="A description of the class", format='plaintext'))
-    name = ProseColumn(Unicode(16), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=False))
-
-class MoveEffect(TableBase):
-    u"""An effect of a move
-    """
-    __tablename__ = 'move_effects'
-    __singlename__ = 'move_effect'
-    id = Column(Integer, primary_key=True, nullable=False,
-        info=dict(description="A numeric ID"))
-    short_effect = ProseColumn(Unicode(256), plural='short_effects', nullable=False,
-        info=dict(description="A short summary of the effect", format='plaintext'))
-    effect = ProseColumn(Unicode(5120), plural='effects', nullable=False,
-        info=dict(description="A detailed description of the effect", format='plaintext'))
-
  class MoveEffectChangelog(TableBase):
      """History of changes to move effects across main game versions."""
      __tablename__ = 'move_effect_changelog'
      __singlename__ = 'move_effect_changelog'
  class MoveEffectChangelog(TableBase):
      """History of changes to move effects across main game versions."""
      __tablename__ = 'move_effect_changelog'
      __singlename__ = 'move_effect_changelog'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
      effect_id = Column(Integer, ForeignKey('move_effects.id'), nullable=False,
          info=dict(description="The ID of the effect that changed"))
      changed_in_version_group_id = Column(Integer, ForeignKey('version_groups.id'), nullable=False,
          info=dict(description="The ID of the version group in which the effect changed"))
          info=dict(description="A numeric ID"))
      effect_id = Column(Integer, ForeignKey('move_effects.id'), nullable=False,
          info=dict(description="The ID of the effect that changed"))
      changed_in_version_group_id = Column(Integer, ForeignKey('version_groups.id'), nullable=False,
          info=dict(description="The ID of the version group in which the effect changed"))
-    effect = ProseColumn(markdown.MarkdownColumn(512), plural='effects', nullable=False,
-        info=dict(description="A description of the old behavior", format='markdown'))
  
      __table_args__ = (
          UniqueConstraint(effect_id, changed_in_version_group_id),
          {},
      )
  
  
      __table_args__ = (
          UniqueConstraint(effect_id, changed_in_version_group_id),
          {},
      )
  
+create_translation_table('move_effect_changelog_prose', MoveEffectChangelog, 'prose',
+    effect = Column(markdown.MarkdownColumn(512), nullable=False,
+        info=dict(description="A description of the old behavior", format='markdown')),
+)
+
  class MoveFlag(TableBase):
      u"""Maps a move flag to a move
      """
  class MoveFlag(TableBase):
      u"""Maps a move flag to a move
      """
@@ -738,23 +870,30 @@ class MoveFlagType(TableBase):
      """
      __tablename__ = 'move_flag_types'
      __singlename__ = 'move_flag_type'
      """
      __tablename__ = 'move_flag_types'
      __singlename__ = 'move_flag_type'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(32), nullable=False,
          info=dict(description="A short identifier for the flag", format='identifier'))
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(32), nullable=False,
          info=dict(description="A short identifier for the flag", format='identifier'))
-    description = ProseColumn(markdown.MarkdownColumn(128), plural='descriptions', nullable=False,
-        info=dict(description="A short description of the flag", format='markdown'))
-    name = ProseColumn(Unicode(32), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=False))
  
  
-class MoveFlavorText(TableBase, LanguageSpecific):
+create_translation_table('move_flag_type_prose', MoveFlagType, 'prose',
+    relation_lazy='joined',
+    name = Column(Unicode(32), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=False)),
+    description = Column(markdown.MarkdownColumn(128), nullable=False,
+        info=dict(description="A short description of the flag", format='markdown')),
+)
+
+class MoveFlavorText(TableBase):
      u"""In-game description of a move
      """
      __tablename__ = 'move_flavor_text'
      u"""In-game description of a move
      """
      __tablename__ = 'move_flavor_text'
+    summary_column = Move.flavor_summaries_table, 'flavor_summary'
      move_id = Column(Integer, ForeignKey('moves.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="ID of the move"))
      version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="ID of the version group this text appears in"))
      move_id = Column(Integer, ForeignKey('moves.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="ID of the move"))
      version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="ID of the version group this text appears in"))
+    language_id = Column(Integer, ForeignKey('languages.id'), primary_key=True, nullable=False, autoincrement=False,
+        info=dict(description="The language"))
      flavor_text = Column(Unicode(255), nullable=False,
          info=dict(description="The flavor text", official=True, format='gametext'))
  
      flavor_text = Column(Unicode(255), nullable=False,
          info=dict(description="The flavor text", official=True, format='gametext'))
  
@@ -794,21 +933,29 @@ class MoveMetaAilment(TableBase):
      """
      __tablename__ = 'move_meta_ailments'
      __singlename__ = 'move_meta_ailment'
      """
      __tablename__ = 'move_meta_ailments'
      __singlename__ = 'move_meta_ailment'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(24), nullable=False,
          info=dict(description="An identifier", format='identifier'))
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(24), nullable=False,
          info=dict(description="An identifier", format='identifier'))
-    name = TextColumn(Unicode(24), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
+
+create_translation_table('move_meta_ailment_names', MoveMetaAilment, 'names',
+    relation_lazy='joined',
+    name = Column(Unicode(24), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=True)),
+)
  
  class MoveMetaCategory(TableBase):
      u"""Very general categories that loosely group move effects."""
      __tablename__ = 'move_meta_categories'
      __singlename__ = 'move_meta_category'
  
  class MoveMetaCategory(TableBase):
      u"""Very general categories that loosely group move effects."""
      __tablename__ = 'move_meta_categories'
      __singlename__ = 'move_meta_category'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
          info=dict(description="A numeric ID"))
-    description = ProseColumn(Unicode(64), plural='descriptions', nullable=False,
-        info=dict(description="A description of the category"))
+
+create_translation_table('move_meta_category_prose', MoveMetaCategory, 'prose',
+    relation_lazy='joined',
+    description = Column(Unicode(64), nullable=False,
+        info=dict(description="A description of the category", format="plaintext", official=False)),
+)
  
  class MoveMetaStatChange(TableBase):
      u"""Stat changes moves (may) make."""
  
  class MoveMetaStatChange(TableBase):
      u"""Stat changes moves (may) make."""
@@ -825,80 +972,25 @@ class MoveTarget(TableBase):
      """
      __tablename__ = 'move_targets'
      __singlename__ = 'move_target'
      """
      __tablename__ = 'move_targets'
      __singlename__ = 'move_target'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(32), nullable=False,
          info=dict(description="An identifier", format='identifier'))
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(32), nullable=False,
          info=dict(description="An identifier", format='identifier'))
-    description = ProseColumn(Unicode(128), plural='descriptions', nullable=False,
-        info=dict(description="A description", format='plaintext'))
-    name = ProseColumn(Unicode(32), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=False))
  
  
-class Move(TableBase):
-    u"""A Move: technique or attack a Pokémon can learn to use
-    """
-    __tablename__ = 'moves'
-    __singlename__ = 'move'
-    id = Column(Integer, primary_key=True, nullable=False,
-        info=dict(description="A numeric ID"))
-    identifier = Column(Unicode(24), nullable=False,
-        info=dict(description="An identifier", format='identifier'))
-    generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False,
-        info=dict(description="ID of the generation this move first appeared in"))
-    type_id = Column(Integer, ForeignKey('types.id'), nullable=False,
-        info=dict(description="ID of the move's elemental type"))
-    power = Column(SmallInteger, nullable=False,
-        info=dict(description="Base power of the move"))
-    pp = Column(SmallInteger, nullable=True,
-        info=dict(description="Base PP (Power Points) of the move, nullable if not applicable (e.g. Struggle and Shadow moves)."))
-    accuracy = Column(SmallInteger, nullable=True,
-        info=dict(description="Accuracy of the move; NULL means it never misses"))
-    priority = Column(SmallInteger, nullable=False,
-        info=dict(description="The move's priority bracket"))
-    target_id = Column(Integer, ForeignKey('move_targets.id'), nullable=False,
-        info=dict(description="ID of the target (range) of the move"))
-    damage_class_id = Column(Integer, ForeignKey('move_damage_classes.id'), nullable=False,
-        info=dict(description="ID of the damage class (physical/special) of the move"))
-    effect_id = Column(Integer, ForeignKey('move_effects.id'), nullable=False,
-        info=dict(description="ID of the move's effect"))
-    effect_chance = Column(Integer, nullable=True,
-        info=dict(description="The chance for a secondary effect. What this is a chance of is specified by the move's effect."))
-    contest_type_id = Column(Integer, ForeignKey('contest_types.id'), nullable=True,
-        info=dict(description="ID of the move's Contest type (e.g. cool or smart)"))
-    contest_effect_id = Column(Integer, ForeignKey('contest_effects.id'), nullable=True,
-        info=dict(description="ID of the move's Contest effect"))
-    super_contest_effect_id = Column(Integer, ForeignKey('super_contest_effects.id'), nullable=True,
-        info=dict(description="ID of the move's Super Contest effect"))
-    name = TextColumn(Unicode(24), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
-
-class MoveChangelog(TableBase):
-    """History of changes to moves across main game versions."""
-    __tablename__ = 'move_changelog'
-    __singlename__ = 'move_changelog'
-    move_id = Column(Integer, ForeignKey('moves.id'), primary_key=True, nullable=False,
-        info=dict(description="ID of the move that changed"))
-    changed_in_version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False,
-        info=dict(description="ID of the version group in which the move changed"))
-    type_id = Column(Integer, ForeignKey('types.id'), nullable=True,
-        info=dict(description="Prior type of the move, or NULL if unchanged"))
-    power = Column(SmallInteger, nullable=True,
-        info=dict(description="Prior base power of the move, or NULL if unchanged"))
-    pp = Column(SmallInteger, nullable=True,
-        info=dict(description="Prior base PP of the move, or NULL if unchanged"))
-    accuracy = Column(SmallInteger, nullable=True,
-        info=dict(description="Prior accuracy of the move, or NULL if unchanged"))
-    effect_id = Column(Integer, ForeignKey('move_effects.id'), nullable=True,
-        info=dict(description="Prior ID of the effect, or NULL if unchanged"))
-    effect_chance = Column(Integer, nullable=True,
-        info=dict(description="Prior effect chance, or NULL if unchanged"))
+create_translation_table('move_target_prose', MoveTarget, 'prose',
+    relation_lazy='joined',
+    name = Column(Unicode(32), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=False)),
+    description = Column(Unicode(128), nullable=False,
+        info=dict(description="A description", format='plaintext')),
+)
  
  class Nature(TableBase):
      u"""A nature a Pokémon can have, such as Calm or Brave
      """
      __tablename__ = 'natures'
      __singlename__ = 'nature'
  
  class Nature(TableBase):
      u"""A nature a Pokémon can have, such as Calm or Brave
      """
      __tablename__ = 'natures'
      __singlename__ = 'nature'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(8), nullable=False,
          info=dict(description="An identifier", format='identifier'))
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(8), nullable=False,
          info=dict(description="An identifier", format='identifier'))
@@ -910,8 +1002,6 @@ class Nature(TableBase):
          info=dict(description=u"ID of the Berry flavor the Pokémon hates (if likes_flavor_id is the same, the effects cancel out)"))
      likes_flavor_id = Column(Integer, ForeignKey('contest_types.id'), nullable=False,
          info=dict(description=u"ID of the Berry flavor the Pokémon likes (if hates_flavor_id is the same, the effects cancel out)"))
          info=dict(description=u"ID of the Berry flavor the Pokémon hates (if likes_flavor_id is the same, the effects cancel out)"))
      likes_flavor_id = Column(Integer, ForeignKey('contest_types.id'), nullable=False,
          info=dict(description=u"ID of the Berry flavor the Pokémon likes (if hates_flavor_id is the same, the effects cancel out)"))
-    name = TextColumn(Unicode(8), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
  
      @property
      def is_neutral(self):
  
      @property
      def is_neutral(self):
@@ -920,6 +1010,12 @@ class Nature(TableBase):
          """
          return self.increased_stat_id == self.decreased_stat_id
  
          """
          return self.increased_stat_id == self.decreased_stat_id
  
+create_translation_table('nature_names', Nature, 'names',
+    relation_lazy='joined',
+    name = Column(Unicode(8), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=True, ripped=True)),
+)
+
  class NatureBattleStylePreference(TableBase):
      u"""Battle Palace move preference
  
  class NatureBattleStylePreference(TableBase):
      u"""Battle Palace move preference
  
@@ -927,9 +1023,9 @@ class NatureBattleStylePreference(TableBase):
      a particular battl style in Battle Palace or Battle Tent
      """
      __tablename__ = 'nature_battle_style_preferences'
      a particular battl style in Battle Palace or Battle Tent
      """
      __tablename__ = 'nature_battle_style_preferences'
-    nature_id = Column(Integer, ForeignKey('natures.id'), primary_key=True, nullable=False,
+    nature_id = Column(Integer, ForeignKey('natures.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description=u"ID of the Pokémon's nature"))
          info=dict(description=u"ID of the Pokémon's nature"))
-    move_battle_style_id = Column(Integer, ForeignKey('move_battle_styles.id'), primary_key=True, nullable=False,
+    move_battle_style_id = Column(Integer, ForeignKey('move_battle_styles.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="ID of the battle style"))
      low_hp_preference = Column(Integer, nullable=False,
          info=dict(description=u"Chance of using the move, in percent, if HP is under ½"))
          info=dict(description="ID of the battle style"))
      low_hp_preference = Column(Integer, nullable=False,
          info=dict(description=u"Chance of using the move, in percent, if HP is under ½"))
@@ -940,9 +1036,9 @@ class NaturePokeathlonStat(TableBase):
      u"""Specifies how a Nature affects a Pokéathlon stat
      """
      __tablename__ = 'nature_pokeathlon_stats'
      u"""Specifies how a Nature affects a Pokéathlon stat
      """
      __tablename__ = 'nature_pokeathlon_stats'
-    nature_id = Column(Integer, ForeignKey('natures.id'), primary_key=True, nullable=False,
+    nature_id = Column(Integer, ForeignKey('natures.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="ID of the nature"))
          info=dict(description="ID of the nature"))
-    pokeathlon_stat_id = Column(Integer, ForeignKey('pokeathlon_stats.id'), primary_key=True, nullable=False,
+    pokeathlon_stat_id = Column(Integer, ForeignKey('pokeathlon_stats.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="ID of the stat"))
      max_change = Column(Integer, nullable=False,
          info=dict(description="Maximum change"))
          info=dict(description="ID of the stat"))
      max_change = Column(Integer, nullable=False,
          info=dict(description="Maximum change"))
@@ -952,35 +1048,42 @@ class PokeathlonStat(TableBase):
      """
      __tablename__ = 'pokeathlon_stats'
      __singlename__ = 'pokeathlon_stat'
      """
      __tablename__ = 'pokeathlon_stats'
      __singlename__ = 'pokeathlon_stat'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(8), nullable=False,
          info=dict(description="An identifier", format='identifier'))
          info=dict(description="A numeric ID"))
      identifier = Column(Unicode(8), nullable=False,
          info=dict(description="An identifier", format='identifier'))
-    name = TextColumn(Unicode(8), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
+
+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)),
+)
  
  class Pokedex(TableBase):
      u"""A collection of Pokémon species ordered in a particular way
      """
      __tablename__ = 'pokedexes'
      __singlename__ = 'pokedex'
  
  class Pokedex(TableBase):
      u"""A collection of Pokémon species ordered in a particular way
      """
      __tablename__ = 'pokedexes'
      __singlename__ = 'pokedex'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description="A numeric ID"))
      region_id = Column(Integer, ForeignKey('regions.id'), nullable=True,
          info=dict(description=u"ID of the region this Pokédex is used in, or None if it's global"))
      identifier = Column(Unicode(16), nullable=False,
          info=dict(description=u"An identifier", format='identifier'))
          info=dict(description="A numeric ID"))
      region_id = Column(Integer, ForeignKey('regions.id'), nullable=True,
          info=dict(description=u"ID of the region this Pokédex is used in, or None if it's global"))
      identifier = Column(Unicode(16), nullable=False,
          info=dict(description=u"An identifier", format='identifier'))
-    description = ProseColumn(Unicode(512), plural='descriptions', nullable=False,
-        info=dict(description=u"A longer description of the Pokédex", format='plaintext'))
-    name = ProseColumn(Unicode(16), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=False))
+
+create_translation_table('pokedex_prose', Pokedex, 'prose',
+    relation_lazy='joined',
+    name = Column(Unicode(16), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=False)),
+    description = Column(Unicode(512), nullable=False,
+        info=dict(description=u"A longer description of the Pokédex", format='plaintext')),
+)
  
  class Pokemon(TableBase):
      u"""A species of Pokémon.  The core to this whole mess.
      """
      __tablename__ = 'pokemon'
      __singlename__ = 'pokemon'
  
  class Pokemon(TableBase):
      u"""A species of Pokémon.  The core to this whole mess.
      """
      __tablename__ = 'pokemon'
      __singlename__ = 'pokemon'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description=u"A numeric ID"))
      identifier = Column(Unicode(20), nullable=False,
          info=dict(description=u"An identifier", format='identifier'))
          info=dict(description=u"A numeric ID"))
      identifier = Column(Unicode(20), nullable=False,
          info=dict(description=u"An identifier", format='identifier'))
@@ -992,12 +1095,9 @@ class Pokemon(TableBase):
          info=dict(description=u"The height of the Pokémon, in decimeters (tenths of a meter)"))
      weight = Column(Integer, nullable=False,
          info=dict(description=u"The weight of the Pokémon, in tenths of a kilogram (decigrams)"))
          info=dict(description=u"The height of the Pokémon, in decimeters (tenths of a meter)"))
      weight = Column(Integer, nullable=False,
          info=dict(description=u"The weight of the Pokémon, in tenths of a kilogram (decigrams)"))
-    species = TextColumn(Unicode(16), nullable=False, plural='species_names',
-        info=dict(description=u'The short flavor text, such as "Seed" or "Lizard"; usually affixed with the word "Pokémon"',
-        official=True, format='plaintext'))
      color_id = Column(Integer, ForeignKey('pokemon_colors.id'), nullable=False,
          info=dict(description=u"ID of this Pokémon's Pokédex color, as used for a gimmick search function in the games."))
      color_id = Column(Integer, ForeignKey('pokemon_colors.id'), nullable=False,
          info=dict(description=u"ID of this Pokémon's Pokédex color, as used for a gimmick search function in the games."))
-    pokemon_shape_id = Column(Integer, ForeignKey('pokemon_shapes.id'), nullable=True,
+    pokemon_shape_id = Column(Integer, ForeignKey('pokemon_shapes.id'), nullable=False,
          info=dict(description=u"ID of this Pokémon's body shape, as used for a gimmick search function in the games."))
      habitat_id = Column(Integer, ForeignKey('pokemon_habitats.id'), nullable=True,
          info=dict(description=u"ID of this Pokémon's habitat, as used for a gimmick search function in the games."))
          info=dict(description=u"ID of this Pokémon's body shape, as used for a gimmick search function in the games."))
      habitat_id = Column(Integer, ForeignKey('pokemon_habitats.id'), nullable=True,
          info=dict(description=u"ID of this Pokémon's habitat, as used for a gimmick search function in the games."))
@@ -1017,8 +1117,6 @@ class Pokemon(TableBase):
          info=dict(description=u"Set iff the species exhibits enough sexual dimorphism to have separate sets of sprites in Gen IV and beyond."))
      order = Column(Integer, nullable=False, index=True,
          info=dict(description=u"Order for sorting. Almost national order, except families and forms are grouped together."))
          info=dict(description=u"Set iff the species exhibits enough sexual dimorphism to have separate sets of sprites in Gen IV and beyond."))
      order = Column(Integer, nullable=False, index=True,
          info=dict(description=u"Order for sorting. Almost national order, except families and forms are grouped together."))
-    name = TextColumn(Unicode(20), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
  
      ### Stuff to handle alternate Pokémon forms
  
  
      ### Stuff to handle alternate Pokémon forms
  
@@ -1102,6 +1200,19 @@ class Pokemon(TableBase):
          else:
              return None
  
          else:
              return None
  
+create_translation_table('pokemon_names', Pokemon, 'names',
+    relation_lazy='joined',
+    name = Column(Unicode(20), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=True, ripped=True)),
+    species = Column(Unicode(16), nullable=False,
+        info=dict(description=u'The short flavor text, such as "Seed" or "Lizard"; usually affixed with the word "Pokémon"',
+        official=True, format='plaintext')),
+)
+create_translation_table('pokemon_flavor_summaries', Pokemon, 'flavor_summaries',
+    flavor_summary = Column(Unicode(512), nullable=True,
+        info=dict(description=u"Text containing facts from all flavor texts, for languages without official game translations", official=False, format='plaintext', ripped=True)),
+)
+
  class PokemonAbility(TableBase):
      u"""Maps an ability to a Pokémon that can have it
      """
  class PokemonAbility(TableBase):
      u"""Maps an ability to a Pokémon that can have it
      """
@@ -1127,8 +1238,12 @@ class PokemonColor(TableBase):
          info=dict(description=u"ID of the Pokémon"))
      identifier = Column(Unicode(6), nullable=False,
          info=dict(description=u"An identifier", format='identifier'))
          info=dict(description=u"ID of the Pokémon"))
      identifier = Column(Unicode(6), nullable=False,
          info=dict(description=u"An identifier", format='identifier'))
-    name = TextColumn(Unicode(6), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
+
+create_translation_table('pokemon_color_names', PokemonColor, 'names',
+    relation_lazy='joined',
+    name = Column(Unicode(6), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=True)),
+)
  
  class PokemonDexNumber(TableBase):
      u"""The number of a Pokémon in a particular Pokédex (e.g. Jigglypuff is #138 in Hoenn's 'dex)
  
  class PokemonDexNumber(TableBase):
      u"""The number of a Pokémon in a particular Pokédex (e.g. Jigglypuff is #138 in Hoenn's 'dex)
@@ -1188,16 +1303,19 @@ class PokemonEvolution(TableBase):
      trade_pokemon_id = Column(Integer, ForeignKey('pokemon.id'), nullable=True,
          info=dict(description=u"The ID of the Pokémon for which this Pokémon must be traded."))
  
      trade_pokemon_id = Column(Integer, ForeignKey('pokemon.id'), nullable=True,
          info=dict(description=u"The ID of the Pokémon for which this Pokémon must be traded."))
  
-class PokemonFlavorText(TableBase, LanguageSpecific):
+class PokemonFlavorText(TableBase):
      u"""In-game Pokédex descrption of a Pokémon.
      """
      __tablename__ = 'pokemon_flavor_text'
      u"""In-game Pokédex descrption of a Pokémon.
      """
      __tablename__ = 'pokemon_flavor_text'
+    summary_column = Pokemon.flavor_summaries_table, 'flavor_summary'
      pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description=u"ID of the Pokémon"))
      version_id = Column(Integer, ForeignKey('versions.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description=u"ID of the version that has this flavor text"))
      pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description=u"ID of the Pokémon"))
      version_id = Column(Integer, ForeignKey('versions.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description=u"ID of the version that has this flavor text"))
+    language_id = Column(Integer, ForeignKey('languages.id'), primary_key=True, nullable=False, autoincrement=False,
+        info=dict(description="The language"))
      flavor_text = Column(Unicode(255), nullable=False,
      flavor_text = Column(Unicode(255), nullable=False,
-        info=dict(description=u"ID of the version that has this flavor text", official=True, format='gametext'))
+        info=dict(description=u"The flavor text", official=True, format='gametext'))
  
  class PokemonForm(TableBase):
      u"""An individual form of a Pokémon.
  
  class PokemonForm(TableBase):
      u"""An individual form of a Pokémon.
@@ -1207,7 +1325,7 @@ class PokemonForm(TableBase):
      """
      __tablename__ = 'pokemon_forms'
      __singlename__ = 'pokemon_form'
      """
      __tablename__ = 'pokemon_forms'
      __singlename__ = 'pokemon_form'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description=u'A unique ID for this form.'))
      identifier = Column(Unicode(16), nullable=True,
          info=dict(description=u"An identifier", format='identifier'))
          info=dict(description=u'A unique ID for this form.'))
      identifier = Column(Unicode(16), nullable=True,
          info=dict(description=u"An identifier", format='identifier'))
@@ -1221,8 +1339,6 @@ class PokemonForm(TableBase):
          info=dict(description=u'Set for exactly one form used as the default for each species.'))
      order = Column(Integer, nullable=False, autoincrement=False,
          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.'))
          info=dict(description=u'Set for exactly one form used as the default for each species.'))
      order = Column(Integer, nullable=False, autoincrement=False,
          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.'))
-    name = TextColumn(Unicode(16), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
  
      @property
      def pokemon(self):
  
      @property
      def pokemon(self):
@@ -1253,20 +1369,30 @@ class PokemonForm(TableBase):
          else:
              return self.form_base_pokemon.name
  
          else:
              return self.form_base_pokemon.name
  
+create_translation_table('pokemon_form_names', PokemonForm, 'names',
+    relation_lazy='joined',
+    name = Column(Unicode(16), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=True)),
+)
+
  class PokemonFormGroup(TableBase):
      u"""Information about a Pokémon's forms as a group."""
      __tablename__ = 'pokemon_form_groups'
      __singlename__ = 'pokemon_form_group'
      pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description=u"ID of the base form Pokémon"))
  class PokemonFormGroup(TableBase):
      u"""Information about a Pokémon's forms as a group."""
      __tablename__ = 'pokemon_form_groups'
      __singlename__ = 'pokemon_form_group'
      pokemon_id = Column(Integer, ForeignKey('pokemon.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description=u"ID of the base form Pokémon"))
-    term = ProseColumn(Unicode(16), plural='terms', nullable=True,
-        info=dict(description=u"The term for this Pokémon's forms, e.g. \"Cloak\" for Burmy or \"Forme\" for Deoxys.", official=True, format='plaintext'))
      is_battle_only = Column(Boolean, nullable=False,
          info=dict(description=u"Set iff the forms only change in battle"))
      is_battle_only = Column(Boolean, nullable=False,
          info=dict(description=u"Set iff the forms only change in battle"))
-    description = ProseColumn(markdown.MarkdownColumn(1024), plural='descriptions', nullable=False,
-        info=dict(description=u"Description of how the forms work", format='markdown'))
+# FIXME remooove
  PokemonFormGroup.id = PokemonFormGroup.pokemon_id
  
  PokemonFormGroup.id = PokemonFormGroup.pokemon_id
  
+create_translation_table('pokemon_form_group_prose', PokemonFormGroup, 'prose',
+    term = Column(Unicode(16), nullable=True,
+        info=dict(description=u"The term for this Pokémon's forms, e.g. \"Cloak\" for Burmy or \"Forme\" for Deoxys.", official=True, format='plaintext')),
+    description = Column(markdown.MarkdownColumn(1024), nullable=False,
+        info=dict(description=u"Description of how the forms work", format='markdown')),
+)
+
  class PokemonFormPokeathlonStat(TableBase):
      u"""A Pokémon form's performance in one Pokéathlon stat."""
      __tablename__ = 'pokemon_form_pokeathlon_stats'
  class PokemonFormPokeathlonStat(TableBase):
      u"""A Pokémon form's performance in one Pokéathlon stat."""
      __tablename__ = 'pokemon_form_pokeathlon_stats'
@@ -1281,6 +1407,17 @@ class PokemonFormPokeathlonStat(TableBase):
      maximum_stat = Column(Integer, nullable=False, autoincrement=False,
          info=dict(description=u'The maximum value for this stat for this Pokémon form.'))
  
      maximum_stat = Column(Integer, nullable=False, autoincrement=False,
          info=dict(description=u'The maximum value for this stat for this Pokémon form.'))
  
+class PokemonGameIndex(TableBase):
+    u"""The number of a Pokémon a game uses internally
+    """
+    __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"))
+    game_index = Column(Integer, nullable=False,
+        info=dict(description=u"Internal ID the generation's games use for the Pokémon"))
+
  class PokemonHabitat(TableBase):
      u"""The habitat of a Pokémon, as given in the FireRed/LeafGreen version Pokédex
      """
  class PokemonHabitat(TableBase):
      u"""The habitat of a Pokémon, as given in the FireRed/LeafGreen version Pokédex
      """
@@ -1290,19 +1427,12 @@ class PokemonHabitat(TableBase):
          info=dict(description=u"A numeric ID"))
      identifier = Column(Unicode(16), nullable=False,
          info=dict(description=u"An identifier", format='identifier'))
          info=dict(description=u"A numeric ID"))
      identifier = Column(Unicode(16), nullable=False,
          info=dict(description=u"An identifier", format='identifier'))
-    name = TextColumn(Unicode(16), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
  
  
-class PokemonInternalID(TableBase):
-    u"""The number of a Pokémon a game uses internally
-    """
-    __tablename__ = 'pokemon_internal_ids'
-    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,
-        info=dict(description=u"Internal ID the generation's games use for the Pokémon"))
+create_translation_table('pokemon_habitat_names', PokemonHabitat, 'names',
+    relation_lazy='joined',
+    name = Column(Unicode(16), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=True)),
+)
  
  class PokemonItem(TableBase):
      u"""Record of an item a Pokémon can hold in the wild
  
  class PokemonItem(TableBase):
      u"""Record of an item a Pokémon can hold in the wild
@@ -1348,24 +1478,32 @@ class PokemonMoveMethod(TableBase):
          info=dict(description=u"A numeric ID"))
      identifier = Column(Unicode(64), nullable=False,
          info=dict(description=u"An identifier", format='identifier'))
          info=dict(description=u"A numeric ID"))
      identifier = Column(Unicode(64), nullable=False,
          info=dict(description=u"An identifier", format='identifier'))
-    description = ProseColumn(Unicode(255), plural='descriptions', nullable=False,
-        info=dict(description=u"A detailed description of how the method works", format='plaintext'))
-    name = ProseColumn(Unicode(64), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=False))
+
+create_translation_table('pokemon_move_method_prose', PokemonMoveMethod, 'prose',
+    relation_lazy='joined',
+    name = Column(Unicode(64), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=False)),
+    description = Column(Unicode(255), nullable=False,
+        info=dict(description=u"A detailed description of how the method works", format='plaintext')),
+)
  
  class PokemonShape(TableBase):
      u"""The shape of a Pokémon's body, as used in generation IV Pokédexes.
      """
      __tablename__ = 'pokemon_shapes'
      __singlename__ = 'pokemon_shape'
  
  class PokemonShape(TableBase):
      u"""The shape of a Pokémon's body, as used in generation IV Pokédexes.
      """
      __tablename__ = 'pokemon_shapes'
      __singlename__ = 'pokemon_shape'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description=u"A numeric ID"))
      identifier = Column(Unicode(24), nullable=False,
          info=dict(description=u"An identifier", format='identifier'))
          info=dict(description=u"A numeric ID"))
      identifier = Column(Unicode(24), nullable=False,
          info=dict(description=u"An identifier", format='identifier'))
-    awesome_name = ProseColumn(Unicode(16), plural='awesome_names', nullable=False,
-        info=dict(description=u"A splendiferous name of the body shape", format='plaintext'))
-    name = ProseColumn(Unicode(24), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=False))
+
+create_translation_table('pokemon_shape_prose', PokemonShape, 'prose',
+    relation_lazy='joined',
+    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):
      u"""A stat value of a Pokémon
  
  class PokemonStat(TableBase):
      u"""A stat value of a Pokémon
@@ -1396,26 +1534,36 @@ class Region(TableBase):
      """
      __tablename__ = 'regions'
      __singlename__ = 'region'
      """
      __tablename__ = 'regions'
      __singlename__ = 'region'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description=u"A numeric ID"))
      identifier = Column(Unicode(16), nullable=False,
          info=dict(description=u"An identifier", format='identifier'))
          info=dict(description=u"A numeric ID"))
      identifier = Column(Unicode(16), nullable=False,
          info=dict(description=u"An identifier", format='identifier'))
-    name = TextColumn(Unicode(16), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
+
+create_translation_table('region_names', Region, 'names',
+    relation_lazy='joined',
+    name = Column(Unicode(16), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=True)),
+)
  
  class Stat(TableBase):
      u"""A Stat, such as Attack or Speed
      """
      __tablename__ = 'stats'
      __singlename__ = 'stat'
  
  class Stat(TableBase):
      u"""A Stat, such as Attack or Speed
      """
      __tablename__ = 'stats'
      __singlename__ = 'stat'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description=u"A numeric ID"))
      damage_class_id = Column(Integer, ForeignKey('move_damage_classes.id'), nullable=True,
          info=dict(description=u"For offensive and defensive stats, the damage this stat relates to; otherwise None (the NULL value)"))
      identifier = Column(Unicode(16), nullable=False,
          info=dict(description=u"An identifier", format='identifier'))
          info=dict(description=u"A numeric ID"))
      damage_class_id = Column(Integer, ForeignKey('move_damage_classes.id'), nullable=True,
          info=dict(description=u"For offensive and defensive stats, the damage this stat relates to; otherwise None (the NULL value)"))
      identifier = Column(Unicode(16), nullable=False,
          info=dict(description=u"An identifier", format='identifier'))
-    name = TextColumn(Unicode(16), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
+    is_battle_only = Column(Boolean, nullable=False,
+        info=dict(description=u"Whether this stat only exists within a battle"))
+
+create_translation_table('stat_names', Stat, 'names',
+    relation_lazy='joined',
+    name = Column(Unicode(16), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=True)),
+)
  
  class StatHint(TableBase):
      u"""Flavor text for genes that appears in a Pokémon's summary.  Sometimes
  
  class StatHint(TableBase):
      u"""Flavor text for genes that appears in a Pokémon's summary.  Sometimes
@@ -1423,14 +1571,18 @@ class StatHint(TableBase):
      """
      __tablename__ = 'stat_hints'
      __singlename__ = 'stat_hint'
      """
      __tablename__ = 'stat_hints'
      __singlename__ = 'stat_hint'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description=u"A numeric ID"))
      stat_id = Column(Integer, ForeignKey('stats.id'), nullable=False,
          info=dict(description=u"ID of the highest stat"))
      gene_mod_5 = Column(Integer, nullable=False, index=True,
          info=dict(description=u"Value of the highest stat modulo 5"))
          info=dict(description=u"A numeric ID"))
      stat_id = Column(Integer, ForeignKey('stats.id'), nullable=False,
          info=dict(description=u"ID of the highest stat"))
      gene_mod_5 = Column(Integer, nullable=False, index=True,
          info=dict(description=u"Value of the highest stat modulo 5"))
-    message = TextColumn(Unicode(24), plural='messages', nullable=False, index=True, unique=True,
-        info=dict(description=u"The text displayed", official=True, format='plaintext'))
+
+create_translation_table('stat_hint_names', StatHint, 'names',
+    relation_lazy='joined',
+    message = Column(Unicode(24), nullable=False, index=True,
+        info=dict(description=u"The text displayed", official=True, format='plaintext')),
+)
  
  class SuperContestCombo(TableBase):
      u"""Combo of two moves in a Super Contest.
  
  class SuperContestCombo(TableBase):
      u"""Combo of two moves in a Super Contest.
@@ -1446,30 +1598,21 @@ class SuperContestEffect(TableBase):
      """
      __tablename__ = 'super_contest_effects'
      __singlename__ = 'super_contest_effect'
      """
      __tablename__ = 'super_contest_effects'
      __singlename__ = 'super_contest_effect'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description=u"This effect's unique ID."))
      appeal = Column(SmallInteger, nullable=False,
          info=dict(description=u"The number of hearts the user gains."))
          info=dict(description=u"This effect's unique ID."))
      appeal = Column(SmallInteger, nullable=False,
          info=dict(description=u"The number of hearts the user gains."))
-    flavor_text = ProseColumn(Unicode(64), plural='flavor_texts', nullable=False,
-        info=dict(description=u"A description of the effect.", format='plaintext'))
  
  
-class TypeEfficacy(TableBase):
-    u"""The damage multiplier used when a move of a particular type damages a
-    Pokémon of a particular other type.
-    """
-    __tablename__ = 'type_efficacy'
-    damage_type_id = Column(Integer, ForeignKey('types.id'), primary_key=True, nullable=False, autoincrement=False,
-        info=dict(description=u"The ID of the damaging type."))
-    target_type_id = Column(Integer, ForeignKey('types.id'), primary_key=True, nullable=False, autoincrement=False,
-        info=dict(description=u"The ID of the defending Pokémon's type."))
-    damage_factor = Column(Integer, nullable=False,
-        info=dict(description=u"The multiplier, as a percentage of damage inflicted."))
+create_translation_table('super_contest_effect_prose', SuperContestEffect, 'prose',
+    flavor_text = Column(Unicode(64), nullable=False,
+        info=dict(description=u"A description of the effect.", format='plaintext', official=True)),
+)
  
  class Type(TableBase):
      u"""Any of the elemental types Pokémon and moves can have."""
      __tablename__ = 'types'
      __singlename__ = 'type'
  
  class Type(TableBase):
      u"""Any of the elemental types Pokémon and moves can have."""
      __tablename__ = 'types'
      __singlename__ = 'type'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description=u"A unique ID for this type."))
      identifier = Column(Unicode(12), nullable=False,
          info=dict(description=u"An identifier", format='identifier'))
          info=dict(description=u"A unique ID for this type."))
      identifier = Column(Unicode(12), nullable=False,
          info=dict(description=u"An identifier", format='identifier'))
@@ -1477,15 +1620,48 @@ class Type(TableBase):
          info=dict(description=u"The ID of the generation this type first appeared in."))
      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. ???)."))
          info=dict(description=u"The ID of the generation this type first appeared in."))
      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. ???)."))
-    name = TextColumn(Unicode(12), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
+
+create_translation_table('type_names', Type, 'names',
+    relation_lazy='joined',
+    name = Column(Unicode(12), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=True)),
+)
+
+class TypeEfficacy(TableBase):
+    u"""The damage multiplier used when a move of a particular type damages a
+    Pokémon of a particular other type.
+    """
+    __tablename__ = 'type_efficacy'
+    damage_type_id = Column(Integer, ForeignKey('types.id'), primary_key=True, nullable=False, autoincrement=False,
+        info=dict(description=u"The ID of the damaging type."))
+    target_type_id = Column(Integer, ForeignKey('types.id'), primary_key=True, nullable=False, autoincrement=False,
+        info=dict(description=u"The ID of the defending Pokémon's type."))
+    damage_factor = Column(Integer, nullable=False,
+        info=dict(description=u"The multiplier, as a percentage of damage inflicted."))
+
+class Version(TableBase):
+    u"""An individual main-series Pokémon game."""
+    __tablename__ = 'versions'
+    __singlename__ = 'version'
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
+        info=dict(description=u"A unique ID for this version."))
+    version_group_id = Column(Integer, ForeignKey('version_groups.id'), nullable=False,
+        info=dict(description=u"The ID of the version group this game belongs to."))
+    identifier = Column(Unicode(32), nullable=False,
+        info=dict(description=u'And identifier', format='identifier'))
+
+create_translation_table('version_names', Version, 'names',
+    relation_lazy='joined',
+    name = Column(Unicode(32), nullable=False, index=True,
+        info=dict(description="The name", format='plaintext', official=True)),
+)
  
  class VersionGroup(TableBase):
      u"""A group of versions, containing either two paired versions (such as Red
      and Blue) or a single game (such as Yellow.)
      """
      __tablename__ = 'version_groups'
  
  class VersionGroup(TableBase):
      u"""A group of versions, containing either two paired versions (such as Red
      and Blue) or a single game (such as Yellow.)
      """
      __tablename__ = 'version_groups'
-    id = Column(Integer, primary_key=True, nullable=False,
+    id = Column(Integer, primary_key=True, nullable=False, autoincrement=False,
          info=dict(description=u"This version group's unique ID."))
      generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False,
          info=dict(description=u"The ID of the generation the games in this group belong to."))
          info=dict(description=u"This version group's unique ID."))
      generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False,
          info=dict(description=u"The ID of the generation the games in this group belong to."))
@@ -1495,197 +1671,303 @@ class VersionGroup(TableBase):
  class VersionGroupRegion(TableBase):
      u"""Maps a version group to a region that appears in it."""
      __tablename__ = 'version_group_regions'
  class VersionGroupRegion(TableBase):
      u"""Maps a version group to a region that appears in it."""
      __tablename__ = 'version_group_regions'
-    version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False,
+    version_group_id = Column(Integer, ForeignKey('version_groups.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description=u"The ID of the version group."))
          info=dict(description=u"The ID of the version group."))
-    region_id = Column(Integer, ForeignKey('regions.id'), primary_key=True, nullable=False,
+    region_id = Column(Integer, ForeignKey('regions.id'), primary_key=True, nullable=False, autoincrement=False,
          info=dict(description=u"The ID of the region."))
  
          info=dict(description=u"The ID of the region."))
  
-class Version(TableBase):
-    u"""An individual main-series Pokémon game."""
-    __tablename__ = 'versions'
-    __singlename__ = 'version'
-    id = Column(Integer, primary_key=True, nullable=False,
-        info=dict(description=u"A unique ID for this version."))
-    version_group_id = Column(Integer, ForeignKey('version_groups.id'), nullable=False,
-        info=dict(description=u"The ID of the version group this game belongs to."))
-    identifier = Column(Unicode(32), nullable=False,
-        info=dict(description=u'And identifier', format='identifier'))
-    name = TextColumn(Unicode(32), nullable=False, index=True, plural='names',
-        info=dict(description="The name", format='plaintext', official=True))
  
  
+### Relations down here, to avoid dependency ordering problems
  
  
-### Relations down here, to avoid ordering problems
  Ability.changelog = relation(AbilityChangelog,
      order_by=AbilityChangelog.changed_in_version_group_id.desc(),
  Ability.changelog = relation(AbilityChangelog,
      order_by=AbilityChangelog.changed_in_version_group_id.desc(),
-    backref='ability',
-)
-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')
-
-AbilityFlavorText.version_group = relation(VersionGroup)
-
-Berry.berry_firmness = relation(BerryFirmness, backref='berries')
+    backref=backref('ability', innerjoin=True, lazy='joined'))
+Ability.flavor_text = relation(AbilityFlavorText,
+    order_by=AbilityFlavorText.version_group_id,
+    backref=backref('ability', innerjoin=True, lazy='joined'))
+Ability.generation = relation(Generation,
+    innerjoin=True,
+    backref='abilities')
+
+AbilityChangelog.changed_in = relation(VersionGroup,
+    innerjoin=True, lazy='joined',
+    backref='ability_changelog')
+
+AbilityFlavorText.version_group = relation(VersionGroup,
+    innerjoin=True)
+AbilityFlavorText.language = relation(Language,
+    innerjoin=True, lazy='joined')
+
+
+Berry.berry_firmness = relation(BerryFirmness,
+    innerjoin=True,
+    backref='berries')
  Berry.firmness = association_proxy('berry_firmness', 'name')
  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)
+Berry.flavors = relation(BerryFlavor,
+    order_by=BerryFlavor.contest_type_id,
+    backref=backref('berry', innerjoin=True))
+Berry.natural_gift_type = relation(Type, innerjoin=True)
  
  
-BerryFlavor.contest_type = relation(ContestType)
+BerryFlavor.contest_type = relation(ContestType, innerjoin=True)
  
  
-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,
-                                     backref='contest_combo_second')
  
  
-Encounter.location_area = relation(LocationArea, backref='encounters')
-Encounter.pokemon = relation(Pokemon, backref='encounters')
-Encounter.version = relation(Version, backref='encounters')
-Encounter.slot = relation(EncounterSlot, backref='encounters')
+ContestCombo.first = relation(Move,
+    primaryjoin=ContestCombo.first_move_id==Move.id,
+    innerjoin=True, lazy='joined',
+    backref='contest_combo_first')
+ContestCombo.second = relation(Move,
+    primaryjoin=ContestCombo.second_move_id==Move.id,
+    innerjoin=True, lazy='joined',
+    backref='contest_combo_second')
  
  
-EncounterConditionValue.condition = relation(EncounterCondition, backref='values')
  
  
-Encounter.condition_value_map = relation(EncounterConditionValueMap, backref='encounter')
+Encounter.condition_value_map = relation(EncounterConditionValueMap,
+    backref='encounter')
  Encounter.condition_values = association_proxy('condition_value_map', 'condition_value')
  Encounter.condition_values = association_proxy('condition_value_map', 'condition_value')
+Encounter.location_area = relation(LocationArea,
+    innerjoin=True, lazy='joined',
+    backref='encounters')
+Encounter.pokemon = relation(Pokemon,
+    innerjoin=True, lazy='joined',
+    backref='encounters')
+Encounter.version = relation(Version,
+    innerjoin=True, lazy='joined',
+    backref='encounters')
+Encounter.slot = relation(EncounterSlot,
+    innerjoin=True, lazy='joined',
+    backref='encounters')
+
+EncounterConditionValue.condition = relation(EncounterCondition,
+    innerjoin=True, lazy='joined',
+    backref='values')
  EncounterConditionValueMap.condition_value = relation(EncounterConditionValue,
  EncounterConditionValueMap.condition_value = relation(EncounterConditionValue,
-                                                      backref='encounter_map')
+    innerjoin=True, lazy='joined',
+    backref='encounter_map')
  
  
-EncounterSlot.terrain = relation(EncounterTerrain, backref='slots')
-EncounterSlot.version_group = relation(VersionGroup)
+EncounterSlot.terrain = relation(EncounterTerrain,
+    innerjoin=True, lazy='joined',
+    backref='slots')
+EncounterSlot.version_group = relation(VersionGroup, innerjoin=True)
  
  
-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')
+EvolutionChain.growth_rate = relation(GrowthRate,
+    innerjoin=True,
+    backref='evolution_chains')
+EvolutionChain.baby_trigger_item = relation(Item,
+    backref='evolution_chains')
  
  
-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)
+Experience.growth_rate = relation(GrowthRate,
+    innerjoin=True, lazy='joined',
+    backref='experience_table')
+
+
+Generation.canonical_pokedex = relation(Pokedex,
+    backref='canonical_for_generation')
+Generation.versions = relation(Version,
+    secondary=VersionGroup.__table__,
+    innerjoin=True)
+Generation.main_region = relation(Region, innerjoin=True)
+
+
+GrowthRate.max_experience_obj = relation(Experience,
+    primaryjoin=and_(
+        Experience.growth_rate_id == GrowthRate.id,
+        Experience.level == 100),
+    uselist=False, innerjoin=True)
  GrowthRate.max_experience = association_proxy('max_experience_obj', 'experience')
  
  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.machines = relation(Machine, order_by=Machine.version_group_id.asc())
-Item.category = relation(ItemCategory)
+
+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=backref('item', innerjoin=True, lazy='joined'))
+Item.fling_effect = relation(ItemFlingEffect,
+    backref='items')
+Item.machines = relation(Machine,
+    order_by=Machine.version_group_id.asc())
+Item.category = relation(ItemCategory,
+    innerjoin=True,
+    backref=backref('items', order_by=Item.identifier.asc()))
  Item.pocket = association_proxy('category', 'pocket')
  
  Item.pocket = association_proxy('category', 'pocket')
  
-ItemCategory.items = relation(Item, order_by=Item.identifier)
-ItemCategory.pocket = relation(ItemPocket)
+ItemCategory.pocket = relation(ItemPocket, innerjoin=True)
+
+ItemFlavorText.version_group = relation(VersionGroup,
+    innerjoin=True, lazy='joined')
+ItemFlavorText.language = relation(Language,
+    innerjoin=True, lazy='joined')
  
  
-ItemFlavorText.version_group = relation(VersionGroup)
+ItemGameIndex.item = relation(Item,
+    innerjoin=True, lazy='joined',
+    backref='game_indices')
+ItemGameIndex.generation = relation(Generation,
+    innerjoin=True, lazy='joined')
  
  
-ItemInternalID.item = relation(Item, backref='internal_ids')
-ItemInternalID.generation = relation(Generation)
+ItemPocket.categories = relation(ItemCategory,
+    innerjoin=True,
+    order_by=ItemCategory.identifier.asc())
  
  
-ItemPocket.categories = relation(ItemCategory, order_by=ItemCategory.identifier)
  
  
-Location.region = relation(Region, backref='locations')
+Location.region = relation(Region,
+    innerjoin=True,
+    backref='locations')
  
  
-LocationArea.location = relation(Location, backref='areas')
+LocationArea.location = relation(Location,
+    innerjoin=True, lazy='joined',
+    backref='areas')
+
+LocationGameIndex.location = relation(Location,
+    innerjoin=True, lazy='joined',
+    backref='game_indices')
+LocationGameIndex.generation = relation(Generation,
+    innerjoin=True, lazy='joined')
  
  
-LocationInternalID.location = relation(Location, backref='internal_ids')
-LocationInternalID.generation = relation(Generation)
  
  Machine.item = relation(Item)
  
  Machine.item = relation(Item)
-Machine.version_group = relation(VersionGroup)
+Machine.version_group = relation(VersionGroup,
+    innerjoin=True, lazy='joined')
+
  
  Move.changelog = relation(MoveChangelog,
      order_by=MoveChangelog.changed_in_version_group_id.desc(),
  
  Move.changelog = relation(MoveChangelog,
      order_by=MoveChangelog.changed_in_version_group_id.desc(),
-    backref='move',
-)
-Move.contest_effect = relation(ContestEffect, backref='moves')
+    backref=backref('move', innerjoin=True, lazy='joined'))
+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_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.contest_type = relation(ContestType,
+    backref='moves')
+Move.damage_class = relation(MoveDamageClass,
+    innerjoin=True,
+    backref='moves')
  Move.flags = association_proxy('move_flags', 'flag')
  Move.flags = association_proxy('move_flags', 'flag')
-Move.flavor_text = relation(MoveFlavorText, order_by=MoveFlavorText.version_group_id, backref='move')
-Move.generation = relation(Generation, backref='moves')
-Move.machines = relation(Machine, backref='move')
-Move.meta = relation(MoveMeta, uselist=False, backref='move')
+Move.flavor_text = relation(MoveFlavorText,
+    order_by=MoveFlavorText.version_group_id, backref='move')
+Move.generation = relation(Generation,
+    innerjoin=True,
+    backref='moves')
+Move.machines = relation(Machine,
+    backref='move')
+Move.meta = relation(MoveMeta,
+    uselist=False, innerjoin=True,
+    backref='move')
  Move.meta_stat_changes = relation(MoveMetaStatChange)
  Move.meta_stat_changes = relation(MoveMetaStatChange)
-Move.move_effect = relation(MoveEffect, backref='moves')
-Move.move_flags = relation(MoveFlag, backref='move')
-Move.super_contest_effect = relation(SuperContestEffect, backref='moves')
+Move.move_effect = relation(MoveEffect,
+    innerjoin=True,
+    backref='moves')
+Move.move_flags = relation(MoveFlag,
+    backref='move')
+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.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')
-
-MoveChangelog.changed_in = relation(VersionGroup, backref='move_changelog')
-MoveChangelog.move_effect = relation(MoveEffect, backref='move_changelog')
-MoveChangelog.type = relation(Type, backref='move_changelog')
+Move.target = relation(MoveTarget,
+    innerjoin=True,
+    backref='moves')
+Move.type = relation(Type,
+    innerjoin=True,
+    backref='moves')
+
+Move.effect = markdown.MoveEffectProperty('effect')
+Move.effect_map = markdown.MoveEffectPropertyMap('effect_map')
+Move.short_effect = markdown.MoveEffectProperty('short_effect')
+Move.short_effect_map = markdown.MoveEffectPropertyMap('short_effect_map')
+
+MoveChangelog.changed_in = relation(VersionGroup,
+    innerjoin=True, lazy='joined',
+    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.MoveEffectPropertyMap('effect_map')
+MoveChangelog.short_effect = markdown.MoveEffectProperty('short_effect')
+MoveChangelog.short_effect_map = markdown.MoveEffectPropertyMap('short_effect_map')
  
  MoveEffect.category_map = relation(MoveEffectCategoryMap)
  MoveEffect.categories = association_proxy('category_map', 'category')
  MoveEffect.changelog = relation(MoveEffectChangelog,
      order_by=MoveEffectChangelog.changed_in_version_group_id.desc(),
  
  MoveEffect.category_map = relation(MoveEffectCategoryMap)
  MoveEffect.categories = association_proxy('category_map', 'category')
  MoveEffect.changelog = relation(MoveEffectChangelog,
      order_by=MoveEffectChangelog.changed_in_version_group_id.desc(),
-    backref='move_effect',
-)
+    backref='move_effect')
  MoveEffectCategoryMap.category = relation(MoveEffectCategory)
  
  MoveEffectCategoryMap.category = relation(MoveEffectCategory)
  
-MoveEffectChangelog.changed_in = relation(VersionGroup, backref='move_effect_changelog')
-
-MoveFlag.flag = relation(MoveFlagType)
-
-MoveFlavorText.version_group = relation(VersionGroup)
-
-MoveMeta.category = relation(MoveMetaCategory, backref='move_meta')
-MoveMeta.ailment = relation(MoveMetaAilment, backref='move_meta')
+MoveEffectChangelog.changed_in = relation(VersionGroup,
+    innerjoin=True, lazy='joined',
+    backref='move_effect_changelog')
+
+MoveFlag.flag = relation(MoveFlagType, innerjoin=True, lazy='joined')
+
+MoveFlavorText.version_group = relation(VersionGroup,
+    innerjoin=True, lazy='joined')
+MoveFlavorText.language = relation(Language,
+    innerjoin=True, lazy='joined')
+
+MoveMeta.category = relation(MoveMetaCategory,
+    innerjoin=True, lazy='joined',
+    backref='move_meta')
+MoveMeta.ailment = relation(MoveMetaAilment,
+    innerjoin=True, lazy='joined',
+    backref='move_meta')
+
+MoveMetaStatChange.stat = relation(Stat,
+    innerjoin=True, lazy='joined',
+    backref='move_meta_stat_changes')
+
+
+Nature.decreased_stat = relation(Stat,
+    primaryjoin=Nature.decreased_stat_id==Stat.id,
+    innerjoin=True,
+    backref='decreasing_natures')
+Nature.increased_stat = relation(Stat,
+    primaryjoin=Nature.increased_stat_id==Stat.id,
+    innerjoin=True,
+    backref='increasing_natures')
+Nature.hates_flavor = relation(ContestType,
+    primaryjoin=Nature.hates_flavor_id==ContestType.id,
+    innerjoin=True,
+    backref='hating_natures')
+Nature.likes_flavor = relation(ContestType,
+    primaryjoin=Nature.likes_flavor_id==ContestType.id,
+    innerjoin=True,
+    backref='liking_natures')
+Nature.battle_style_preferences = relation(NatureBattleStylePreference,
+    order_by=NatureBattleStylePreference.move_battle_style_id.asc(),
+    backref='nature')
+Nature.pokeathlon_effects = relation(NaturePokeathlonStat,
+    order_by=NaturePokeathlonStat.pokeathlon_stat_id.asc())
  
  
-MoveMetaStatChange.stat = relation(Stat, backref='move_meta_stat_changes')
+NatureBattleStylePreference.battle_style = relation(MoveBattleStyle,
+    innerjoin=True, lazy='joined',
+    backref='nature_preferences')
  
  
-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)
+NaturePokeathlonStat.pokeathlon_stat = relation(PokeathlonStat,
+    innerjoin=True, lazy='joined',
+    backref='nature_effects')
  
  
-NatureBattleStylePreference.battle_style = relation(MoveBattleStyle, backref='nature_preferences')
  
  
-NaturePokeathlonStat.pokeathlon_stat = relation(PokeathlonStat, backref='nature_effects')
+Pokedex.region = relation(Region,
+    innerjoin=True,
+    backref='pokedexes')
+Pokedex.version_groups = relation(VersionGroup,
+    innerjoin=True,
+    order_by=VersionGroup.id.asc(),
+    backref='pokedex')
  
  
-Pokedex.region = relation(Region, backref='pokedexes')
-Pokedex.version_groups = relation(VersionGroup, order_by=VersionGroup.id, back_populates='pokedex')
  
  Pokemon.all_abilities = relation(Ability,
      secondary=PokemonAbility.__table__,
  
  Pokemon.all_abilities = relation(Ability,
      secondary=PokemonAbility.__table__,
-    order_by=PokemonAbility.slot,
+    order_by=PokemonAbility.slot.asc(),
+    innerjoin=True,
+    backref=backref('all_pokemon',
+        order_by=Pokemon.order.asc(),
+    ),
  )
  Pokemon.abilities = relation(Ability,
      secondary=PokemonAbility.__table__,
  )
  Pokemon.abilities = relation(Ability,
      secondary=PokemonAbility.__table__,
@@ -1693,7 +1975,11 @@ Pokemon.abilities = relation(Ability,
          Pokemon.id == PokemonAbility.pokemon_id,
          PokemonAbility.is_dream == False,
      ),
          Pokemon.id == PokemonAbility.pokemon_id,
          PokemonAbility.is_dream == False,
      ),
-    order_by=PokemonAbility.slot,
+    innerjoin=True,
+    order_by=PokemonAbility.slot.asc(),
+    backref=backref('pokemon',
+        order_by=Pokemon.order.asc(),
+    ),
  )
  Pokemon.dream_ability = relation(Ability,
      secondary=PokemonAbility.__table__,
  )
  Pokemon.dream_ability = relation(Ability,
      secondary=PokemonAbility.__table__,
@@ -1702,420 +1988,198 @@ Pokemon.dream_ability = relation(Ability,
          PokemonAbility.is_dream == True,
      ),
      uselist=False,
          PokemonAbility.is_dream == True,
      ),
      uselist=False,
+    backref=backref('dream_pokemon',
+        order_by=Pokemon.order,
+    ),
  )
  )
-Pokemon.pokemon_color = relation(PokemonColor, backref='pokemon')
+Pokemon.pokemon_color = relation(PokemonColor,
+    innerjoin=True,
+    backref='pokemon')
  Pokemon.color = association_proxy('pokemon_color', 'name')
  Pokemon.color = association_proxy('pokemon_color', 'name')
-Pokemon.dex_numbers = relation(PokemonDexNumber, order_by=PokemonDexNumber.pokedex_id.asc(), backref='pokemon')
-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.dex_numbers = relation(PokemonDexNumber,
+    innerjoin=True,
+    order_by=PokemonDexNumber.pokedex_id.asc(),
+    backref='pokemon')
+Pokemon.egg_groups = relation(EggGroup,
+    secondary=PokemonEggGroup.__table__,
+    innerjoin=True,
+    order_by=PokemonEggGroup.egg_group_id.asc(),
+    backref=backref('pokemon', order_by=Pokemon.order.asc()))
+Pokemon.evolution_chain = relation(EvolutionChain,
+    innerjoin=True,
+    backref=backref('pokemon', order_by=Pokemon.order.asc()))
  Pokemon.child_pokemon = relation(Pokemon,
      primaryjoin=Pokemon.id==PokemonEvolution.from_pokemon_id,
      secondary=PokemonEvolution.__table__,
      secondaryjoin=PokemonEvolution.to_pokemon_id==Pokemon.id,
  Pokemon.child_pokemon = relation(Pokemon,
      primaryjoin=Pokemon.id==PokemonEvolution.from_pokemon_id,
      secondary=PokemonEvolution.__table__,
      secondaryjoin=PokemonEvolution.to_pokemon_id==Pokemon.id,
-    backref=backref('parent_pokemon', uselist=False),
-)
-Pokemon.flavor_text = relation(PokemonFlavorText, order_by=PokemonFlavorText.version_id.asc(), backref='pokemon')
-Pokemon.forms = relation(PokemonForm, primaryjoin=Pokemon.id==PokemonForm.form_base_pokemon_id,
-                         order_by=(PokemonForm.order.asc(), PokemonForm.identifier.asc()))
+    backref=backref('parent_pokemon', uselist=False))
+Pokemon.flavor_text = relation(PokemonFlavorText,
+    order_by=PokemonFlavorText.version_id.asc(),
+    backref='pokemon')
+Pokemon.forms = relation(PokemonForm,
+    primaryjoin=Pokemon.id==PokemonForm.form_base_pokemon_id,
+    order_by=(PokemonForm.order.asc(), PokemonForm.identifier.asc()))
  Pokemon.default_form = relation(PokemonForm,
  Pokemon.default_form = relation(PokemonForm,
-    primaryjoin=and_(Pokemon.id==PokemonForm.form_base_pokemon_id, PokemonForm.is_default==True),
-    uselist=False,
-)
-Pokemon.pokemon_habitat = relation(PokemonHabitat, backref='pokemon')
+    primaryjoin=and_(
+        Pokemon.id==PokemonForm.form_base_pokemon_id,
+        PokemonForm.is_default==True),
+    uselist=False)
+Pokemon.pokemon_habitat = relation(PokemonHabitat,
+    backref='pokemon')
  Pokemon.habitat = association_proxy('pokemon_habitat', 'name')
  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', order_by=PokemonStat.stat_id.asc())
-Pokemon.types = relation(Type, secondary=PokemonType.__table__,
-                               order_by=PokemonType.slot.asc(),
-                               back_populates='pokemon')
-
-PokemonDexNumber.pokedex = relation(Pokedex)
+Pokemon.items = relation(PokemonItem,
+    backref='pokemon')
+Pokemon.generation = relation(Generation,
+    innerjoin=True,
+    backref='pokemon')
+Pokemon.shape = relation(PokemonShape,
+    innerjoin=True,
+    backref='pokemon')
+Pokemon.stats = relation(PokemonStat,
+    innerjoin=True,
+    order_by=PokemonStat.stat_id.asc(),
+    backref='pokemon')
+Pokemon.types = relation(Type,
+    secondary=PokemonType.__table__,
+    innerjoin=True,
+    order_by=PokemonType.slot.asc(),
+    backref=backref('pokemon', order_by=Pokemon.order))
+
+PokemonDexNumber.pokedex = relation(Pokedex,
+    innerjoin=True, lazy='joined')
  
  PokemonEvolution.from_pokemon = relation(Pokemon,
      primaryjoin=PokemonEvolution.from_pokemon_id==Pokemon.id,
  
  PokemonEvolution.from_pokemon = relation(Pokemon,
      primaryjoin=PokemonEvolution.from_pokemon_id==Pokemon.id,
-    backref='child_evolutions',
-)
+    innerjoin=True,
+    backref='child_evolutions')
  PokemonEvolution.to_pokemon = relation(Pokemon,
      primaryjoin=PokemonEvolution.to_pokemon_id==Pokemon.id,
  PokemonEvolution.to_pokemon = relation(Pokemon,
      primaryjoin=PokemonEvolution.to_pokemon_id==Pokemon.id,
-    backref=backref('parent_evolution', uselist=False),
-)
+    innerjoin=True,
+    backref=backref('parent_evolution', uselist=False))
  PokemonEvolution.child_evolutions = relation(PokemonEvolution,
      primaryjoin=PokemonEvolution.from_pokemon_id==PokemonEvolution.to_pokemon_id,
      foreign_keys=[PokemonEvolution.to_pokemon_id],
      backref=backref('parent_evolution',
          remote_side=[PokemonEvolution.from_pokemon_id],
  PokemonEvolution.child_evolutions = relation(PokemonEvolution,
      primaryjoin=PokemonEvolution.from_pokemon_id==PokemonEvolution.to_pokemon_id,
      foreign_keys=[PokemonEvolution.to_pokemon_id],
      backref=backref('parent_evolution',
          remote_side=[PokemonEvolution.from_pokemon_id],
-        uselist=False,
-    ),
-)
-PokemonEvolution.trigger = relation(EvolutionTrigger, backref='evolutions')
+        uselist=False))
+PokemonEvolution.trigger = relation(EvolutionTrigger,
+    innerjoin=True, lazy='joined',
+    backref='evolutions')
  PokemonEvolution.trigger_item = relation(Item,
      primaryjoin=PokemonEvolution.trigger_item_id==Item.id,
  PokemonEvolution.trigger_item = relation(Item,
      primaryjoin=PokemonEvolution.trigger_item_id==Item.id,
-    backref='triggered_evolutions',
-)
+    backref='triggered_evolutions')
  PokemonEvolution.held_item = relation(Item,
      primaryjoin=PokemonEvolution.held_item_id==Item.id,
  PokemonEvolution.held_item = relation(Item,
      primaryjoin=PokemonEvolution.held_item_id==Item.id,
-    backref='required_for_evolutions',
-)
-PokemonEvolution.location = relation(Location, backref='triggered_evolutions')
-PokemonEvolution.known_move = relation(Move, backref='triggered_evolutions')
+    backref='required_for_evolutions')
+PokemonEvolution.location = relation(Location,
+    backref='triggered_evolutions')
+PokemonEvolution.known_move = relation(Move,
+    backref='triggered_evolutions')
  PokemonEvolution.party_pokemon = relation(Pokemon,
      primaryjoin=PokemonEvolution.party_pokemon_id==Pokemon.id,
  PokemonEvolution.party_pokemon = relation(Pokemon,
      primaryjoin=PokemonEvolution.party_pokemon_id==Pokemon.id,
-    backref='triggered_evolutions',
-)
+    backref='triggered_evolutions')
  PokemonEvolution.trade_pokemon = relation(Pokemon,
  PokemonEvolution.trade_pokemon = relation(Pokemon,
-    primaryjoin=PokemonEvolution.trade_pokemon_id==Pokemon.id,
-)
-
-PokemonFlavorText.version = relation(Version)
-
-PokemonForm.form_base_pokemon = relation(Pokemon, primaryjoin=PokemonForm.form_base_pokemon_id==Pokemon.id)
-PokemonForm.unique_pokemon = relation(Pokemon, backref=backref('unique_form', uselist=False),
-                                      primaryjoin=PokemonForm.unique_pokemon_id==Pokemon.id)
-PokemonForm.version_group = relation(VersionGroup)
+    primaryjoin=PokemonEvolution.trade_pokemon_id==Pokemon.id)
+
+PokemonFlavorText.version = relation(Version, innerjoin=True, lazy='joined')
+PokemonFlavorText.language = relation(Language, innerjoin=True, lazy='joined')
+
+PokemonForm.form_base_pokemon = relation(Pokemon,
+    primaryjoin=PokemonForm.form_base_pokemon_id==Pokemon.id,
+    innerjoin=True)
+PokemonForm.unique_pokemon = relation(Pokemon,
+    primaryjoin=PokemonForm.unique_pokemon_id==Pokemon.id,
+    backref=backref('unique_form', uselist=False))
+PokemonForm.version_group = relation(VersionGroup,
+    innerjoin=True)
  PokemonForm.form_group = association_proxy('form_base_pokemon', 'form_group')
  PokemonForm.pokeathlon_stats = relation(PokemonFormPokeathlonStat,
  PokemonForm.form_group = association_proxy('form_base_pokemon', 'form_group')
  PokemonForm.pokeathlon_stats = relation(PokemonFormPokeathlonStat,
-                                        order_by=PokemonFormPokeathlonStat.pokeathlon_stat_id,
-                                        backref='pokemon_form')
-
-PokemonFormGroup.pokemon = relation(Pokemon, backref=backref('form_group',
-                                                             uselist=False))
-
-PokemonFormPokeathlonStat.pokeathlon_stat = relation(PokeathlonStat)
-
-PokemonItem.item = relation(Item, backref='pokemon')
-PokemonItem.version = relation(Version)
+    order_by=PokemonFormPokeathlonStat.pokeathlon_stat_id,
+    backref='pokemon_form')
+
+PokemonFormGroup.pokemon = relation(Pokemon,
+    innerjoin=True,
+    backref=backref('form_group', uselist=False))
+
+PokemonFormPokeathlonStat.pokeathlon_stat = relation(PokeathlonStat,
+    innerjoin=True, lazy='joined')
+
+PokemonItem.item = relation(Item,
+    innerjoin=True, lazy='joined',
+    backref='pokemon')
+PokemonItem.version = relation(Version,
+    innerjoin=True, lazy='joined')
+
+PokemonMove.pokemon = relation(Pokemon,
+    innerjoin=True, lazy='joined',
+    backref='pokemon_moves')
+PokemonMove.version_group = relation(VersionGroup,
+    innerjoin=True, lazy='joined')
+PokemonMove.machine = relation(Machine,
+    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,
+    backref='pokemon_moves')
+PokemonMove.move = relation(Move,
+    innerjoin=True, lazy='joined',
+    backref='pokemon_moves')
+PokemonMove.method = relation(PokemonMoveMethod,
+    innerjoin=True, lazy='joined')
  
  
-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)
+PokemonStat.stat = relation(Stat,
+    innerjoin=True, lazy='joined')
  
  
-PokemonStat.stat = relation(Stat)
  
  
-# This is technically a has-many; Generation.main_region_id -> Region.id
  Region.generation = relation(Generation, uselist=False)
  Region.generation = relation(Generation, uselist=False)
-Region.version_group_regions = relation(VersionGroupRegion, backref='region',
-                                        order_by='VersionGroupRegion.version_group_id')
+Region.version_group_regions = relation(VersionGroupRegion,
+    order_by=VersionGroupRegion.version_group_id.asc(),
+    backref='region')
  Region.version_groups = association_proxy('version_group_regions', 'version_group')
  
  Region.version_groups = association_proxy('version_group_regions', 'version_group')
  
-Stat.damage_class = relation(MoveDamageClass, backref='stats')
-
-StatHint.stat = relation(Stat, backref='hints')
-
-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,
-                                         backref='super_contest_combo_second')
-
-Type.damage_efficacies = relation(TypeEfficacy,
-                                  primaryjoin=Type.id
-                                      ==TypeEfficacy.damage_type_id,
-                                  backref='damage_type')
-Type.target_efficacies = relation(TypeEfficacy,
-                                  primaryjoin=Type.id
-                                      ==TypeEfficacy.target_type_id,
-                                  backref='target_type')
-
-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.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')
-
-
-### Add text/prose tables
-
-default_lang = u'en'
-
-def create_translation_table(_table_name, foreign_class,
-    _language_class=Language, **kwargs):
-    """Creates a table that represents some kind of data attached to the given
-    foreign class, but translated across several languages.  Returns the new
-    table's mapped class.
-TODO give it a __table__ or __init__?
-
-    `foreign_class` must have a `__singlename__`, currently only used to create
-    the name of the foreign key column.
-TODO remove this requirement
-
-    Also supports the notion of a default language, which is attached to the
-    session.  This is English by default, for historical and practical reasons.
-
-    Usage looks like this:
-
-        class Foo(Base): ...
-
-        create_translation_table('foo_bars', Foo,
-            name = Column(...),
-        )
-
-        # Now you can do the following:
-        foo.name
-        foo.name_map['en']
-        foo.foo_bars['en']
-
-        foo.name_map['en'] = "new name"
-        del foo.name_map['en']
-
-        q.options(joinedload(Foo.default_translation))
-        q.options(joinedload(Foo.foo_bars))
-
-    In the above example, the following attributes are added to Foo:
  
  
-    - `foo_bars`, a relation to the new table.  It uses a dict-based collection
-      class, where the keys are language identifiers and the values are rows in
-      the created tables.
-    - `foo_bars_local`, a relation to the row in the new table that matches the
-      current default language.
+Stat.damage_class = relation(MoveDamageClass,
+    backref='stats')
  
  
-    Note that these are distinct relations.  Even though the former necessarily
-    includes the latter, SQLAlchemy doesn't treat them as linked; loading one
-    will not load the other.  Modifying both within the same transaction has
-    undefined behavior.
+StatHint.stat = relation(Stat,
+    innerjoin=True,
+    backref='hints')
  
  
-    For each column provided, the following additional attributes are added to
-    Foo:
  
  
-    - `(column)_map`, an association proxy onto `foo_bars`.
-    - `(column)`, an association proxy onto `foo_bars_local`.
+SuperContestCombo.first = relation(Move,
+    primaryjoin=SuperContestCombo.first_move_id==Move.id,
+    innerjoin=True, lazy='joined',
+    backref='super_contest_combo_first')
+SuperContestCombo.second = relation(Move,
+    primaryjoin=SuperContestCombo.second_move_id==Move.id,
+    innerjoin=True, lazy='joined',
+    backref='super_contest_combo_second')
  
  
-    Pardon the naming disparity, but the grammar suffers otherwise.
  
  
-    Modifying these directly is not likely to be a good idea.
-    """
-    # n.b.: _language_class only exists for the sake of tests, which sometimes
-    # want to create tables entirely separate from the pokedex metadata
-
-    foreign_key_name = foreign_class.__singlename__ + '_id'
-    # A foreign key "language_id" will clash with the language_id we naturally
-    # put in every table.  Rename it something else
-    if foreign_key_name == 'language_id':
-        # TODO change language_id below instead and rename this
-        foreign_key_name = 'lang_id'
-
-    Translations = type(_table_name, (object,), {
-        '_language_identifier': association_proxy('language', 'identifier'),
-    })
-    
-    # Create the table object
-    table = Table(_table_name, foreign_class.__table__.metadata,
-        Column(foreign_key_name, Integer, ForeignKey(foreign_class.id),
-            primary_key=True, nullable=False),
-        Column('language_id', Integer, ForeignKey(_language_class.id),
-            primary_key=True, nullable=False),
-    )
-
-    # Add ye columns
-    # Column objects have a _creation_order attribute in ascending order; use
-    # this to get the (unordered) kwargs sorted correctly
-    kwitems = kwargs.items()
-    kwitems.sort(key=lambda kv: kv[1]._creation_order)
-    for name, column in kwitems:
-        column.name = name
-        table.append_column(column)
-
-    # Construct ye mapper
-    mapper(Translations, table, properties={
-        # TODO change to foreign_id
-        'object_id': synonym(foreign_key_name),
-        # TODO change this as appropriate
-        'language': relation(_language_class,
-            primaryjoin=table.c.language_id == _language_class.id,
-            lazy='joined',
-            innerjoin=True),
-        # TODO does this need to join to the original table?
-    })
-
-    # Add full-table relations to the original class
-    # Class.foo_bars
-    setattr(foreign_class, _table_name, relation(Translations,
-        primaryjoin=foreign_class.id == Translations.object_id,
-        collection_class=attribute_mapped_collection('language'),
-        # TODO
-        lazy='select',
-    ))
-    # Class.foo_bars_local
-    # This is a bit clever; it uses bindparam() to make the join clause
-    # modifiable on the fly.  db sessions know the current language identifier
-    # populates the bindparam.
-    local_relation_name = _table_name + '_local'
-    setattr(foreign_class, local_relation_name, relation(Translations,
-        primaryjoin=and_(
-            foreign_class.id == Translations.object_id,
-            Translations._language_identifier ==
-                bindparam('_default_language', required=True),
-        ),
-        uselist=False,
-        # TODO MORESO HERE
-        lazy='select',
-    ))
-
-    # Add per-column proxies to the original class
-    for name, column in kwitems:
-        # Class.(column) -- accessor for the default language's value
-        setattr(foreign_class, name,
-            association_proxy(local_relation_name, name))
-
-        # Class.(column)_map -- accessor for the language dict
-        # Need a custom creator since Translations doesn't have an init, and
-        # these are passed as *args anyway
-        def creator(language, value):
-            row = Translations()
-            row.language = language
-            setattr(row, name, value)
-            return row
-        setattr(foreign_class, name + '_map',
-            association_proxy(_table_name, name, creator=creator))
-
-    # Done
-    return Translations
-
-def makeTextTable(foreign_table_class, table_suffix_plural, table_suffix_singular, columns, lazy, Language=Language):
-    # With "Language", we'd have two language_id. So, rename one to 'lang'
-    foreign_key_name = foreign_table_class.__singlename__
-    if foreign_key_name == 'language':
-        foreign_key_name = 'lang'
-
-    table_name = foreign_table_class.__singlename__ + '_' + table_suffix_plural
-
-    class TranslatedStringsTable(object):
-        __tablename__ = table_name
-        _attrname = table_suffix_plural
-        _language_identifier = association_proxy('language', 'identifier')
-
-    for column_name, column_name_plural, column in columns:
-        column.name = column_name
-        if not column.nullable:
-            # A Python side default value, so that the strings can be set
-            # one by one without the DB complaining about missing values
-            column.default = ColumnDefault(u'')
-
-    table = Table(table_name, foreign_table_class.__table__.metadata,
-            Column(foreign_key_name + '_id', Integer, ForeignKey(foreign_table_class.id),
-                    primary_key=True, nullable=False),
-            Column('language_id', Integer, ForeignKey(Language.id),
-                    primary_key=True, index=True, nullable=False),
-            *(column for name, plural, column in columns)
-        )
-
-    mapper(TranslatedStringsTable, table,
-        properties={
-            "object_id": synonym(foreign_key_name + '_id'),
-            "language": relation(Language,
-                primaryjoin=table.c.language_id == Language.id,
-            ),
-            foreign_key_name: relation(foreign_table_class,
-                primaryjoin=(foreign_table_class.id == table.c[foreign_key_name + "_id"]),
-                backref=backref(table_suffix_plural,
-                    collection_class=attribute_mapped_collection('_language_identifier'),
-                    lazy=lazy,
-                ),
-            ),
-        },
-    )
-
-    # The relation to the object
-    TranslatedStringsTable.object = getattr(TranslatedStringsTable, foreign_key_name)
-
-    # Link the tables themselves, so we can get them if needed
-    TranslatedStringsTable.foreign_table_class = foreign_table_class
-    setattr(foreign_table_class, table_suffix_singular + '_table', TranslatedStringsTable)
-
-    for column_name, column_name_plural, column in columns:
-        # Provide a property with all the names, and an English accessor
-        # for backwards compatibility
-        def text_string_creator(language_code, string):
-            row = TranslatedStringsTable()
-            row._language_identifier = language_code
-            setattr(row, column_name, string)
-            return row
-
-        setattr(foreign_table_class, column_name_plural,
-            association_proxy(table_suffix_plural, column_name, creator=text_string_creator))
-        setattr(foreign_table_class, column_name, DefaultLangProperty(column_name_plural))
+Type.damage_efficacies = relation(TypeEfficacy,
+    primaryjoin=Type.id==TypeEfficacy.damage_type_id,
+    backref=backref('damage_type', innerjoin=True, lazy='joined'))
+Type.target_efficacies = relation(TypeEfficacy,
+    primaryjoin=Type.id==TypeEfficacy.target_type_id,
+    backref=backref('target_type', innerjoin=True, lazy='joined'))
  
  
-        if column_name == 'name':
-            foreign_table_class.name_table = TranslatedStringsTable
+Type.generation = relation(Generation,
+    innerjoin=True,
+    backref='types')
+Type.damage_class = relation(MoveDamageClass,
+    backref='types')
  
  
-    compile_mappers()
-    return TranslatedStringsTable
  
  
-class DefaultLangProperty(object):
-    def __init__(self, column_name):
-        self.column_name = column_name
+Version.generation = association_proxy('version_group', 'generation')
  
  
-    def __get__(self, instance, cls):
-        if instance:
-            return getattr(instance, self.column_name)[default_lang]
-        else:
-            # TODO I think this is kind of broken
-            return getattr(cls, self.column_name)[default_lang]
-
-    def __set__(self, instance, value):
-        getattr(instance, self.colname)[default_lang] = value
-
-    def __delete__(self, instance):
-        del getattr(instance, self.colname)[default_lang]
-
-for table in list(table_classes):
-    # Find all the language-specific columns, keeping them in the order they
-    # were defined
-    all_columns = []
-    for colname in dir(table):
-        column = getattr(table, colname)
-        if isinstance(column, LanguageSpecificColumn):
-            all_columns.append((colname, column))
-            delattr(table, colname)
-    all_columns.sort(key=lambda pair: pair[1].order)
-
-    # Break them into text and prose columns
-    text_columns = []
-    prose_columns = []
-    for colname, column in all_columns:
-        spec = colname, column.plural, column.makeSAColumn()
-        if isinstance(column, TextColumn):
-            text_columns.append(spec)
-        elif isinstance(column, ProseColumn):
-            prose_columns.append(spec)
-
-    if (text_columns or prose_columns) and issubclass(table, LanguageSpecific):
-        raise AssertionError("Language-specific table %s shouldn't have explicit language-specific columns" % table)
-
-    if text_columns:
-        string_table = makeTextTable(table, 'texts', 'text', text_columns, lazy=False)
-    if prose_columns:
-        string_table = makeTextTable(table, 'prose', 'prose', prose_columns, lazy='select')
-
-### Add language relations
-for table in list(table_classes):
-    if issubclass(table, LanguageSpecific):
-        table.language = relation(Language, primaryjoin=table.language_id == Language.id)
-
-Move.effect = DefaultLangProperty('effects')
-Move.effects = markdown.MoveEffectsProperty('effect')
-Move.short_effect = DefaultLangProperty('short_effects')
-Move.short_effects = markdown.MoveEffectsProperty('short_effect')
-
-MoveChangelog.effect = DefaultLangProperty('effects')
-MoveChangelog.effects = markdown.MoveEffectsProperty('effect')
-MoveChangelog.short_effect = DefaultLangProperty('short_effects')
-MoveChangelog.short_effects = markdown.MoveEffectsProperty('short_effect')
+VersionGroup.versions = relation(Version,
+    innerjoin=True,
+    order_by=Version.id,
+    backref=backref('version_group', lazy='joined'))
+VersionGroup.generation = relation(Generation,
+    innerjoin=True, lazy='joined',
+    backref='version_groups')
+VersionGroup.version_group_regions = relation(VersionGroupRegion,
+    backref='version_group')
+VersionGroup.regions = association_proxy('version_group_regions', 'region')