From: Ernest <ernestwisniewski2@gmail.com>
Date: Sun, 12 Jul 2020 18:27:21 +0000 (+0200)
Subject: Migration fix
X-Git-Url: http://these/git/%7B%24%7B%60data:application/%22%7Burl%7D/%7Bthis.state.url%7D?a=commitdiff_plain;h=82dcaa454557fae1a1506efa18b2eb3d40533a8e;p=lemmy.git

Migration fix
---

diff --git a/server/migrations/2020-07-12-100442_add_post_title_to_comments_view/down.sql b/server/migrations/2020-07-12-100442_add_post_title_to_comments_view/down.sql
index e947d674..b7c9d51e 100644
--- a/server/migrations/2020-07-12-100442_add_post_title_to_comments_view/down.sql
+++ b/server/migrations/2020-07-12-100442_add_post_title_to_comments_view/down.sql
@@ -1,9 +1,9 @@
---drop view user_mention_view;
---drop view reply_fast_view;
+drop view user_mention_view;
+drop view reply_fast_view;
 drop view comment_fast_view;
 drop view comment_view;
 
---drop view user_mention_fast_view;
+drop view user_mention_fast_view;
 drop table comment_aggregates_fast;
 drop view comment_aggregates_view;
 
@@ -107,284 +107,143 @@ select
     null as saved
 from comment_aggregates_fast cav;
 
---create view user_mention_view as
---select
---    c.id,
---    um.id as user_mention_id,
---    c.creator_id,
---    c.creator_actor_id,
---    c.creator_local,
---    c.post_id,
---    c.parent_id,
---    c.content,
---    c.removed,
---    um.read,
---    c.published,
---    c.updated,
---    c.deleted,
---    c.community_id,
---    c.community_actor_id,
---    c.community_local,
---    c.community_name,
---    c.banned,
---    c.banned_from_community,
---    c.creator_name,
---    c.creator_avatar,
---    c.score,
---    c.upvotes,
---    c.downvotes,
---    c.hot_rank,
---    c.user_id,
---    c.my_vote,
---    c.saved,
---    um.recipient_id,
---    (select actor_id from user_ u where u.id = um.recipient_id) as recipient_actor_id,
---    (select local from user_ u where u.id = um.recipient_id) as recipient_local
---from user_mention um, comment_view c
---where um.comment_id = c.id;
+create view user_mention_view as
+select
+    c.id,
+    um.id as user_mention_id,
+    c.creator_id,
+    c.creator_actor_id,
+    c.creator_local,
+    c.post_id,
+    c.parent_id,
+    c.content,
+    c.removed,
+    um.read,
+    c.published,
+    c.updated,
+    c.deleted,
+    c.community_id,
+    c.community_actor_id,
+    c.community_local,
+    c.community_name,
+    c.banned,
+    c.banned_from_community,
+    c.creator_name,
+    c.creator_avatar,
+    c.score,
+    c.upvotes,
+    c.downvotes,
+    c.hot_rank,
+    c.user_id,
+    c.my_vote,
+    c.saved,
+    um.recipient_id,
+    (select actor_id from user_ u where u.id = um.recipient_id) as recipient_actor_id,
+    (select local from user_ u where u.id = um.recipient_id) as recipient_local
+from user_mention um, comment_view c
+where um.comment_id = c.id;
+
+create view user_mention_fast_view as
+select
+    ac.id,
+    um.id as user_mention_id,
+    ac.creator_id,
+    ac.creator_actor_id,
+    ac.creator_local,
+    ac.post_id,
+    ac.parent_id,
+    ac.content,
+    ac.removed,
+    um.read,
+    ac.published,
+    ac.updated,
+    ac.deleted,
+    ac.community_id,
+    ac.community_actor_id,
+    ac.community_local,
+    ac.community_name,
+    ac.banned,
+    ac.banned_from_community,
+    ac.creator_name,
+    ac.creator_avatar,
+    ac.score,
+    ac.upvotes,
+    ac.downvotes,
+    ac.hot_rank,
+    u.id as user_id,
+    coalesce(cl.score, 0) as my_vote,
+    (select cs.id::bool from comment_saved cs where u.id = cs.user_id and cs.comment_id = ac.id) as saved,
+    um.recipient_id,
+    (select actor_id from user_ u where u.id = um.recipient_id) as recipient_actor_id,
+    (select local from user_ u where u.id = um.recipient_id) as recipient_local
+from user_ u
+cross join (
+  select
+  ca.*
+  from comment_aggregates_fast ca
+) ac
+left join comment_like cl on u.id = cl.user_id and ac.id = cl.comment_id
+left join user_mention um on um.comment_id = ac.id
+
+union all
 
