Merge remote-tracking branch 'origin/encukou'

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

diff --git a/pokedex/db/__init__.py b/pokedex/db/__init__.py
index 13e9a19..a6c8f6e 100644 (file)
--- a/pokedex/db/__init__.py
+++ b/pokedex/db/__init__.py
@@ -2,6 +2,7 @@ from sqlalchemy import MetaData, Table, engine_from_config, orm
 
 from ..defaults import get_default_db_uri
 from .tables import metadata
 
 from ..defaults import get_default_db_uri
 from .tables import metadata

+from .multilang import MultilangSession

 
 
 def connect(uri=None, session_args={}, engine_args={}, engine_prefix=''):
 
 
 def connect(uri=None, session_args={}, engine_args={}, engine_prefix=''):


@@ -40,7 +41,7 @@ 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)
 
     all_session_args = dict(autoflush=True, autocommit=False, bind=engine)
     all_session_args.update(session_args)

-    sm = orm.sessionmaker(**all_session_args)
+    sm = orm.sessionmaker(class_=MultilangSession, **all_session_args)

     session = orm.scoped_session(sm)
 
     return session
     session = orm.scoped_session(sm)
 
     return session