Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-10-01 11:49:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Postgres does not allow you to continue using a cursor after a DB exception has been raised, so move _simple_insert or_ignore flag out of transaction

Browse Source
This commit is contained in:
Erik Johnston 2015-04-15 14:51:21 +01:00
parent bc6cef823f
commit 4af32a2817
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
synapse/storage/_base.py
View File

@ -388,6 +388,7 @@ class SQLBaseStore(object):
# "Simple" SQL API methods that operate on a single table with no JOINs, # "Simple" SQL API methods that operate on a single table with no JOINs,
# no complex WHERE clauses, just a dict of values for columns. # no complex WHERE clauses, just a dict of values for columns.
@defer.inlineCallbacks
def _simple_insert(self, table, values, or_ignore=False, def _simple_insert(self, table, values, or_ignore=False,
desc="_simple_insert"): desc="_simple_insert"):
"""Executes an INSERT query on the named table. """Executes an INSERT query on the named table.
@ -396,14 +397,20 @@ class SQLBaseStore(object):
table : string giving the table name table : string giving the table name
values : dict of new column names and values for them values : dict of new column names and values for them
""" """
return self.runInteraction( try:
yield self.runInteraction(
desc, desc,
self._simple_insert_txn, table, values, self._simple_insert_txn, table, values,
or_ignore=or_ignore or_ignore=or_ignore
) )
except self.database_engine.module.IntegrityError:
# We have to do or_ignore flag at this layer, since we can't reuse
# a cursor after we receive an error from the db.
if not or_ignore:
raise
@log_function @log_function
def _simple_insert_txn(self, txn, table, values, or_ignore=False): def _simple_insert_txn(self, txn, table, values):
sql = "INSERT INTO %s (%s) VALUES(%s)" % ( sql = "INSERT INTO %s (%s) VALUES(%s)" % (
table, table,
", ".join(k for k in values), ", ".join(k for k in values),
@ -415,11 +422,7 @@ class SQLBaseStore(object):
sql, values.values(), sql, values.values(),
) )
try:
txn.execute(sql, values.values()) txn.execute(sql, values.values())
except self.database_engine.module.IntegrityError:
if not or_ignore:
raise
def _simple_upsert(self, table, keyvalues, values, desc="_simple_upsert"): def _simple_upsert(self, table, keyvalues, values, desc="_simple_upsert"):
""" """