---create view user_mention_fast_view as
---select
---    ac.id,
---    um.id as user_mention_id,
---    ac.creator_id,
---    ac.creator_actor_id,
---    ac.creator_local,
---    ac.post_id,
---    ac.parent_id,
---    ac.content,
---    ac.removed,
---    um.read,
---    ac.published,
---    ac.updated,
---    ac.deleted,
---    ac.community_id,
---    ac.community_actor_id,
---    ac.community_local,
---    ac.community_name,
---    ac.banned,
---    ac.banned_from_community,
---    ac.creator_name,
---    ac.creator_avatar,
---    ac.score,
---    ac.upvotes,
---    ac.downvotes,
---    ac.hot_rank,
---    u.id as user_id,
---    coalesce(cl.score, 0) as my_vote,
---    (select cs.id::bool from comment_saved cs where u.id = cs.user_id and cs.comment_id = ac.id) as saved,
---    um.recipient_id,
---    (select actor_id from user_ u where u.id = um.recipient_id) as recipient_actor_id,
---    (select local from user_ u where u.id = um.recipient_id) as recipient_local
---from user_ u
---cross join (
---  select
---  ca.*
---  from comment_aggregates_fast ca
---) ac
---left join comment_like cl on u.id = cl.user_id and ac.id = cl.comment_id
---left join user_mention um on um.comment_id = ac.id
---
---union all
---
---select
---    ac.id,
---    um.id as user_mention_id,
---    ac.creator_id,
---    ac.creator_actor_id,
---    ac.creator_local,
---    ac.post_id,
---    ac.parent_id,
---    ac.content,
---    ac.removed,
---    um.read,
---    ac.published,
---    ac.updated,
---    ac.deleted,
---    ac.community_id,
---    ac.community_actor_id,
---    ac.community_local,
---    ac.community_name,
---    ac.banned,
---    ac.banned_from_community,
---    ac.creator_name,
---    ac.creator_avatar,
---    ac.score,
---    ac.upvotes,
---    ac.downvotes,
---    ac.hot_rank,
---    null as user_id,
---    null as my_vote,
---    null as saved,
---    um.recipient_id,
---    (select actor_id from user_ u where u.id = um.recipient_id) as recipient_actor_id,
---    (select local from user_ u where u.id = um.recipient_id) as recipient_local
---from comment_aggregates_fast ac
---left join user_mention um on um.comment_id = ac.id
---;
+select
+    ac.id,
+    um.id as user_mention_id,
+    ac.creator_id,
+    ac.creator_actor_id,
+    ac.creator_local,
+    ac.post_id,
+    ac.parent_id,
+    ac.content,
+    ac.removed,
+    um.read,
+    ac.published,
+    ac.updated,
+    ac.deleted,
+    ac.community_id,
+    ac.community_actor_id,
+    ac.community_local,
+    ac.community_name,
+    ac.banned,
+    ac.banned_from_community,
+    ac.creator_name,
+    ac.creator_avatar,
+    ac.score,
+    ac.upvotes,
+    ac.downvotes,
+    ac.hot_rank,
+    null as user_id,
+    null as my_vote,
+    null as saved,
+    um.recipient_id,
+    (select actor_id from user_ u where u.id = um.recipient_id) as recipient_actor_id,
+    (select local from user_ u where u.id = um.recipient_id) as recipient_local
+from comment_aggregates_fast ac
+left join user_mention um on um.comment_id = ac.id
+;
 
 -- Do the reply_view referencing the comment_fast_view
