1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/2ed7d87b4ddd/ Changeset: 2ed7d87b4ddd Branch: next-stable User: dan Date: 2014-05-20 16:32:13 Summary: Fix for reports app's default database/sqlite settings. Most of the reports app will still not work with sqlite however. Affected #: 2 files

diff -r f3948f90b9002ae47f0941b0e39cb63d122415a3 -r 2ed7d87b4ddda2f32eb9d6fc8c05d74667842fef lib/galaxy/webapps/reports/app.py --- a/lib/galaxy/webapps/reports/app.py +++ b/lib/galaxy/webapps/reports/app.py @@ -15,7 +15,7 @@ if self.config.database_connection: db_url = self.config.database_connection else: - db_url = "sqlite://%s?isolation_level=IMMEDIATE" % self.config.database + db_url = "sqlite:///%s?isolation_level=IMMEDIATE" % self.config.database # Setup the database engine and ORM self.model = galaxy.model.mapping.init( self.config.file_path, db_url,

diff -r f3948f90b9002ae47f0941b0e39cb63d122415a3 -r 2ed7d87b4ddda2f32eb9d6fc8c05d74667842fef lib/galaxy/webapps/reports/config.py --- a/lib/galaxy/webapps/reports/config.py +++ b/lib/galaxy/webapps/reports/config.py @@ -19,7 +19,7 @@ self.config_dict = kwargs self.root = kwargs.get( 'root_dir', '.' ) # Database related configuration - self.database = resolve_path( kwargs.get( "database_file", "database/universe.d" ), self.root ) + self.database = resolve_path( kwargs.get( "database_file", "database/universe.sqlite" ), self.root ) self.database_connection = kwargs.get( "database_connection", False ) self.database_engine_options = get_database_engine_options( kwargs ) # Where dataset files are stored

Repository URL: https://bitbucket.org/galaxy/galaxy-central/

--

This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.