X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/40f283a7a673d7e52cd13c29ebecea8a4e370ed4..55758f863e5137fd44e4b43f3c2a63005177f08c:/pokedex/db/multilang.py?ds=sidebyside

diff --git a/pokedex/db/multilang.py b/pokedex/db/multilang.py
index 6690b8a..7e2840f 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,56 +155,38 @@ 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.
+
+    Needs to be used with `MultilangScopedSession`, below.
+    """
+    default_language_id = None
 
     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
-        super(MultilangSession, self).__init__(*args, **kwargs)
+        if 'default_language_id' in kwargs:
+            self.default_language_id = kwargs.pop('default_language_id')
 
-    @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()
-
-    @default_language.setter
-    def default_language(self, new):
-        self._default_language_id = new.id
-
-    @default_language.deleter
-    def default_language(self):
-        try:
-            del self._default_language_id
-        except AttributeError:
-            pass
+        super(MultilangSession, self).__init__(*args, **kwargs)
 
     def execute(self, clause, params=None, *args, **kwargs):
         if not params:
             params = {}
-        params.setdefault('_default_language_id', self._default_language_id)
+        params.setdefault('_default_language_id', self.default_language_id)
+
         return super(MultilangSession, self).execute(
             clause, params, *args, **kwargs)
 
 class MultilangScopedSession(ScopedSession):
     """Dispatches language selection to the attached Session."""
 
-    @property
-    def default_language(self):
-        return self.registry().default_language
-
-    @default_language.setter
-    def default_language(self, new):
-        self.registry().default_language = new
+    def __init__(self, *args, **kwargs):
+        super(MultilangScopedSession, self).__init__(*args, **kwargs)
 
-    def remove(self):
-        del self.registry().default_language
-        super(MultilangScopedSession, self).remove()
+    @property
+    def default_language_id(self):
+        """Passes the new default language id through to the current session.
+        """
+        return self.registry().default_language_id
+
+    @default_language_id.setter
+    def default_language_id(self, new):
+        self.registry().default_language_id = new