---create view reply_fast_view as
---with closereply as (
---    select
---    c2.id,
---    c2.creator_id as sender_id,
---    c.creator_id as recipient_id
---    from comment c
---    inner join comment c2 on c.id = c2.parent_id
---    where c2.creator_id != c.creator_id
---    -- Do union where post is null
---    union
---    select
---    c.id,
---    c.creator_id as sender_id,
---    p.creator_id as recipient_id
---    from comment c, post p
---    where c.post_id = p.id and c.parent_id is null and c.creator_id != p.creator_id
---)
---select cv.*,
---closereply.recipient_id
---from comment_fast_view cv, closereply
---where closereply.id = cv.id
---;
---
----- add creator_published to the post view
---drop view post_fast_view;
---drop table post_aggregates_fast;
---drop view post_view;
---drop view post_aggregates_view;
---
---create view post_aggregates_view as
---select
---	p.*,
---	-- creator details
---	u.actor_id as creator_actor_id,
---	u."local" as creator_local,
---	u."name" as creator_name,
---  u.published as creator_published,
---	u.avatar as creator_avatar,
---  u.banned as banned,
---  cb.id::bool as banned_from_community,
---	-- community details
---	c.actor_id as community_actor_id,
---	c."local" as community_local,
---	c."name" as community_name,
---	c.removed as community_removed,
---	c.deleted as community_deleted,
---	c.nsfw as community_nsfw,
---	-- post score data/comment count
---	coalesce(ct.comments, 0) as number_of_comments,
---	coalesce(pl.score, 0) as score,
---	coalesce(pl.upvotes, 0) as upvotes,
---	coalesce(pl.downvotes, 0) as downvotes,
---	hot_rank(
---		coalesce(pl.score , 0), (
---			case
---				when (p.published < ('now'::timestamp - '1 month'::interval))
---				then p.published
---				else greatest(ct.recent_comment_time, p.published)
---			end
---		)
---	) as hot_rank,
---	(
---		case
---			when (p.published < ('now'::timestamp - '1 month'::interval))
---			then p.published
---			else greatest(ct.recent_comment_time, p.published)
---		end
---	) as newest_activity_time
---from post p
---left join user_ u on p.creator_id = u.id
---left join community_user_ban cb on p.creator_id = cb.user_id and p.community_id = cb.community_id
---left join community c on p.community_id = c.id
---left join (
---	select
---		post_id,
---		count(*) as comments,
---		max(published) as recent_comment_time
---	from comment
---	group by post_id
---) ct on ct.post_id = p.id
---left join (
---	select
---		post_id,
---		sum(score) as score,
---		sum(score) filter (where score = 1) as upvotes,
---		-sum(score) filter (where score = -1) as downvotes
---	from post_like
---	group by post_id
---) pl on pl.post_id = p.id
---order by p.id;
---
---create view post_view as
---select
---	pav.*,
---	us.id as user_id,
---	us.user_vote as my_vote,
---	us.is_subbed::bool as subscribed,
---	us.is_read::bool as read,
---	us.is_saved::bool as saved
---from post_aggregates_view pav
---cross join lateral (
---	select
---		u.id,
---		coalesce(cf.community_id, 0) as is_subbed,
---		coalesce(pr.post_id, 0) as is_read,
---		coalesce(ps.post_id, 0) as is_saved,
---		coalesce(pl.score, 0) as user_vote
---	from user_ u
---	left join community_user_ban cb on u.id = cb.user_id and cb.community_id = pav.community_id
---	left join community_follower cf on u.id = cf.user_id and cf.community_id = pav.community_id
---	left join post_read pr on u.id = pr.user_id and pr.post_id = pav.id
---	left join post_saved ps on u.id = ps.user_id and ps.post_id = pav.id
---	left join post_like pl on u.id = pl.user_id and pav.id = pl.post_id
---) as us
---
---union all
---
---select
---pav.*,
---null as user_id,
---null as my_vote,
---null as subscribed,
---null as read,
---null as saved
---from post_aggregates_view pav;
---
---create table post_aggregates_fast as select * from post_aggregates_view;
---alter table post_aggregates_fast add primary key (id);
---
---create view post_fast_view as
---select
---	pav.*,
---	us.id as user_id,
---	us.user_vote as my_vote,
---	us.is_subbed::bool as subscribed,
---	us.is_read::bool as read,
---	us.is_saved::bool as saved
---from post_aggregates_fast pav
---cross join lateral (
---	select
---		u.id,
---		coalesce(cf.community_id, 0) as is_subbed,
---		coalesce(pr.post_id, 0) as is_read,
---		coalesce(ps.post_id, 0) as is_saved,
---		coalesce(pl.score, 0) as user_vote
---	from user_ u
---	left join community_user_ban cb on u.id = cb.user_id and cb.community_id = pav.community_id
---	left join community_follower cf on u.id = cf.user_id and cf.community_id = pav.community_id
---	left join post_read pr on u.id = pr.user_id and pr.post_id = pav.id
---	left join post_saved ps on u.id = ps.user_id and ps.post_id = pav.id
---	left join post_like pl on u.id = pl.user_id and pav.id = pl.post_id
---) as us
---
---union all
---
---select
---pav.*,
---null as user_id,
---null as my_vote,
---null as subscribed,
---null as read,
---null as saved
---from post_aggregates_fast pav;
\ No newline at end of file
+create view reply_fast_view as
+with closereply as (
+    select
+    c2.id,
+    c2.creator_id as sender_id,
+    c.creator_id as recipient_id
+    from comment c
+    inner join comment c2 on c.id = c2.parent_id
+    where c2.creator_id != c.creator_id
+    -- Do union where post is null
+    union
+    select
+    c.id,
+    c.creator_id as sender_id,
+    p.creator_id as recipient_id
+    from comment c, post p
+    where c.post_id = p.id and c.parent_id is null and c.creator_id != p.creator_id
+)
+select cv.*,
+closereply.recipient_id
+from comment_fast_view cv, closereply
+where closereply.id = cv.id
+;
\ No newline at end of file
diff --git a/server/migrations/2020-07-12-100442_add_post_title_to_comments_view/up.sql b/server/migrations/2020-07-12-100442_add_post_title_to_comments_view/up.sql
index 89c94ea2..4cfa7edb 100644
--- a/server/migrations/2020-07-12-100442_add_post_title_to_comments_view/up.sql
+++ b/server/migrations/2020-07-12-100442_add_post_title_to_comments_view/up.sql
@@ -10,9 +10,10 @@ drop view comment_aggregates_view;
 create view comment_aggregates_view as
 select
 	ct.*,
