Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use context manager with db conn to correctly commit and rollback

This commit is contained in:
Erik Johnston 2015-03-04 13:43:17 +00:00
parent 8c8354e85a
commit 640e53935d
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
synapse/storage/__init__.py
View File

@ -55,7 +55,7 @@ import re
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# Remember to update this number every time an change is made to database # Remember to update this number every time a change is made to database
# schema files, so the users will be informed on server restarts. # schema files, so the users will be informed on server restarts.
SCHEMA_VERSION = 14 SCHEMA_VERSION = 14
@ -583,19 +583,19 @@ def prepare_database(db_conn):
"""Prepares a database for usage. Will either create all necessary tables """Prepares a database for usage. Will either create all necessary tables
or upgrade from an older schema version. or upgrade from an older schema version.
""" """
cur = db_conn.cursor() with db_conn:
version_info = _get_or_create_schema_state(cur) cur = db_conn.cursor()
version_info = _get_or_create_schema_state(cur)
if version_info: if version_info:
user_version, delta_files, upgraded = version_info user_version, delta_files, upgraded = version_info
_upgrade_existing_database(cur, user_version, delta_files, upgraded) _upgrade_existing_database(cur, user_version, delta_files, upgraded)
else: else:
_setup_new_database(cur) _setup_new_database(cur)
cur.execute("PRAGMA user_version = %d" % (SCHEMA_VERSION,)) cur.execute("PRAGMA user_version = %d" % (SCHEMA_VERSION,))
db_conn.commit()
cur.close() cur.close()
def _setup_new_database(cur): def _setup_new_database(cur):