From: Eevee <git@veekun.com>
Date: Wed, 6 Apr 2011 04:04:32 +0000 (-0700)
Subject: Merge branch 'encukou'
X-Git-Tag: veekun-promotions/2011041101~8
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/a04865183fefdd58b0de1cea7c69a9b04a408e53?hp=20b21d990ddf15995d05c64f6f354db0bad33b88

Merge branch 'encukou'
---

diff --git a/pokedex/db/multilang.py b/pokedex/db/multilang.py
index bd4266f..3274f61 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