Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-12-26 07:39:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't assume db conn is a Context Manager.

Browse Source 
Twisted adbapi wrapped connections aren't context managers.
This commit is contained in:
Erik Johnston 2015-03-04 14:03:21 +00:00
parent 5eefd1f618
commit 16dd87d848
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/storage/__init__.py
View File

@ -583,7 +583,7 @@ 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.
""" """
with db_conn: try:
cur = db_conn.cursor() cur = db_conn.cursor()
version_info = _get_or_create_schema_state(cur) version_info = _get_or_create_schema_state(cur)
@ -596,6 +596,10 @@ def prepare_database(db_conn):
cur.execute("PRAGMA user_version = %d" % (SCHEMA_VERSION,)) cur.execute("PRAGMA user_version = %d" % (SCHEMA_VERSION,))
cur.close() cur.close()
db_conn.commit()
except:
db_conn.rollback()
raise
def _setup_new_database(cur): def _setup_new_database(cur):