X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/40f283a7a673d7e52cd13c29ebecea8a4e370ed4..83ed5481733cc7bb6f70de22a44654b128ca0f7a:/pokedex/db/multilang.py

diff --git a/pokedex/db/multilang.py b/pokedex/db/multilang.py
index 6690b8a..d58f6df 100644
--- a/pokedex/db/multilang.py
+++ b/pokedex/db/multilang.py
@@ -99,7 +99,8 @@ def create_translation_table(_table_name, foreign_class, relation_name,
         'foreign_id': synonym(foreign_key_name),
         'local_language': relationship(language_class,
             primaryjoin=table.c.local_language_id == language_class.id,
-            innerjoin=True),
+            innerjoin=True,
+            lazy='joined'),
     })
 
     # Add full-table relations to the original class
@@ -154,26 +155,22 @@ def create_translation_table(_table_name, foreign_class, relation_name,
     return Translations
 
 class MultilangSession(Session):
-    """A tiny Session subclass that adds support for a default language."""
-    _default_language_id = 9  # English.  XXX magic constant
+    """A tiny Session subclass that adds support for a default language.
+
+    Caller will need to assign something to `default_language` before this will
+    actually work.
+    """
+    _default_language_id = 0  # Better fill this in, caller
 
     def __init__(self, *args, **kwargs):
-        try:
-            self.language_class = kwargs.pop('language_class')
-        except KeyError:
-            # Set the default language_class
-            # We need to import here, to prevent a circular depencency
-            from pokedex.db.tables import Language
-            self.language_class = Language
+        self.language_class = kwargs.pop('language_class')
         super(MultilangSession, self).__init__(*args, **kwargs)
 
     @property
     def default_language(self):
-        # Need to import tables here to avoid a circular dependency
-        from pokedex.db import tables
-        query = self.query(self.language_class)
-        query = query.filter_by(id=self._default_language_id)
-        return query.one()
+        return self.query(self.language_class) \
+            .filter_by(id=self._default_language_id) \
+            .one()
 
     @default_language.setter
     def default_language(self, new):
@@ -203,7 +200,3 @@ class MultilangScopedSession(ScopedSession):
     @default_language.setter
     def default_language(self, new):
         self.registry().default_language = new
-
-    def remove(self):
-        del self.registry().default_language
-        super(MultilangScopedSession, self).remove()