OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Revert "Fix tests for change in PostgreSQL 14 behavior change. (#14310)"" 

This reverts commit 7f77f1386c.
squah/unrevert-fts-changes-on-hotfix
Sean Quah 2022-11-04 11:38:39 +00:00
parent 3b44a7c9d1
commit e2008e4ef5
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
synapse/storage/databases/main/search.py
View File

@ -824,9 +824,8 @@ def _tokenize_query(query: str) -> TokenList:
in_phrase = False in_phrase = False
parts = deque(query.split('"')) parts = deque(query.split('"'))
for i, part in enumerate(parts): for i, part in enumerate(parts):
# The contents inside double quotes is treated as a phrase, a trailing # The contents inside double quotes is treated as a phrase.
# double quote is not implied. in_phrase = bool(i % 2)
in_phrase = bool(i % 2) and i != (len(parts) - 1)
# Pull out the individual words, discarding any non-word characters. # Pull out the individual words, discarding any non-word characters.
words = deque(re.findall(r"([\w\-]+)", part, re.UNICODE)) words = deque(re.findall(r"([\w\-]+)", part, re.UNICODE))

16
tests/storage/test_room_search.py
View File

@ -239,7 +239,6 @@ class MessageSearchTest(HomeserverTestCase):
("fox -nope", (True, False)), ("fox -nope", (True, False)),
("fox -brown", (False, True)), ("fox -brown", (False, True)),
('"fox" quick', True), ('"fox" quick', True),
('"fox quick', True),
('"quick brown', True), ('"quick brown', True),
('" quick "', True), ('" quick "', True),
('" nope"', False), ('" nope"', False),
@ -269,6 +268,15 @@ class MessageSearchTest(HomeserverTestCase):
response = self.helper.send(self.room_id, self.PHRASE, tok=self.access_token) response = self.helper.send(self.room_id, self.PHRASE, tok=self.access_token)
self.assertIn("event_id", response) self.assertIn("event_id", response)
# The behaviour of a missing trailing double quote changed in PostgreSQL 14
# from ignoring the initial double quote to treating it as a phrase.
main_store = homeserver.get_datastores().main
found = False
if isinstance(main_store.database_engine, PostgresEngine):
assert main_store.database_engine._version is not None
found = main_store.database_engine._version < 140000
self.COMMON_CASES.append(('"fox quick', (found, True)))
def test_tokenize_query(self) -> None: def test_tokenize_query(self) -> None:
"""Test the custom logic to tokenize a user's query.""" """Test the custom logic to tokenize a user's query."""
cases = ( cases = (
@ -280,9 +288,9 @@ class MessageSearchTest(HomeserverTestCase):
("fox -brown", ["fox", SearchToken.Not, "brown"]), ("fox -brown", ["fox", SearchToken.Not, "brown"]),
("- fox", [SearchToken.Not, "fox"]), ("- fox", [SearchToken.Not, "fox"]),
('"fox" quick', [Phrase(["fox"]), SearchToken.And, "quick"]), ('"fox" quick', [Phrase(["fox"]), SearchToken.And, "quick"]),
# No trailing double quoe. # No trailing double quote.
('"fox quick', ["fox", SearchToken.And, "quick"]), ('"fox quick', [Phrase(["fox", "quick"])]),
('"-fox quick', [SearchToken.Not, "fox", SearchToken.And, "quick"]), ('"-fox quick', [Phrase(["-fox", "quick"])]),
('" quick "', [Phrase(["quick"])]), ('" quick "', [Phrase(["quick"])]),
( (
'q"uick brow"n', 'q"uick brow"n',