From 1ee3d26432d87ff312350f21da982f646b5af49a Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Wed, 23 Sep 2015 10:30:03 +0100
Subject: [PATCH] synapse/storage/_base.py:_simple_selectupdate_one was unused

---
 synapse/storage/_base.py   | 31 -------------------------------
 tests/storage/test_base.py | 20 --------------------
 2 files changed, 51 deletions(-)

diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index cf4ec30f4..79021bde6 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -686,37 +686,6 @@ class SQLBaseStore(object):
 
         return dict(zip(retcols, row))
 
-    def _simple_selectupdate_one(self, table, keyvalues, updatevalues=None,
-                                 retcols=None, allow_none=False,
-                                 desc="_simple_selectupdate_one"):
-        """ Combined SELECT then UPDATE."""
-        def func(txn):
-            ret = None
-            if retcols:
-                ret = self._simple_select_one_txn(
-                    txn,
-                    table=table,
-                    keyvalues=keyvalues,
-                    retcols=retcols,
-                    allow_none=allow_none,
-                )
-
-            if updatevalues:
-                self._simple_update_one_txn(
-                    txn,
-                    table=table,
-                    keyvalues=keyvalues,
-                    updatevalues=updatevalues,
-                )
-
-                # if txn.rowcount == 0:
-                #     raise StoreError(404, "No row found")
-                if txn.rowcount > 1:
-                    raise StoreError(500, "More than one row matched")
-
-            return ret
-        return self.runInteraction(desc, func)
-
     def _simple_delete_one(self, table, keyvalues, desc="_simple_delete_one"):
         """Executes a DELETE query on the named table, expecting to delete a
         single row.
diff --git a/tests/storage/test_base.py b/tests/storage/test_base.py
index 8573f18b5..1ddca1da4 100644
--- a/tests/storage/test_base.py
+++ b/tests/storage/test_base.py
@@ -185,26 +185,6 @@ class SQLBaseStoreTestCase(unittest.TestCase):
                 [3, 4, 1, 2]
         )
 
-    @defer.inlineCallbacks
-    def test_update_one_with_return(self):
-        self.mock_txn.rowcount = 1
-        self.mock_txn.fetchone.return_value = ("Old Value",)
-
-        ret = yield self.datastore._simple_selectupdate_one(
-                table="tablename",
-                keyvalues={"keycol": "TheKey"},
-                updatevalues={"columname": "New Value"},
-                retcols=["columname"]
-        )
-
-        self.assertEquals({"columname": "Old Value"}, ret)
-        self.mock_txn.execute.assert_has_calls([
-                call('SELECT columname FROM tablename WHERE keycol = ?',
-                    ['TheKey']),
-                call("UPDATE tablename SET columname = ? WHERE keycol = ?",
-                    ["New Value", "TheKey"])
-        ])
-
     @defer.inlineCallbacks
     def test_delete_one(self):
         self.mock_txn.rowcount = 1