diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-05-13 16:59:56 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-05-13 16:59:56 +0100 |
| commit | 1f71f386f68423c00e0d4180ae48b271864b42a5 (patch) | |
| tree | 9dd45307ffd592023a8334e90d2c2180f4463225 /synapse/storage/_base.py | |
| parent | Shift some of the state_group methods into the SlavedEventStore (diff) | |
| parent | Merge pull request #783 from matrix-org/markjh/slave_account_data (diff) | |
| download | synapse-1f71f386f68423c00e0d4180ae48b271864b42a5.tar.xz | |
Merge branch 'develop' into dbkr/email_notifs_on_pusher
Diffstat (limited to 'synapse/storage/_base.py')
| -rw-r--r-- | synapse/storage/_base.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index 1e27c2c0ce..e0d7098692 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -453,7 +453,9 @@ class SQLBaseStore(object): keyvalues (dict): The unique key tables and their new values values (dict): The nonunique columns and their new values insertion_values (dict): key/values to use when inserting - Returns: A deferred + Returns: + Deferred(bool): True if a new entry was created, False if an + existing one was updated. """ return self.runInteraction( desc, @@ -498,6 +500,10 @@ class SQLBaseStore(object): ) txn.execute(sql, allvalues.values()) + return True + else: + return False + def _simple_select_one(self, table, keyvalues, retcols, allow_none=False, desc="_simple_select_one"): """Executes a SELECT query on the named table, which is expected to |