scl/szurubooru
1
0
Fork 0
mirror of https://github.com/rr-/szurubooru.git synced 2025-07-17 08:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

server/db: allow full DSN; use memdb in tests

Browse Source 
The earlier commit is still relevant as it allows to integrate real
database when needed.
This commit is contained in:
rr-
2016-08-15 19:55:03 +02:00
parent e688f39887
commit 6c29377f6b
6 changed files with 15 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/szurubooru/db/session.py
View File

@ -19,14 +19,7 @@ class QueryCounter(object):
def create_session():
_engine = sqlalchemy.create_engine(
'{schema}://{user}:{password}@{host}:{port}/{name}'.format(
schema=config.config['database']['schema'],
user=config.config['database']['user'],
password=config.config['database']['pass'],
host=config.config['database']['host'],
port=config.config['database']['port'],
name=config.config['database']['name']))
_engine = sqlalchemy.create_engine(config.config['database'])
sqlalchemy.event.listen(
_engine, 'after_execute', lambda *args: QueryCounter.bump())
_session_maker = sqlalchemy.orm.sessionmaker(bind=_engine)

6
server/szurubooru/facade.py
View File

@ -68,10 +68,8 @@ def validate_config():
raise errors.ConfigError(
'data_dir must be an absolute path')
for key in ['schema', 'host', 'port', 'user', 'pass', 'name']:
if not config.config['database'][key]:
raise errors.ConfigError(
'Database is not configured: %r is missing' % key)
if not config.config['database']:
raise errors.ConfigError('Database is not configured')
def create_app():

10
server/szurubooru/migrations/env.py
View File

@ -16,15 +16,7 @@ alembic_config = alembic.context.config
logging.config.fileConfig(alembic_config.config_file_name)
szuru_config = szurubooru.config.config
alembic_config.set_main_option(
'sqlalchemy.url',
'{schema}://{user}:{password}@{host}:{port}/{name}'.format(
schema=szuru_config['database']['schema'],
user=szuru_config['database']['user'],
password=szuru_config['database']['pass'],
host=szuru_config['database']['host'],
port=szuru_config['database']['port'],
name=szuru_config['database']['name']))
alembic_config.set_main_option('sqlalchemy.url', szuru_config['database'])
target_metadata = szurubooru.db.Base.metadata

11
server/szurubooru/tests/conftest.py
View File

@ -31,18 +31,11 @@ class QueryCounter(object):
return self._statements
if not config.config['test_database']['host']:
if not config.config['test_database']:
raise RuntimeError('Test database not configured.')
_query_counter = QueryCounter()
_engine = sqlalchemy.create_engine(
'{schema}://{user}:{password}@{host}:{port}/{name}'.format(
schema=config.config['test_database']['schema'],
user=config.config['test_database']['user'],
password=config.config['test_database']['pass'],
host=config.config['test_database']['host'],
port=config.config['test_database']['port'],
name=config.config['test_database']['name']))
_engine = sqlalchemy.create_engine(config.config['test_database'])
db.Base.metadata.drop_all(bind=_engine)
db.Base.metadata.create_all(bind=_engine)
sqlalchemy.event.listen(