Merge branch 'schema-sanity'

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

diff --git a/pokedex/db/__init__.py b/pokedex/db/__init__.py
index c9b739d..a6c8f6e 100644 (file)
--- a/pokedex/db/__init__.py
+++ b/pokedex/db/__init__.py
@@ -1,13 +1,25 @@
-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 .tables import metadata

+from .multilang import MultilangSession

 
 

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

     """Connects to the requested URI.  Returns a session object.
 
     """Connects to the requested URI.  Returns a session object.
 

+    With the URI omitted, attempts to connect to a default SQLite database
+    contained within the package directory.
+

     Calling this function also binds the metadata object to the created engine.
     """
 
     Calling this function also binds the metadata object to the created engine.
     """
 

+    # 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':
         # MySQL uses latin1 for connections by default even if the server is
     ### Do some fixery for MySQL
     if uri[0:5] == 'mysql':
         # MySQL uses latin1 for connections by default even if the server is


@@ -22,11 +34,14 @@ def connect(uri):
             table.kwargs['mysql_charset'] = 'utf8'
 
     ### Connect
             table.kwargs['mysql_charset'] = 'utf8'
 
     ### Connect

-    engine = create_engine(uri)
+    engine_args[engine_prefix + 'url'] = uri
+    engine = engine_from_config(engine_args, prefix=engine_prefix)

     conn = engine.connect()
     metadata.bind = engine
 
     conn = engine.connect()
     metadata.bind = engine
 

-    sm = orm.sessionmaker(autoflush=True, autocommit=False, bind=engine)
+    all_session_args = dict(autoflush=True, autocommit=False, bind=engine)
+    all_session_args.update(session_args)
+    sm = orm.sessionmaker(class_=MultilangSession, **all_session_args)

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