X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/47218a7fb65bb2ad2e1c0808d4a2c56046f3740b..2a8dec47ae303c6b011d8b71e8e096a602518e23:/pokedex/db/__init__.py

diff --git a/pokedex/db/__init__.py b/pokedex/db/__init__.py
index e8976c4..e2790da 100644
--- a/pokedex/db/__init__.py
+++ b/pokedex/db/__init__.py
@@ -1,11 +1,11 @@
-import os
-import pkg_resources
-
-from sqlalchemy import MetaData, Table, create_engine, orm
+from sqlalchemy import MetaData, Table, engine_from_config, orm
 
+from ..defaults import get_default_db_uri
 from .tables import metadata
+from .multilang import MultilangSession, MultilangScopedSession
+
 
-def connect(uri=None, session_args={}, engine_args={}):
+def connect(uri=None, session_args={}, engine_args={}, engine_prefix=''):
     """Connects to the requested URI.  Returns a session object.
 
     With the URI omitted, attempts to connect to a default SQLite database
@@ -14,14 +14,11 @@ def connect(uri=None, session_args={}, engine_args={}):
     Calling this function also binds the metadata object to the created engine.
     """
 
-    # Fall back to the environment, then a URI within the package
-    if not uri:
-        uri = os.environ.get('POKEDEX_DB_ENGINE', None)
-
-    if not uri:
-        sqlite_path = pkg_resources.resource_filename('pokedex',
-                                                      'data/pokedex.sqlite')
-        uri = 'sqlite:///' + sqlite_path
+    # If we didn't get a uri, fall back to the default
+    if uri is None:
+        uri = engine_args.get(engine_prefix + 'url', None)
+    if uri is None:
+        uri = get_default_db_uri()
 
     ### Do some fixery for MySQL
     if uri[0:5] == 'mysql':
@@ -37,13 +34,14 @@ def connect(uri=None, session_args={}, engine_args={}):
             table.kwargs['mysql_charset'] = 'utf8'
 
     ### Connect
-    engine = create_engine(uri, **engine_args)
+    engine_args[engine_prefix + 'url'] = uri
+    engine = engine_from_config(engine_args, prefix=engine_prefix)
     conn = engine.connect()
     metadata.bind = engine
 
     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, **all_session_args)
+    session = MultilangScopedSession(sm)
 
     return session