From 6de82ed5311d2c656f0f9f86ca52fee2b427db2a Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Wed, 14 Aug 2019 04:45:02 +0100 Subject: [PATCH] Fix create_db.sh Broken in commit d34142e4203880393431d471a43b87e95980579e . Traceback: ``` $ rm -f database/universe.sqlite && sqlite3 database/universe.sqlite 'VACUUM;' && ./create_db.sh Activating virtualenv at .venv Traceback (most recent call last): File "./scripts/create_db.py", line 44, in invoke_create() File "./scripts/create_db.py", line 36, in invoke_create create_db(config['db_url'], config['config_file']) File "/opt/galaxy/lib/galaxy/model/migrate/check.py", line 74, in create_or_verify_database elif getattr(app.config, 'database_auto_migrate', False): AttributeError: 'NoneType' object has no attribute 'config' ``` --- lib/galaxy/model/migrate/check.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/model/migrate/check.py b/lib/galaxy/model/migrate/check.py index 07849a64a7f..0feaaefa789 100644 --- a/lib/galaxy/model/migrate/check.py +++ b/lib/galaxy/model/migrate/check.py @@ -62,16 +62,16 @@ def create_or_verify_database(url, galaxy_config_file, engine_options={}, app=No migrate_to_current_version(engine, db_schema) meta = MetaData(bind=engine) - if new_database and app: + if new_database: log.info("Creating new database from scratch, skipping migrations") current_version = migrate_repository.version().version - mapping.init(file_path=app.config.file_path, url=url, map_install_models=map_install_models, create_tables=True) + mapping.init(file_path='/tmp', url=url, map_install_models=map_install_models, create_tables=True) schema.ControlledSchema.create(engine, migrate_repository, version=current_version) db_schema = schema.ControlledSchema(engine, migrate_repository) assert db_schema.version == current_version migrate() return - elif getattr(app.config, 'database_auto_migrate', False): + elif app and getattr(app.config, 'database_auto_migrate', False): migrate() return