mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-08-01 18:17:13 -04:00
Make work in both Maria and SQLite. Fix tests
This commit is contained in:
parent
0e8f5095c7
commit
9236136f3a
36 changed files with 296 additions and 160 deletions
|
@ -24,6 +24,7 @@ from collections import OrderedDict
|
|||
from synapse.server import HomeServer
|
||||
|
||||
from synapse.storage._base import SQLBaseStore
|
||||
from synapse.storage.engines import create_engine
|
||||
|
||||
|
||||
class SQLBaseStoreTestCase(unittest.TestCase):
|
||||
|
@ -40,7 +41,12 @@ class SQLBaseStoreTestCase(unittest.TestCase):
|
|||
|
||||
config = Mock()
|
||||
config.event_cache_size = 1
|
||||
hs = HomeServer("test", db_pool=self.db_pool, config=config)
|
||||
hs = HomeServer(
|
||||
"test",
|
||||
db_pool=self.db_pool,
|
||||
config=config,
|
||||
database_engine=create_engine("sqlite3"),
|
||||
)
|
||||
|
||||
self.datastore = SQLBaseStore(hs)
|
||||
|
||||
|
@ -86,8 +92,7 @@ class SQLBaseStoreTestCase(unittest.TestCase):
|
|||
|
||||
self.assertEquals("Value", value)
|
||||
self.mock_txn.execute.assert_called_with(
|
||||
"SELECT retcol FROM tablename WHERE keycol = ? "
|
||||
"ORDER BY rowid asc",
|
||||
"SELECT retcol FROM tablename WHERE keycol = ?",
|
||||
["TheKey"]
|
||||
)
|
||||
|
||||
|
@ -104,8 +109,7 @@ class SQLBaseStoreTestCase(unittest.TestCase):
|
|||
|
||||
self.assertEquals({"colA": 1, "colB": 2, "colC": 3}, ret)
|
||||
self.mock_txn.execute.assert_called_with(
|
||||
"SELECT colA, colB, colC FROM tablename WHERE keycol = ? "
|
||||
"ORDER BY rowid asc",
|
||||
"SELECT colA, colB, colC FROM tablename WHERE keycol = ?",
|
||||
["TheKey"]
|
||||
)
|
||||
|
||||
|
@ -139,8 +143,7 @@ class SQLBaseStoreTestCase(unittest.TestCase):
|
|||
|
||||
self.assertEquals([{"colA": 1}, {"colA": 2}, {"colA": 3}], ret)
|
||||
self.mock_txn.execute.assert_called_with(
|
||||
"SELECT colA FROM tablename WHERE keycol = ? "
|
||||
"ORDER BY rowid asc",
|
||||
"SELECT colA FROM tablename WHERE keycol = ?",
|
||||
["A set"]
|
||||
)
|
||||
|
||||
|
@ -189,8 +192,7 @@ class SQLBaseStoreTestCase(unittest.TestCase):
|
|||
|
||||
self.assertEquals({"columname": "Old Value"}, ret)
|
||||
self.mock_txn.execute.assert_has_calls([
|
||||
call('SELECT columname FROM tablename WHERE keycol = ? '
|
||||
'ORDER BY rowid asc',
|
||||
call('SELECT columname FROM tablename WHERE keycol = ?',
|
||||
['TheKey']),
|
||||
call("UPDATE tablename SET columname = ? WHERE keycol = ?",
|
||||
["New Value", "TheKey"])
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue