From 66cd7cd080a8046b59ecb31e6bb3bb92d9689030 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Mon, 23 May 2022 20:00:08 +0300 Subject: [PATCH] Fix mixed indent in .sql files --- .editorconfig | 2 +- database/upgrades/00-latest-revision.sql | 174 +++++++++++------------ 2 files changed, 88 insertions(+), 88 deletions(-) diff --git a/.editorconfig b/.editorconfig index 02798cd..d6cdd31 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,7 +8,7 @@ charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true -[*.{yaml,yml}] +[*.{yaml,yml,sql}] indent_style = space [.gitlab-ci.yml] diff --git a/database/upgrades/00-latest-revision.sql b/database/upgrades/00-latest-revision.sql index 701108d..f0a1b6e 100644 --- a/database/upgrades/00-latest-revision.sql +++ b/database/upgrades/00-latest-revision.sql @@ -3,8 +3,8 @@ CREATE TABLE "user" ( mxid TEXT PRIMARY KEY, username TEXT UNIQUE, - agent SMALLINT, - device SMALLINT, + agent SMALLINT, + device SMALLINT, management_room TEXT, space_room TEXT, @@ -28,24 +28,24 @@ CREATE TABLE portal ( first_event_id TEXT, next_batch_id TEXT, relay_user_id TEXT, - expiration_time BIGINT NOT NULL DEFAULT 0, + expiration_time BIGINT NOT NULL DEFAULT 0, - PRIMARY KEY (jid, receiver) + PRIMARY KEY (jid, receiver) ); CREATE TABLE puppet ( username TEXT PRIMARY KEY, displayname TEXT, - name_quality SMALLINT, - avatar TEXT, - avatar_url TEXT, + name_quality SMALLINT, + avatar TEXT, + avatar_url TEXT, custom_mxid TEXT, access_token TEXT, next_batch TEXT, - enable_presence BOOLEAN NOT NULL DEFAULT true, - enable_receipts BOOLEAN NOT NULL DEFAULT true + enable_presence BOOLEAN NOT NULL DEFAULT true, + enable_receipts BOOLEAN NOT NULL DEFAULT true ); -- only: postgres @@ -59,35 +59,35 @@ CREATE TABLE message ( sender TEXT, timestamp BIGINT, sent BOOLEAN, - error error_type, - type TEXT, + error error_type, + type TEXT, broadcast_list_jid TEXT, - PRIMARY KEY (chat_jid, chat_receiver, jid), - FOREIGN KEY (chat_jid, chat_receiver) REFERENCES portal(jid, receiver) ON DELETE CASCADE + PRIMARY KEY (chat_jid, chat_receiver, jid), + FOREIGN KEY (chat_jid, chat_receiver) REFERENCES portal(jid, receiver) ON DELETE CASCADE ); CREATE TABLE reaction ( - chat_jid TEXT, - chat_receiver TEXT, - target_jid TEXT, - sender TEXT, + chat_jid TEXT, + chat_receiver TEXT, + target_jid TEXT, + sender TEXT, - mxid TEXT NOT NULL, - jid TEXT NOT NULL, + mxid TEXT NOT NULL, + jid TEXT NOT NULL, - PRIMARY KEY (chat_jid, chat_receiver, target_jid, sender), - FOREIGN KEY (chat_jid, chat_receiver, target_jid) REFERENCES message(chat_jid, chat_receiver, jid) - ON DELETE CASCADE ON UPDATE CASCADE + PRIMARY KEY (chat_jid, chat_receiver, target_jid, sender), + FOREIGN KEY (chat_jid, chat_receiver, target_jid) REFERENCES message(chat_jid, chat_receiver, jid) + ON DELETE CASCADE ON UPDATE CASCADE ); CREATE TABLE disappearing_message ( - room_id TEXT, - event_id TEXT, - expire_in BIGINT NOT NULL, - expire_at BIGINT, - PRIMARY KEY (room_id, event_id) + room_id TEXT, + event_id TEXT, + expire_in BIGINT NOT NULL, + expire_at BIGINT, + PRIMARY KEY (room_id, event_id) ); CREATE TABLE user_portal ( @@ -102,80 +102,80 @@ CREATE TABLE user_portal ( ); CREATE TABLE backfill_queue ( - queue_id INTEGER PRIMARY KEY - -- only: postgres - GENERATED ALWAYS AS IDENTITY - , - user_mxid TEXT, - type INTEGER NOT NULL, - priority INTEGER NOT NULL, - portal_jid TEXT, - portal_receiver TEXT, - time_start TIMESTAMP, - dispatch_time TIMESTAMP, - completed_at TIMESTAMP, - batch_delay INTEGER, - max_batch_events INTEGER NOT NULL, - max_total_events INTEGER, + queue_id INTEGER PRIMARY KEY + -- only: postgres + GENERATED ALWAYS AS IDENTITY + , + user_mxid TEXT, + type INTEGER NOT NULL, + priority INTEGER NOT NULL, + portal_jid TEXT, + portal_receiver TEXT, + time_start TIMESTAMP, + dispatch_time TIMESTAMP, + completed_at TIMESTAMP, + batch_delay INTEGER, + max_batch_events INTEGER NOT NULL, + max_total_events INTEGER, - FOREIGN KEY (portal_jid, portal_receiver) REFERENCES portal(jid, receiver) ON DELETE CASCADE ON UPDATE CASCADE + FOREIGN KEY (portal_jid, portal_receiver) REFERENCES portal(jid, receiver) ON DELETE CASCADE ON UPDATE CASCADE ); CREATE TABLE backfill_state ( - user_mxid TEXT, - portal_jid TEXT, - portal_receiver TEXT, - processing_batch BOOLEAN, - backfill_complete BOOLEAN, - first_expected_ts TIMESTAMP, - PRIMARY KEY (user_mxid, portal_jid, portal_receiver), - FOREIGN KEY (user_mxid) REFERENCES "user" (mxid) ON DELETE CASCADE ON UPDATE CASCADE, - FOREIGN KEY (portal_jid, portal_receiver) REFERENCES portal (jid, receiver) ON DELETE CASCADE + user_mxid TEXT, + portal_jid TEXT, + portal_receiver TEXT, + processing_batch BOOLEAN, + backfill_complete BOOLEAN, + first_expected_ts TIMESTAMP, + PRIMARY KEY (user_mxid, portal_jid, portal_receiver), + FOREIGN KEY (user_mxid) REFERENCES "user" (mxid) ON DELETE CASCADE ON UPDATE CASCADE, + FOREIGN KEY (portal_jid, portal_receiver) REFERENCES portal (jid, receiver) ON DELETE CASCADE ); CREATE TABLE media_backfill_requests ( - user_mxid TEXT, - portal_jid TEXT, - portal_receiver TEXT, - event_id TEXT, - media_key bytea, - status INTEGER, - error TEXT, - PRIMARY KEY (user_mxid, portal_jid, portal_receiver, event_id), - FOREIGN KEY (user_mxid) REFERENCES "user"(mxid) ON UPDATE CASCADE ON DELETE CASCADE, - FOREIGN KEY (portal_jid, portal_receiver) REFERENCES portal(jid, receiver) ON UPDATE CASCADE ON DELETE CASCADE + user_mxid TEXT, + portal_jid TEXT, + portal_receiver TEXT, + event_id TEXT, + media_key bytea, + status INTEGER, + error TEXT, + PRIMARY KEY (user_mxid, portal_jid, portal_receiver, event_id), + FOREIGN KEY (user_mxid) REFERENCES "user"(mxid) ON UPDATE CASCADE ON DELETE CASCADE, + FOREIGN KEY (portal_jid, portal_receiver) REFERENCES portal(jid, receiver) ON UPDATE CASCADE ON DELETE CASCADE ); CREATE TABLE history_sync_conversation ( - user_mxid TEXT, - conversation_id TEXT, - portal_jid TEXT, - portal_receiver TEXT, + user_mxid TEXT, + conversation_id TEXT, + portal_jid TEXT, + portal_receiver TEXT, - last_message_timestamp TIMESTAMP, - archived BOOLEAN, - pinned INTEGER, - mute_end_time TIMESTAMP, - disappearing_mode INTEGER, - end_of_history_transfer_type INTEGER, - ephemeral_Expiration INTEGER, - marked_as_unread BOOLEAN, - unread_count INTEGER, + last_message_timestamp TIMESTAMP, + archived BOOLEAN, + pinned INTEGER, + mute_end_time TIMESTAMP, + disappearing_mode INTEGER, + end_of_history_transfer_type INTEGER, + ephemeral_Expiration INTEGER, + marked_as_unread BOOLEAN, + unread_count INTEGER, - PRIMARY KEY (user_mxid, conversation_id), - FOREIGN KEY (user_mxid) REFERENCES "user"(mxid) ON UPDATE CASCADE ON DELETE CASCADE, - FOREIGN KEY (portal_jid, portal_receiver) REFERENCES portal(jid, receiver) ON UPDATE CASCADE ON DELETE CASCADE + PRIMARY KEY (user_mxid, conversation_id), + FOREIGN KEY (user_mxid) REFERENCES "user"(mxid) ON UPDATE CASCADE ON DELETE CASCADE, + FOREIGN KEY (portal_jid, portal_receiver) REFERENCES portal(jid, receiver) ON UPDATE CASCADE ON DELETE CASCADE ); CREATE TABLE history_sync_message ( - user_mxid TEXT, - conversation_id TEXT, - message_id TEXT, - timestamp TIMESTAMP, - data bytea, - inserted_time TIMESTAMP, + user_mxid TEXT, + conversation_id TEXT, + message_id TEXT, + timestamp TIMESTAMP, + data bytea, + inserted_time TIMESTAMP, - PRIMARY KEY (user_mxid, conversation_id, message_id), - FOREIGN KEY (user_mxid) REFERENCES "user"(mxid) ON UPDATE CASCADE ON DELETE CASCADE, - FOREIGN KEY (user_mxid, conversation_id) REFERENCES history_sync_conversation(user_mxid, conversation_id) ON DELETE CASCADE + PRIMARY KEY (user_mxid, conversation_id, message_id), + FOREIGN KEY (user_mxid) REFERENCES "user"(mxid) ON UPDATE CASCADE ON DELETE CASCADE, + FOREIGN KEY (user_mxid, conversation_id) REFERENCES history_sync_conversation(user_mxid, conversation_id) ON DELETE CASCADE );