-	-- community details
-	p.community_id,
+	-- post details
 	p."name" as post_name,
+	p.community_id,
+	-- community details
 	c.actor_id as community_actor_id,
 	c."local" as community_local,
 	c."name" as community_name,
@@ -116,6 +117,7 @@ select
     c.creator_actor_id,
     c.creator_local,
     c.post_id,
+    c.post_name,
     c.parent_id,
     c.content,
     c.removed,
@@ -152,6 +154,7 @@ select
     ac.creator_actor_id,
     ac.creator_local,
     ac.post_id,
+    ac.post_name,
     ac.parent_id,
     ac.content,
     ac.removed,
@@ -195,6 +198,7 @@ select
     ac.creator_actor_id,
     ac.creator_local,
     ac.post_id,
+    ac.post_name,
     ac.parent_id,
     ac.content,
     ac.removed,
@@ -247,145 +251,4 @@ select cv.*,
 closereply.recipient_id
 from comment_fast_view cv, closereply
 where closereply.id = cv.id
-;
-
--- add creator_published to the post view
-drop view post_fast_view;
-drop table post_aggregates_fast;
-drop view post_view;
-drop view post_aggregates_view;
-
-create view post_aggregates_view as
-select
-	p.*,
-	-- creator details
-	u.actor_id as creator_actor_id,
-	u."local" as creator_local,
-	u."name" as creator_name,
-  u.published as creator_published,
-	u.avatar as creator_avatar,
-  u.banned as banned,
-  cb.id::bool as banned_from_community,
-	-- community details
-	c.actor_id as community_actor_id,
-	c."local" as community_local,
-	c."name" as community_name,
-	c.removed as community_removed,
-	c.deleted as community_deleted,
-	c.nsfw as community_nsfw,
-	-- post score data/comment count
-	coalesce(ct.comments, 0) as number_of_comments,
-	coalesce(pl.score, 0) as score,
-	coalesce(pl.upvotes, 0) as upvotes,
-	coalesce(pl.downvotes, 0) as downvotes,
-	hot_rank(
-		coalesce(pl.score , 0), (
-			case
-				when (p.published < ('now'::timestamp - '1 month'::interval))
-				then p.published
-				else greatest(ct.recent_comment_time, p.published)
-			end
-		)
-	) as hot_rank,
-	(
-		case
-			when (p.published < ('now'::timestamp - '1 month'::interval))
-			then p.published
-			else greatest(ct.recent_comment_time, p.published)
-		end
-	) as newest_activity_time
-from post p
-left join user_ u on p.creator_id = u.id
-left join community_user_ban cb on p.creator_id = cb.user_id and p.community_id = cb.community_id
-left join community c on p.community_id = c.id
-left join (
-	select
-		post_id,
-		count(*) as comments,
-		max(published) as recent_comment_time
-	from comment
-	group by post_id
-) ct on ct.post_id = p.id
-left join (
-	select
-		post_id,
-		sum(score) as score,
-		sum(score) filter (where score = 1) as upvotes,
-		-sum(score) filter (where score = -1) as downvotes
-	from post_like
-	group by post_id
-) pl on pl.post_id = p.id
-order by p.id;
-
-create view post_view as
-select
-	pav.*,
-	us.id as user_id,
-	us.user_vote as my_vote,
-	us.is_subbed::bool as subscribed,
-	us.is_read::bool as read,
-	us.is_saved::bool as saved
-from post_aggregates_view pav
-cross join lateral (
-	select
-		u.id,
-		coalesce(cf.community_id, 0) as is_subbed,
-		coalesce(pr.post_id, 0) as is_read,
-		coalesce(ps.post_id, 0) as is_saved,
-		coalesce(pl.score, 0) as user_vote
-	from user_ u
-	left join community_user_ban cb on u.id = cb.user_id and cb.community_id = pav.community_id
-	left join community_follower cf on u.id = cf.user_id and cf.community_id = pav.community_id
-	left join post_read pr on u.id = pr.user_id and pr.post_id = pav.id
-	left join post_saved ps on u.id = ps.user_id and ps.post_id = pav.id
-	left join post_like pl on u.id = pl.user_id and pav.id = pl.post_id
-) as us
-
-union all
-
-select
-pav.*,
-null as user_id,
-null as my_vote,
-null as subscribed,
-null as read,
-null as saved
-from post_aggregates_view pav;
-
-create table post_aggregates_fast as select * from post_aggregates_view;
-alter table post_aggregates_fast add primary key (id);
-
-create view post_fast_view as
-select
-	pav.*,
-	us.id as user_id,
-	us.user_vote as my_vote,
-	us.is_subbed::bool as subscribed,
-	us.is_read::bool as read,
-	us.is_saved::bool as saved
-from post_aggregates_fast pav
-cross join lateral (
-	select
-		u.id,
-		coalesce(cf.community_id, 0) as is_subbed,
-		coalesce(pr.post_id, 0) as is_read,
-		coalesce(ps.post_id, 0) as is_saved,
-		coalesce(pl.score, 0) as user_vote
-	from user_ u
-	left join community_user_ban cb on u.id = cb.user_id and cb.community_id = pav.community_id
-	left join community_follower cf on u.id = cf.user_id and cf.community_id = pav.community_id
-	left join post_read pr on u.id = pr.user_id and pr.post_id = pav.id
-	left join post_saved ps on u.id = ps.user_id and ps.post_id = pav.id
-	left join post_like pl on u.id = pl.user_id and pav.id = pl.post_id
-) as us
-
-union all
-
-select
-pav.*,
-null as user_id,
-null as my_vote,
-null as subscribed,
-null as read,
-null as saved
-from post_aggregates_fast pav;
\ No newline at end of file
+;
\ No newline at end of file