mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Fix create_db.sh
Broken in commit d34142e420 .
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 <module>
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'
```
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user