mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-16 17:34:00 +00:00
2e8687e203
* Update comment_report_view.rs * Update comment_report_view.rs * Update post_view.rs * Update utils.rs * Update schema.rs * stuff * stuff * fix actions * PostLike * fmt * more post stuff (partial) * remove uplete * returning * rename read_comments field * PersonPostAggregates * a * fix usage of read_comments_amount * comment * community * community_block * instance_block * LocalUser::export_backup * person_block * person * stuff (partial) * update cargo.lock * fix lemmy_db_schema * post_view * comment_report_view * comment_view * post_report_view * find and replace some selected values * private_message_view * vote_view * comment_reply_view * some action views * action_query, find_action * community_view * block views * person_mention_view * remove struct update * refactor actions function * actions_alias * clean up return types and trait bounds * fix all rust code * fmt * clippy fix * Migrate tables * migrate indexes and contraints, and add statistics * fix what appears to be a messed up merge * commented thing * Create uplete.rs * Update uplete.rs * Update uplete.rs * Update up.sql * Update comment.rs * Update Cargo.toml * Update comment.rs * Update post.rs * Update comment_view.rs * Update post_view.rs * Update comment_reply_view.rs * Update person_mention_view.rs * Update Cargo.toml * Update utils.rs * Update comment.rs * Update utils.rs * Update uplete.rs * Update uplete.rs * Update uplete.rs * Update comment.rs * Update uplete.rs * Update uplete.rs * Update uplete.rs * Update uplete.rs * Update uplete.rs * Update uplete.rs * Update comment_view.rs * Update post_view.rs * Update triggers.sql * Update triggers.sql * Update triggers.sql * Update comment_reply_view.rs * Update person_mention_view.rs * Update person_mention_view.rs * Update comment_reply_view.rs * Update uplete.rs * start removing post_id column * Update down.sql * Update schema.rs * Update comment.rs * Update comment.rs * Update comment.rs * Update schema.rs * Update comment.rs * Update like.rs * Update comment.rs * Update up.sql * Update down.sql * Update down.sql * Update up.sql * Update up.sql * Update down.sql * Update comment.rs * Update vote_view.rs * Update vote_view.rs * Update comment_aggregates.rs * Update person_aggregates.rs * Update comment_view.rs * Update vote_view.rs * Update mod.rs * Update create.rs * Update comment.rs * Update community.rs * Update community.rs * Update up.sql * Update uplete.rs * Update uplete.rs * revert to UpleteCount * Update comment.rs * Update traits.rs * Update comment.rs * Update community.rs * Update community_block.rs * Update community.rs * Update instance_block.rs * Update instance.rs * Update community_block.rs * Update person.rs * Update person_block.rs * Update person.rs * Update person_block.rs * Update person.rs * Update instance.rs * Update instance_block.rs * Update instance.rs * Update person.rs * Update post.rs * Update comment.rs * Update community.rs * Update person.rs * Update post_view.rs * Update comment.rs * reduce diff * revert some changes in views * Update post_view.rs * Update comment.rs * Update post.rs * fix missing cfg_attr * rewrite uplete * Update Cargo.toml * Update Cargo.toml * Update uplete.rs * add `pub` to structs that appear in trait bounds * optional = true * Update uplete.rs * Update community.rs * Update comment.rs * Update uplete.rs * Update uplete.rs * Update uplete.rs * Update uplete.rs * something is wrong with me * use new uplete function everywhere * fmt * fmt * Keep post_id when comment_actions::liked is not null * Update up.sql * Update up.sql * clean up up.sql * clean up down.sql * fix * Update person_aggregates.rs * fmt * Update uplete.rs * fmt * Update uplete.rs * Update community.rs * Update uplete.rs * Update local_user.rs * fmt * fix * fix * fmt * improve uplete api * Update uplete.rs * fix * fix * Update uplete.rs * Update uplete.rs * Update uplete.rs * Update uplete.rs * fix * fix test * fix db_views_actor imports * fix uplete import in post_view test * rerun ci * fix AllNull syntax error * fix DynColumn * Fix rust syntax * fmt * fix iter * pain * Update community_moderators.rs * Update community_moderator_view.rs * Update uplete.rs * Fix mistake found by chatgpt * revert debugging stuff, change migration date, refactor constraint * Update down.sql * Update down.sql * fmt * make things added to db_schema::utils more understandable * update rust version for woodpecker * finish merge * Fix index that checked read_comments twice instead of also checking read_comments_amount * fix * uplete: test_count, test_generated_sql_setting_one_column_null, test_count_methods * refactor uplete sql test * test setting both columns to null in uplete * make AllNull generic * test AllNull * Merge remote-tracking branch 'upstream/main' into smoosh-tables-together --------- Co-authored-by: phiresky <phireskyde+git@gmail.com>
320 lines
10 KiB
SQL
320 lines
10 KiB
SQL
-- For each new actions table, create tables that are dropped in up.sql, and insert into them
|
|
CREATE TABLE comment_saved (
|
|
person_id int REFERENCES person ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
|
|
comment_id int REFERENCES COMMENT ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
|
|
published timestamptz DEFAULT now() NOT NULL,
|
|
PRIMARY KEY (person_id, comment_id)
|
|
);
|
|
|
|
INSERT INTO comment_saved (person_id, comment_id, published)
|
|
SELECT
|
|
person_id,
|
|
comment_id,
|
|
saved
|
|
FROM
|
|
comment_actions
|
|
WHERE
|
|
saved IS NOT NULL;
|
|
|
|
CREATE TABLE community_block (
|
|
person_id int REFERENCES person ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
|
|
community_id int REFERENCES community ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
|
|
published timestamptz DEFAULT now() NOT NULL,
|
|
PRIMARY KEY (person_id, community_id)
|
|
);
|
|
|
|
INSERT INTO community_block (person_id, community_id, published)
|
|
SELECT
|
|
person_id,
|
|
community_id,
|
|
blocked
|
|
FROM
|
|
community_actions
|
|
WHERE
|
|
blocked IS NOT NULL;
|
|
|
|
CREATE TABLE community_person_ban (
|
|
community_id int REFERENCES community ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
|
|
person_id int REFERENCES person ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
|
|
published timestamptz DEFAULT now() NOT NULL,
|
|
expires timestamptz,
|
|
PRIMARY KEY (person_id, community_id)
|
|
);
|
|
|
|
INSERT INTO community_person_ban (community_id, person_id, published, expires)
|
|
SELECT
|
|
community_id,
|
|
person_id,
|
|
received_ban,
|
|
ban_expires
|
|
FROM
|
|
community_actions
|
|
WHERE
|
|
received_ban IS NOT NULL;
|
|
|
|
CREATE TABLE community_moderator (
|
|
community_id int REFERENCES community ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
|
|
person_id int REFERENCES person ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
|
|
published timestamptz DEFAULT now() NOT NULL,
|
|
PRIMARY KEY (person_id, community_id)
|
|
);
|
|
|
|
INSERT INTO community_moderator (community_id, person_id, published)
|
|
SELECT
|
|
community_id,
|
|
person_id,
|
|
became_moderator
|
|
FROM
|
|
community_actions
|
|
WHERE
|
|
became_moderator IS NOT NULL;
|
|
|
|
CREATE TABLE person_block (
|
|
person_id int REFERENCES person ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
|
|
target_id int REFERENCES person ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
|
|
published timestamptz DEFAULT now() NOT NULL,
|
|
PRIMARY KEY (person_id, target_id)
|
|
);
|
|
|
|
INSERT INTO person_block (person_id, target_id, published)
|
|
SELECT
|
|
person_id,
|
|
target_id,
|
|
blocked
|
|
FROM
|
|
person_actions
|
|
WHERE
|
|
blocked IS NOT NULL;
|
|
|
|
CREATE TABLE person_post_aggregates (
|
|
person_id int REFERENCES person ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
|
|
post_id int REFERENCES post ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
|
|
read_comments bigint DEFAULT 0 NOT NULL,
|
|
published timestamptz NOT NULL,
|
|
PRIMARY KEY (person_id, post_id)
|
|
);
|
|
|
|
INSERT INTO person_post_aggregates (person_id, post_id, read_comments, published)
|
|
SELECT
|
|
person_id,
|
|
post_id,
|
|
read_comments_amount,
|
|
read_comments
|
|
FROM
|
|
post_actions
|
|
WHERE
|
|
read_comments IS NOT NULL;
|
|
|
|
CREATE TABLE post_hide (
|
|
post_id int REFERENCES post ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
|
|
person_id int REFERENCES person ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
|
|
published timestamptz DEFAULT now() NOT NULL,
|
|
PRIMARY KEY (person_id, post_id)
|
|
);
|
|
|
|
INSERT INTO post_hide (post_id, person_id, published)
|
|
SELECT
|
|
post_id,
|
|
person_id,
|
|
hidden
|
|
FROM
|
|
post_actions
|
|
WHERE
|
|
hidden IS NOT NULL;
|
|
|
|
CREATE TABLE post_like (
|
|
post_id int REFERENCES post ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
|
|
person_id int REFERENCES person ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
|
|
score smallint NOT NULL,
|
|
published timestamptz DEFAULT now() NOT NULL,
|
|
PRIMARY KEY (person_id, post_id)
|
|
);
|
|
|
|
INSERT INTO post_like (post_id, person_id, score, published)
|
|
SELECT
|
|
post_id,
|
|
person_id,
|
|
like_score,
|
|
liked
|
|
FROM
|
|
post_actions
|
|
WHERE
|
|
liked IS NOT NULL;
|
|
|
|
CREATE TABLE post_saved (
|
|
post_id int REFERENCES post ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
|
|
person_id int REFERENCES person ON UPDATE CASCADE ON DELETE CASCADE NOT NULL,
|
|
published timestamptz DEFAULT now() NOT NULL,
|
|
PRIMARY KEY (person_id, post_id)
|
|
);
|
|
|
|
INSERT INTO post_saved (post_id, person_id, published)
|
|
SELECT
|
|
post_id,
|
|
person_id,
|
|
saved
|
|
FROM
|
|
post_actions
|
|
WHERE
|
|
saved IS NOT NULL;
|
|
|
|
-- Do the opposite of the `ALTER TABLE` commands in up.sql
|
|
DELETE FROM comment_actions
|
|
WHERE liked IS NULL;
|
|
|
|
DELETE FROM community_actions
|
|
WHERE followed IS NULL;
|
|
|
|
DELETE FROM instance_actions
|
|
WHERE blocked IS NULL;
|
|
|
|
DELETE FROM person_actions
|
|
WHERE followed IS NULL;
|
|
|
|
DELETE FROM post_actions
|
|
WHERE read IS NULL;
|
|
|
|
ALTER TABLE comment_actions RENAME TO comment_like;
|
|
|
|
ALTER TABLE community_actions RENAME TO community_follower;
|
|
|
|
ALTER TABLE instance_actions RENAME TO instance_block;
|
|
|
|
ALTER TABLE person_actions RENAME TO person_follower;
|
|
|
|
ALTER TABLE post_actions RENAME TO post_read;
|
|
|
|
ALTER TABLE comment_like RENAME COLUMN liked TO published;
|
|
|
|
ALTER TABLE comment_like RENAME COLUMN like_score TO score;
|
|
|
|
ALTER TABLE community_follower RENAME COLUMN followed TO published;
|
|
|
|
ALTER TABLE community_follower RENAME COLUMN follow_state TO state;
|
|
|
|
ALTER TABLE community_follower RENAME COLUMN follow_approver_id TO approver_id;
|
|
|
|
ALTER TABLE instance_block RENAME COLUMN blocked TO published;
|
|
|
|
ALTER TABLE person_follower RENAME COLUMN person_id TO follower_id;
|
|
|
|
ALTER TABLE person_follower RENAME COLUMN target_id TO person_id;
|
|
|
|
ALTER TABLE person_follower RENAME COLUMN followed TO published;
|
|
|
|
ALTER TABLE person_follower RENAME COLUMN follow_pending TO pending;
|
|
|
|
ALTER TABLE post_read RENAME COLUMN read TO published;
|
|
|
|
ALTER TABLE comment_like
|
|
DROP CONSTRAINT comment_actions_check_liked,
|
|
ALTER COLUMN published SET NOT NULL,
|
|
ALTER COLUMN published SET DEFAULT now(),
|
|
ALTER COLUMN score SET NOT NULL,
|
|
DROP COLUMN saved;
|
|
|
|
ALTER TABLE community_follower
|
|
DROP CONSTRAINT community_actions_check_followed,
|
|
DROP CONSTRAINT community_actions_check_received_ban,
|
|
ALTER COLUMN published SET NOT NULL,
|
|
ALTER COLUMN published SET DEFAULT now(),
|
|
ALTER COLUMN state SET NOT NULL,
|
|
DROP COLUMN blocked,
|
|
DROP COLUMN became_moderator,
|
|
DROP COLUMN received_ban,
|
|
DROP COLUMN ban_expires;
|
|
|
|
ALTER TABLE instance_block
|
|
ALTER COLUMN published SET NOT NULL,
|
|
ALTER COLUMN published SET DEFAULT now();
|
|
|
|
ALTER TABLE person_follower
|
|
DROP CONSTRAINT person_actions_check_followed,
|
|
ALTER COLUMN published SET NOT NULL,
|
|
ALTER COLUMN published SET DEFAULT now(),
|
|
ALTER COLUMN pending SET NOT NULL,
|
|
DROP COLUMN blocked;
|
|
|
|
ALTER TABLE post_read
|
|
DROP CONSTRAINT post_actions_check_read_comments,
|
|
DROP CONSTRAINT post_actions_check_liked,
|
|
ALTER COLUMN published SET NOT NULL,
|
|
ALTER COLUMN published SET DEFAULT now(),
|
|
DROP COLUMN read_comments,
|
|
DROP COLUMN read_comments_amount,
|
|
DROP COLUMN saved,
|
|
DROP COLUMN liked,
|
|
DROP COLUMN like_score,
|
|
DROP COLUMN hidden;
|
|
|
|
-- Rename associated stuff
|
|
ALTER INDEX comment_actions_pkey RENAME TO comment_like_pkey;
|
|
|
|
ALTER INDEX idx_comment_actions_comment RENAME TO idx_comment_like_comment;
|
|
|
|
ALTER TABLE comment_like RENAME CONSTRAINT comment_actions_comment_id_fkey TO comment_like_comment_id_fkey;
|
|
|
|
ALTER TABLE comment_like RENAME CONSTRAINT comment_actions_person_id_fkey TO comment_like_person_id_fkey;
|
|
|
|
ALTER INDEX community_actions_pkey RENAME TO community_follower_pkey;
|
|
|
|
ALTER INDEX idx_community_actions_community RENAME TO idx_community_follower_community;
|
|
|
|
ALTER TABLE community_follower RENAME CONSTRAINT community_actions_community_id_fkey TO community_follower_community_id_fkey;
|
|
|
|
ALTER TABLE community_follower RENAME CONSTRAINT community_actions_person_id_fkey TO community_follower_person_id_fkey;
|
|
|
|
ALTER TABLE community_follower RENAME CONSTRAINT community_actions_follow_approver_id_fkey TO community_follower_approver_id_fkey;
|
|
|
|
ALTER INDEX instance_actions_pkey RENAME TO instance_block_pkey;
|
|
|
|
ALTER TABLE instance_block RENAME CONSTRAINT instance_actions_instance_id_fkey TO instance_block_instance_id_fkey;
|
|
|
|
ALTER TABLE instance_block RENAME CONSTRAINT instance_actions_person_id_fkey TO instance_block_person_id_fkey;
|
|
|
|
ALTER INDEX person_actions_pkey RENAME TO person_follower_pkey;
|
|
|
|
ALTER TABLE person_follower RENAME CONSTRAINT person_actions_target_id_fkey TO person_follower_person_id_fkey;
|
|
|
|
ALTER TABLE person_follower RENAME CONSTRAINT person_actions_person_id_fkey TO person_follower_follower_id_fkey;
|
|
|
|
ALTER INDEX post_actions_pkey RENAME TO post_read_pkey;
|
|
|
|
ALTER TABLE post_read RENAME CONSTRAINT post_actions_person_id_fkey TO post_read_person_id_fkey;
|
|
|
|
ALTER TABLE post_read RENAME CONSTRAINT post_actions_post_id_fkey TO post_read_post_id_fkey;
|
|
|
|
-- Rename idx_community_actions_followed and remove filter
|
|
CREATE INDEX idx_community_follower_published ON community_follower (published);
|
|
|
|
DROP INDEX idx_community_actions_followed;
|
|
|
|
-- Move indexes back to their original tables
|
|
CREATE INDEX idx_comment_saved_comment ON comment_saved (comment_id);
|
|
|
|
CREATE INDEX idx_comment_saved_person ON comment_saved (person_id);
|
|
|
|
CREATE INDEX idx_community_block_community ON community_block (community_id);
|
|
|
|
CREATE INDEX idx_community_moderator_community ON community_moderator (community_id);
|
|
|
|
CREATE INDEX idx_community_moderator_published ON community_moderator (published);
|
|
|
|
CREATE INDEX idx_person_block_person ON person_block (person_id);
|
|
|
|
CREATE INDEX idx_person_block_target ON person_block (target_id);
|
|
|
|
CREATE INDEX idx_person_post_aggregates_person ON person_post_aggregates (person_id);
|
|
|
|
CREATE INDEX idx_person_post_aggregates_post ON person_post_aggregates (post_id);
|
|
|
|
CREATE INDEX idx_post_like_post ON post_like (post_id);
|
|
|
|
DROP INDEX idx_person_actions_person, idx_person_actions_target, idx_post_actions_person, idx_post_actions_post;
|
|
|
|
-- Drop `NOT NULL` indexes of columns that still exist
|
|
DROP INDEX idx_comment_actions_liked_not_null, idx_community_actions_followed_not_null, idx_person_actions_followed_not_null, idx_post_actions_read_not_null, idx_instance_actions_blocked_not_null;
|
|
|
|
-- Drop statistics of columns that still exist
|
|
DROP statistics comment_actions_liked_stat, community_actions_followed_stat, person_actions_followed_stat;
|
|
|