mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 23:10:20 +00:00
Implement or_ignore flag on inserts
This commit is contained in:
parent
304111afd0
commit
c8d3f6486d
2 changed files with 10 additions and 4 deletions
|
@ -393,7 +393,8 @@ class SQLBaseStore(object):
|
|||
# "Simple" SQL API methods that operate on a single table with no JOINs,
|
||||
# no complex WHERE clauses, just a dict of values for columns.
|
||||
|
||||
def _simple_insert(self, table, values, desc="_simple_insert"):
|
||||
def _simple_insert(self, table, values, or_ignore=False,
|
||||
desc="_simple_insert"):
|
||||
"""Executes an INSERT query on the named table.
|
||||
|
||||
Args:
|
||||
|
@ -403,10 +404,11 @@ class SQLBaseStore(object):
|
|||
return self.runInteraction(
|
||||
desc,
|
||||
self._simple_insert_txn, table, values,
|
||||
or_ignore=or_ignore
|
||||
)
|
||||
|
||||
@log_function
|
||||
def _simple_insert_txn(self, txn, table, values):
|
||||
def _simple_insert_txn(self, txn, table, values, or_ignore=False):
|
||||
sql = "INSERT INTO %s (%s) VALUES(%s)" % (
|
||||
table,
|
||||
", ".join(k for k in values),
|
||||
|
@ -418,8 +420,11 @@ class SQLBaseStore(object):
|
|||
sql, values.values(),
|
||||
)
|
||||
|
||||
txn.execute(sql, values.values())
|
||||
return txn.lastrowid
|
||||
try:
|
||||
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"):
|
||||
"""
|
||||
|
|
|
@ -57,6 +57,7 @@ class PresenceStore(SQLBaseStore):
|
|||
values={"observed_user_id": observed_localpart,
|
||||
"observer_user_id": observer_userid},
|
||||
desc="allow_presence_visible",
|
||||
or_ignore=True,
|
||||
)
|
||||
|
||||
def disallow_presence_visible(self, observed_localpart, observer_userid):
|
||||
|
|
Loading…
Reference in a new issue