X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/bad044d1d8753cf96a3cf0dc2236ffcb416dcc47..abf31f8e520d12b53f1aba5405b202af09d56aca:/pokedex/db/__init__.py diff --git a/pokedex/db/__init__.py b/pokedex/db/__init__.py index 0641391..9e1b38c 100644 --- a/pokedex/db/__init__.py +++ b/pokedex/db/__init__.py @@ -1,13 +1,24 @@ +import pkg_resources + from sqlalchemy import MetaData, Table, create_engine, orm 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. """ + # 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 + ### Do some fixery for MySQL if uri[0:5] == 'mysql': # MySQL uses latin1 for connections by default even if the server is @@ -15,16 +26,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