Munna Black flavor text. #449

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

diff --git a/pokedex/db/__init__.py b/pokedex/db/__init__.py
index 0641391..5230508 100644 (file)
--- a/pokedex/db/__init__.py
+++ b/pokedex/db/__init__.py
@@ -1,13 +1,22 @@
 from sqlalchemy import MetaData, Table, create_engine, orm
 
+from ..defaults import get_default_db_uri
 from .tables import metadata
 
-def connect(uri):
+
+def connect(uri=None, session_args={}, engine_args={}):
     """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.
     """
 
+    # If we didn't get a uri, fall back to the default
+    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
@@ -15,16 +24,20 @@ def connect(uri):
         if 'charset' not in uri:
             uri += '?charset=utf8'
 
-        # Tables should be InnoDB, in the event that we're creating them
+        # Tables should be InnoDB, in the event that we're creating them, and
+        # use UTF-8 goddammit!
         for table in metadata.tables.values():
             table.kwargs['mysql_engine'] = 'InnoDB'
+            table.kwargs['mysql_charset'] = 'utf8'
 
     ### Connect
-    engine = create_engine(uri)
+    engine = create_engine(uri, **engine_args)
     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(**all_session_args)
     session = orm.scoped_session(sm)
 
     return session