mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 05:40:58 +00:00
s/users_in_pubic_room/users_in_public_rooms/g
This commit is contained in:
parent
a100700630
commit
d802e8ca6a
2 changed files with 32 additions and 10 deletions
22
synapse/storage/schema/delta/46/user_dir_typos.sql
Normal file
22
synapse/storage/schema/delta/46/user_dir_typos.sql
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
/* Copyright 2017 New Vector Ltd
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
-- this is just embarassing :|
|
||||||
|
ALTER TABLE users_in_pubic_room RENAME TO users_in_public_rooms;
|
||||||
|
|
||||||
|
DROP INDEX users_in_pubic_room_room_idx;
|
||||||
|
DROP INDEX users_in_pubic_room_user_idx;
|
||||||
|
CREATE INDEX users_in_pubic_room_room_idx ON users_in_public_rooms(room_id);
|
||||||
|
CREATE UNIQUE INDEX users_in_pubic_room_user_idx ON users_in_public_rooms(user_id);
|
|
@ -63,7 +63,7 @@ class UserDirectoryStore(SQLBaseStore):
|
||||||
user_ids (list(str)): Users to add
|
user_ids (list(str)): Users to add
|
||||||
"""
|
"""
|
||||||
yield self._simple_insert_many(
|
yield self._simple_insert_many(
|
||||||
table="users_in_pubic_room",
|
table="users_in_public_rooms",
|
||||||
values=[
|
values=[
|
||||||
{
|
{
|
||||||
"user_id": user_id,
|
"user_id": user_id,
|
||||||
|
@ -219,7 +219,7 @@ class UserDirectoryStore(SQLBaseStore):
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def update_user_in_public_user_list(self, user_id, room_id):
|
def update_user_in_public_user_list(self, user_id, room_id):
|
||||||
yield self._simple_update_one(
|
yield self._simple_update_one(
|
||||||
table="users_in_pubic_room",
|
table="users_in_public_rooms",
|
||||||
keyvalues={"user_id": user_id},
|
keyvalues={"user_id": user_id},
|
||||||
updatevalues={"room_id": room_id},
|
updatevalues={"room_id": room_id},
|
||||||
desc="update_user_in_public_user_list",
|
desc="update_user_in_public_user_list",
|
||||||
|
@ -240,7 +240,7 @@ class UserDirectoryStore(SQLBaseStore):
|
||||||
)
|
)
|
||||||
self._simple_delete_txn(
|
self._simple_delete_txn(
|
||||||
txn,
|
txn,
|
||||||
table="users_in_pubic_room",
|
table="users_in_public_rooms",
|
||||||
keyvalues={"user_id": user_id},
|
keyvalues={"user_id": user_id},
|
||||||
)
|
)
|
||||||
txn.call_after(
|
txn.call_after(
|
||||||
|
@ -256,7 +256,7 @@ class UserDirectoryStore(SQLBaseStore):
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def remove_from_user_in_public_room(self, user_id):
|
def remove_from_user_in_public_room(self, user_id):
|
||||||
yield self._simple_delete(
|
yield self._simple_delete(
|
||||||
table="users_in_pubic_room",
|
table="users_in_public_rooms",
|
||||||
keyvalues={"user_id": user_id},
|
keyvalues={"user_id": user_id},
|
||||||
desc="remove_from_user_in_public_room",
|
desc="remove_from_user_in_public_room",
|
||||||
)
|
)
|
||||||
|
@ -267,7 +267,7 @@ class UserDirectoryStore(SQLBaseStore):
|
||||||
in the given room_id
|
in the given room_id
|
||||||
"""
|
"""
|
||||||
return self._simple_select_onecol(
|
return self._simple_select_onecol(
|
||||||
table="users_in_pubic_room",
|
table="users_in_public_rooms",
|
||||||
keyvalues={"room_id": room_id},
|
keyvalues={"room_id": room_id},
|
||||||
retcol="user_id",
|
retcol="user_id",
|
||||||
desc="get_users_in_public_due_to_room",
|
desc="get_users_in_public_due_to_room",
|
||||||
|
@ -286,7 +286,7 @@ class UserDirectoryStore(SQLBaseStore):
|
||||||
)
|
)
|
||||||
|
|
||||||
user_ids_pub = yield self._simple_select_onecol(
|
user_ids_pub = yield self._simple_select_onecol(
|
||||||
table="users_in_pubic_room",
|
table="users_in_public_rooms",
|
||||||
keyvalues={"room_id": room_id},
|
keyvalues={"room_id": room_id},
|
||||||
retcol="user_id",
|
retcol="user_id",
|
||||||
desc="get_users_in_dir_due_to_room",
|
desc="get_users_in_dir_due_to_room",
|
||||||
|
@ -514,7 +514,7 @@ class UserDirectoryStore(SQLBaseStore):
|
||||||
def _delete_all_from_user_dir_txn(txn):
|
def _delete_all_from_user_dir_txn(txn):
|
||||||
txn.execute("DELETE FROM user_directory")
|
txn.execute("DELETE FROM user_directory")
|
||||||
txn.execute("DELETE FROM user_directory_search")
|
txn.execute("DELETE FROM user_directory_search")
|
||||||
txn.execute("DELETE FROM users_in_pubic_room")
|
txn.execute("DELETE FROM users_in_public_rooms")
|
||||||
txn.execute("DELETE FROM users_who_share_rooms")
|
txn.execute("DELETE FROM users_who_share_rooms")
|
||||||
txn.call_after(self.get_user_in_directory.invalidate_all)
|
txn.call_after(self.get_user_in_directory.invalidate_all)
|
||||||
txn.call_after(self.get_user_in_public_room.invalidate_all)
|
txn.call_after(self.get_user_in_public_room.invalidate_all)
|
||||||
|
@ -537,7 +537,7 @@ class UserDirectoryStore(SQLBaseStore):
|
||||||
@cached()
|
@cached()
|
||||||
def get_user_in_public_room(self, user_id):
|
def get_user_in_public_room(self, user_id):
|
||||||
return self._simple_select_one(
|
return self._simple_select_one(
|
||||||
table="users_in_pubic_room",
|
table="users_in_public_rooms",
|
||||||
keyvalues={"user_id": user_id},
|
keyvalues={"user_id": user_id},
|
||||||
retcols=("room_id",),
|
retcols=("room_id",),
|
||||||
allow_none=True,
|
allow_none=True,
|
||||||
|
@ -641,7 +641,7 @@ class UserDirectoryStore(SQLBaseStore):
|
||||||
SELECT d.user_id, display_name, avatar_url
|
SELECT d.user_id, display_name, avatar_url
|
||||||
FROM user_directory_search
|
FROM user_directory_search
|
||||||
INNER JOIN user_directory AS d USING (user_id)
|
INNER JOIN user_directory AS d USING (user_id)
|
||||||
LEFT JOIN users_in_pubic_room AS p USING (user_id)
|
LEFT JOIN users_in_public_rooms AS p USING (user_id)
|
||||||
LEFT JOIN (
|
LEFT JOIN (
|
||||||
SELECT other_user_id AS user_id FROM users_who_share_rooms
|
SELECT other_user_id AS user_id FROM users_who_share_rooms
|
||||||
WHERE user_id = ? AND share_private
|
WHERE user_id = ? AND share_private
|
||||||
|
@ -680,7 +680,7 @@ class UserDirectoryStore(SQLBaseStore):
|
||||||
SELECT d.user_id, display_name, avatar_url
|
SELECT d.user_id, display_name, avatar_url
|
||||||
FROM user_directory_search
|
FROM user_directory_search
|
||||||
INNER JOIN user_directory AS d USING (user_id)
|
INNER JOIN user_directory AS d USING (user_id)
|
||||||
LEFT JOIN users_in_pubic_room AS p USING (user_id)
|
LEFT JOIN users_in_public_rooms AS p USING (user_id)
|
||||||
LEFT JOIN (
|
LEFT JOIN (
|
||||||
SELECT other_user_id AS user_id FROM users_who_share_rooms
|
SELECT other_user_id AS user_id FROM users_who_share_rooms
|
||||||
WHERE user_id = ? AND share_private
|
WHERE user_id = ? AND share_private
|
||||||
|
|
Loading…
Reference in a new issue