This repository was archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Drop last_used column from access_tokens #9025
Merged
Merged
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
7b8333e
Dropped last_used column from access_tokens
jerinjtitus d7a571e
Added changelog file
jerinjtitus 57f833f
Re-added access_tokens_device_id index
jerinjtitus 3ba576e
Merge remote-tracking branch 'upstream/develop' into develop
jerinjtitus 81f3b66
Added leftout columns
jerinjtitus 1325638
added delta file for dropping column from postgres
jerinjtitus 74a5d01
Fixup changelog.d/9025.misc
erikjohnston File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Removed an unused column from access_tokens table. | ||
16 changes: 16 additions & 0 deletions
16
synapse/storage/databases/main/schema/delta/58/28drop_last_used_column.sql.postgres
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
/* Copyright 2020 The Matrix.org Foundation C.I.C | ||
* | ||
* 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. | ||
*/ | ||
|
||
ALTER TABLE access_tokens DROP COLUMN last_used; |
62 changes: 62 additions & 0 deletions
62
synapse/storage/databases/main/schema/delta/58/28drop_last_used_column.sql.sqlite
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
/* | ||
* Copyright 2020 The Matrix.org Foundation C.I.C. | ||
* | ||
* 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. | ||
*/ | ||
|
||
-- Dropping last_used column from access_tokens table. | ||
|
||
CREATE TABLE access_tokens2 ( | ||
id BIGINT PRIMARY KEY, | ||
user_id TEXT NOT NULL, | ||
device_id TEXT, | ||
token TEXT NOT NULL, | ||
valid_until_ms BIGINT, | ||
puppets_user_id TEXT, | ||
last_validated BIGINT, | ||
UNIQUE(token) | ||
); | ||
|
||
INSERT INTO access_tokens2(id, user_id, device_id, token) | ||
SELECT id, user_id, device_id, token FROM access_tokens; | ||
|
||
DROP TABLE access_tokens; | ||
ALTER TABLE access_tokens2 RENAME TO access_tokens; | ||
|
||
CREATE INDEX access_tokens_device_id ON access_tokens (user_id, device_id); | ||
|
||
|
||
-- Re-adding foreign key reference in event_txn_id table | ||
|
||
CREATE TABLE event_txn_id2 ( | ||
event_id TEXT NOT NULL, | ||
room_id TEXT NOT NULL, | ||
user_id TEXT NOT NULL, | ||
token_id BIGINT NOT NULL, | ||
txn_id TEXT NOT NULL, | ||
inserted_ts BIGINT NOT NULL, | ||
FOREIGN KEY (event_id) | ||
REFERENCES events (event_id) ON DELETE CASCADE, | ||
FOREIGN KEY (token_id) | ||
REFERENCES access_tokens (id) ON DELETE CASCADE | ||
); | ||
|
||
INSERT INTO event_txn_id2(event_id, room_id, user_id, token_id, txn_id, inserted_ts) | ||
SELECT event_id, room_id, user_id, token_id, txn_id, inserted_ts FROM event_txn_id; | ||
|
||
DROP TABLE event_txn_id; | ||
ALTER TABLE event_txn_id2 RENAME TO event_txn_id; | ||
|
||
CREATE UNIQUE INDEX IF NOT EXISTS event_txn_id_event_id ON event_txn_id(event_id); | ||
CREATE UNIQUE INDEX IF NOT EXISTS event_txn_id_txn_id ON event_txn_id(room_id, user_id, token_id, txn_id); | ||
CREATE INDEX IF NOT EXISTS event_txn_id_ts ON event_txn_id(inserted_ts); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.