Remove the responsibility of setting a default language from multilang.

[zzz-pokedex.git] / pokedex / db / __init__.py

diff --git a/pokedex/db/__init__.py b/pokedex/db/__init__.py
index 0da8713..ea103e7 100644 (file)
--- a/pokedex/db/__init__.py
+++ b/pokedex/db/__init__.py
@@ -1,7 +1,8 @@
-from sqlalchemy import MetaData, Table, engine_from_config, orm
+from sqlalchemy import engine_from_config, orm
 
 from ..defaults import get_default_db_uri
-from .tables import metadata
+from .tables import Language, metadata
+from .multilang import MultilangSession, MultilangScopedSession
 
 
 def connect(uri=None, session_args={}, engine_args={}, engine_prefix=''):
@@ -15,7 +16,7 @@ def connect(uri=None, session_args={}, engine_args={}, engine_prefix=''):
 
     # If we didn't get a uri, fall back to the default
     if uri is None:
-        uri = engine_args[engine_prefix + 'url']
+        uri = engine_args.get(engine_prefix + 'url', None)
     if uri is None:
         uri = get_default_db_uri()
 
@@ -40,7 +41,13 @@ def connect(uri=None, session_args={}, engine_args={}, engine_prefix=''):
 
     all_session_args = dict(autoflush=True, autocommit=False, bind=engine)
     all_session_args.update(session_args)
-    sm = orm.sessionmaker(**all_session_args)
-    session = orm.scoped_session(sm)
+    sm = orm.sessionmaker(class_=MultilangSession, language_class=Language,
+        **all_session_args)
+    session = MultilangScopedSession(sm)
+
+    # Default to English
+    session.default_language = session.query(Language) \
+        .filter_by(identifier=u'en') \
+        .one()
 
     return session