commit/galaxy-central: dan: merge next-stable
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/37509e01ee5d/ Changeset: 37509e01ee5d User: dan Date: 2014-05-20 16:32:31 Summary: merge next-stable Affected #: 2 files diff -r a968515e0a3128b39d2e5290d7d15559ae38ca44 -r 37509e01ee5db4b0552537c77f3771b9671e5dae 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 a968515e0a3128b39d2e5290d7d15559ae38ca44 -r 37509e01ee5db4b0552537c77f3771b9671e5dae 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.
participants (1)
-
commits-noreply@bitbucket.org