From 2a2dd13b02fc434d743155b032f29378386d7eb4 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Mon, 19 Oct 2020 17:56:53 +0100 Subject: [PATCH 1/4] Move schema file --- changelog.d/8590.misc | 1 + .../{59/19as_device_stream.sql => 58/21as_device_stream.sql} | 0 2 files changed, 1 insertion(+) create mode 100644 changelog.d/8590.misc rename synapse/storage/databases/main/schema/delta/{59/19as_device_stream.sql => 58/21as_device_stream.sql} (100%) diff --git a/changelog.d/8590.misc b/changelog.d/8590.misc new file mode 100644 index 000000000000..36fdf0f6d045 --- /dev/null +++ b/changelog.d/8590.misc @@ -0,0 +1 @@ +Move the as_devices_stream database schema from /59 to /58 diff --git a/synapse/storage/databases/main/schema/delta/59/19as_device_stream.sql b/synapse/storage/databases/main/schema/delta/58/21as_device_stream.sql similarity index 100% rename from synapse/storage/databases/main/schema/delta/59/19as_device_stream.sql rename to synapse/storage/databases/main/schema/delta/58/21as_device_stream.sql From b6fc6c6c14c9e6354a07a18c6a9628bb173121ad Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Mon, 19 Oct 2020 18:04:39 +0100 Subject: [PATCH 2/4] Add a . --- changelog.d/8590.misc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/8590.misc b/changelog.d/8590.misc index 36fdf0f6d045..f6dd9f6ae7f4 100644 --- a/changelog.d/8590.misc +++ b/changelog.d/8590.misc @@ -1 +1 @@ -Move the as_devices_stream database schema from /59 to /58 +Move the as_devices_stream database schema from /59 to /58. From 91b4a1ed2ab3404d9522cf3d5186411a4a5500cb Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Mon, 19 Oct 2020 18:05:42 +0100 Subject: [PATCH 3/4] Add matching changelog entry --- changelog.d/8590.misc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/8590.misc b/changelog.d/8590.misc index f6dd9f6ae7f4..4abcccb326e0 100644 --- a/changelog.d/8590.misc +++ b/changelog.d/8590.misc @@ -1 +1 @@ -Move the as_devices_stream database schema from /59 to /58. +Implement [MSC2409](https://github.com/matrix-org/matrix-doc/pull/2409) to send typing, read receipts, and presence events to appservices. From 0ab3d1375d8bfdecd84b4ebc3afb8c79f3b58f07 Mon Sep 17 00:00:00 2001 From: Will Hunt Date: Mon, 19 Oct 2020 18:35:31 +0100 Subject: [PATCH 4/4] Fix sqlite --- .../databases/main/schema/delta/58/21as_device_stream.sql | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/synapse/storage/databases/main/schema/delta/58/21as_device_stream.sql b/synapse/storage/databases/main/schema/delta/58/21as_device_stream.sql index 20f5a95a24f8..7b84a207fd82 100644 --- a/synapse/storage/databases/main/schema/delta/58/21as_device_stream.sql +++ b/synapse/storage/databases/main/schema/delta/58/21as_device_stream.sql @@ -13,6 +13,5 @@ * limitations under the License. */ -ALTER TABLE application_services_state - ADD COLUMN read_receipt_stream_id INT, - ADD COLUMN presence_stream_id INT; \ No newline at end of file +ALTER TABLE application_services_state ADD COLUMN read_receipt_stream_id INT; +ALTER TABLE application_services_state ADD COLUMN presence_stream_id INT; \ No newline at end of file