Merge branch 'sqlite-ground-up' of ssh://git.vsnt.uk:2222/viveksantayana/ska-referee-test into sqlite-ground-up
This commit is contained in:
commit
2a3927a140
@ -22,8 +22,13 @@ def install_scripts():
|
|||||||
if not database_exists(Config.SQLALCHEMY_DATABASE_URI):
|
if not database_exists(Config.SQLALCHEMY_DATABASE_URI):
|
||||||
create_database(Config.SQLALCHEMY_DATABASE_URI)
|
create_database(Config.SQLALCHEMY_DATABASE_URI)
|
||||||
write('system.log', 'No database found. Creating a new database.')
|
write('system.log', 'No database found. Creating a new database.')
|
||||||
|
<<<<<<< HEAD
|
||||||
with app.app_context(): db.create_all()
|
with app.app_context(): db.create_all()
|
||||||
write('system.log', 'Creating database schema.')
|
write('system.log', 'Creating database schema.')
|
||||||
|
=======
|
||||||
|
with app.app_context(): db.create_all()
|
||||||
|
write('system.log', 'Creating database schema.')
|
||||||
|
>>>>>>> dd8685b1039a6bdcbe1df0b07c2ef5d72399c876
|
||||||
if not path.isfile(f'./{data}/.encryption.key'):
|
if not path.isfile(f'./{data}/.encryption.key'):
|
||||||
write('system.log', 'No encryption key found. Generating new encryption key.')
|
write('system.log', 'No encryption key found. Generating new encryption key.')
|
||||||
with open(f'./{data}/.encryption.key', 'wb') as key_file:
|
with open(f'./{data}/.encryption.key', 'wb') as key_file:
|
||||||
|
1
ref-test/data/.gitignore
vendored
Normal file
1
ref-test/data/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
*
|
Loading…
Reference in New Issue
Block a user