diff options
| author | Dirk Klimpel <5740567+dklimpel@users.noreply.github.com> | 2020-12-17 11:43:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-17 10:43:37 +0000 |
| commit | 06006058d7bf6744078109875cd27f47197aeafa (patch) | |
| tree | 914debf5e03d197db2055cda4c004c4750dcf810 /synapse | |
| parent | Add a maximum size for well-known lookups. (#8950) (diff) | |
| download | synapse-06006058d7bf6744078109875cd27f47197aeafa.tar.xz | |
Make search statement in List Room and User Admin API case-insensitive (#8931)
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/storage/databases/main/__init__.py | 7 | ||||
| -rw-r--r-- | synapse/storage/databases/main/room.py | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/synapse/storage/databases/main/__init__.py b/synapse/storage/databases/main/__init__.py index 871fb646a5..701748f93b 100644 --- a/synapse/storage/databases/main/__init__.py +++ b/synapse/storage/databases/main/__init__.py @@ -339,12 +339,13 @@ class DataStore( filters = [] args = [self.hs.config.server_name] + # `name` is in database already in lower case if name: - filters.append("(name LIKE ? OR displayname LIKE ?)") - args.extend(["@%" + name + "%:%", "%" + name + "%"]) + filters.append("(name LIKE ? OR LOWER(displayname) LIKE ?)") + args.extend(["@%" + name.lower() + "%:%", "%" + name.lower() + "%"]) elif user_id: filters.append("name LIKE ?") - args.extend(["%" + user_id + "%"]) + args.extend(["%" + user_id.lower() + "%"]) if not guests: filters.append("is_guest = 0") diff --git a/synapse/storage/databases/main/room.py b/synapse/storage/databases/main/room.py index 6b89db15c9..4650d0689b 100644 --- a/synapse/storage/databases/main/room.py +++ b/synapse/storage/databases/main/room.py @@ -379,14 +379,14 @@ class RoomWorkerStore(SQLBaseStore): # Filter room names by a string where_statement = "" if search_term: - where_statement = "WHERE state.name LIKE ?" + where_statement = "WHERE LOWER(state.name) LIKE ?" # Our postgres db driver converts ? -> %s in SQL strings as that's the # placeholder for postgres. # HOWEVER, if you put a % into your SQL then everything goes wibbly. # To get around this, we're going to surround search_term with %'s # before giving it to the database in python instead - search_term = "%" + search_term + "%" + search_term = "%" + search_term.lower() + "%" # Set ordering if RoomSortOrder(order_by) == RoomSortOrder.SIZE: |