-import pkg_resources
-
from sqlalchemy import MetaData, Table, create_engine, orm
+from ..defaults import get_default_db_uri
from .tables import metadata
-def connect(uri=None, **kwargs):
+
+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
Calling this function also binds the metadata object to the created engine.
"""
- # Default to a URI within the package, which was hopefully created at some point
- 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 = get_default_db_uri()
### Do some fixery for MySQL
if uri[0:5] == 'mysql':
table.kwargs['mysql_charset'] = 'utf8'
### Connect
- engine = create_engine(uri)
+ engine = create_engine(uri, **engine_args)
conn = engine.connect()
metadata.bind = engine
- session_args = dict(autoflush=True, autocommit=False, bind=engine)
- session_args.update(kwargs)
- sm = orm.sessionmaker(**session_args)
+ 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