synapse/storage/_base.py:_simple_selectupdate_one was unused
This commit is contained in:
parent
82b8d4b86a
commit
1ee3d26432
|
@ -686,37 +686,6 @@ class SQLBaseStore(object):
|
||||||
|
|
||||||
return dict(zip(retcols, row))
|
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"):
|
def _simple_delete_one(self, table, keyvalues, desc="_simple_delete_one"):
|
||||||
"""Executes a DELETE query on the named table, expecting to delete a
|
"""Executes a DELETE query on the named table, expecting to delete a
|
||||||
single row.
|
single row.
|
||||||
|
|
|
@ -185,26 +185,6 @@ class SQLBaseStoreTestCase(unittest.TestCase):
|
||||||
[3, 4, 1, 2]
|
[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
|
@defer.inlineCallbacks
|
||||||
def test_delete_one(self):
|
def test_delete_one(self):
|
||||||
self.mock_txn.rowcount = 1
|
self.mock_txn.rowcount = 1
|
||||||
|
|
Loading…
Reference in New Issue