Merge pull request #31 from fact-project/database_name

Database name

Author: maxnoe

fact/credentials/__init__.py

@@ -49,17 +49,21 @@ def get_credentials():
     return config
 
 
-def create_factdb_engine():
+def create_factdb_engine(database=None):
     '''
     returns a sqlalchemy.Engine pointing to the factdata database
 
     The different hostname on isdc machines is handled correctly.
     '''
+    spec = 'mysql+pymysql://{user}:{password}@{host}/{database}'
+
     creds = get_credentials()
+    config = dict(creds['database'])
 
     if socket.gethostname().startswith('isdc'):
-        spec = 'mysql+pymysql://{user}:{password}@lp-fact/{database}'
-    else:
-        spec = 'mysql+pymysql://{user}:{password}@{host}/{database}'
+        config['host'] = 'lp-fact'
+
+    if database is not None:
+        config['database'] = database
 
-    return create_engine(spec.format(**creds['database']))
+    return create_engine(spec.format(**config))

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name='pyfact',
-    version='0.8.2',
+    version='0.8.3',
     description='A module containing useful methods for working with fact',
     url='http://github.com/fact-project/pyfact',
     author='Maximilian Noethe, Dominik Neise',