mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-22 20:31:19 +00:00
Remove comment_like.post_id column which is unnecessary (ref #5122)
This commit is contained in:
parent
859dfb3f81
commit
46b8820be5
13 changed files with 21 additions and 20 deletions
|
@ -67,7 +67,6 @@ pub async fn like_comment(
|
||||||
|
|
||||||
let like_form = CommentLikeForm {
|
let like_form = CommentLikeForm {
|
||||||
comment_id: data.comment_id,
|
comment_id: data.comment_id,
|
||||||
post_id: orig_comment.post.id,
|
|
||||||
person_id: local_user_view.person.id,
|
person_id: local_user_view.person.id,
|
||||||
score: data.score,
|
score: data.score,
|
||||||
};
|
};
|
||||||
|
|
|
@ -132,7 +132,6 @@ pub async fn create_comment(
|
||||||
// You like your own comment by default
|
// You like your own comment by default
|
||||||
let like_form = CommentLikeForm {
|
let like_form = CommentLikeForm {
|
||||||
comment_id: inserted_comment.id,
|
comment_id: inserted_comment.id,
|
||||||
post_id: post.id,
|
|
||||||
person_id: local_user_view.person.id,
|
person_id: local_user_view.person.id,
|
||||||
score: 1,
|
score: 1,
|
||||||
};
|
};
|
||||||
|
|
|
@ -153,7 +153,6 @@ impl ActivityHandler for CreateOrUpdateNote {
|
||||||
// author likes their own comment by default
|
// author likes their own comment by default
|
||||||
let like_form = CommentLikeForm {
|
let like_form = CommentLikeForm {
|
||||||
comment_id: comment.id,
|
comment_id: comment.id,
|
||||||
post_id: comment.post_id,
|
|
||||||
person_id: comment.creator_id,
|
person_id: comment.creator_id,
|
||||||
score: 1,
|
score: 1,
|
||||||
};
|
};
|
||||||
|
|
|
@ -62,7 +62,6 @@ async fn vote_comment(
|
||||||
let comment_id = comment.id;
|
let comment_id = comment.id;
|
||||||
let like_form = CommentLikeForm {
|
let like_form = CommentLikeForm {
|
||||||
comment_id,
|
comment_id,
|
||||||
post_id: comment.post_id,
|
|
||||||
person_id: actor.id,
|
person_id: actor.id,
|
||||||
score: vote_type.into(),
|
score: vote_type.into(),
|
||||||
};
|
};
|
||||||
|
|
|
@ -96,7 +96,6 @@ mod tests {
|
||||||
|
|
||||||
let comment_like = CommentLikeForm {
|
let comment_like = CommentLikeForm {
|
||||||
comment_id: inserted_comment.id,
|
comment_id: inserted_comment.id,
|
||||||
post_id: inserted_post.id,
|
|
||||||
person_id: inserted_person.id,
|
person_id: inserted_person.id,
|
||||||
score: 1,
|
score: 1,
|
||||||
};
|
};
|
||||||
|
@ -112,7 +111,6 @@ mod tests {
|
||||||
// Add a post dislike from the other person
|
// Add a post dislike from the other person
|
||||||
let comment_dislike = CommentLikeForm {
|
let comment_dislike = CommentLikeForm {
|
||||||
comment_id: inserted_comment.id,
|
comment_id: inserted_comment.id,
|
||||||
post_id: inserted_post.id,
|
|
||||||
person_id: another_inserted_person.id,
|
person_id: another_inserted_person.id,
|
||||||
score: -1,
|
score: -1,
|
||||||
};
|
};
|
||||||
|
|
|
@ -82,7 +82,6 @@ mod tests {
|
||||||
let mut comment_like = CommentLikeForm {
|
let mut comment_like = CommentLikeForm {
|
||||||
comment_id: inserted_comment.id,
|
comment_id: inserted_comment.id,
|
||||||
person_id: inserted_person.id,
|
person_id: inserted_person.id,
|
||||||
post_id: inserted_post.id,
|
|
||||||
score: 1,
|
score: 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -99,7 +98,6 @@ mod tests {
|
||||||
let child_comment_like = CommentLikeForm {
|
let child_comment_like = CommentLikeForm {
|
||||||
comment_id: inserted_child_comment.id,
|
comment_id: inserted_child_comment.id,
|
||||||
person_id: another_inserted_person.id,
|
person_id: another_inserted_person.id,
|
||||||
post_id: inserted_post.id,
|
|
||||||
score: 1,
|
score: 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -289,7 +289,6 @@ mod tests {
|
||||||
// Comment Like
|
// Comment Like
|
||||||
let comment_like_form = CommentLikeForm {
|
let comment_like_form = CommentLikeForm {
|
||||||
comment_id: inserted_comment.id,
|
comment_id: inserted_comment.id,
|
||||||
post_id: inserted_post.id,
|
|
||||||
person_id: inserted_person.id,
|
person_id: inserted_person.id,
|
||||||
score: 1,
|
score: 1,
|
||||||
};
|
};
|
||||||
|
@ -298,7 +297,6 @@ mod tests {
|
||||||
|
|
||||||
let expected_comment_like = CommentLike {
|
let expected_comment_like = CommentLike {
|
||||||
comment_id: inserted_comment.id,
|
comment_id: inserted_comment.id,
|
||||||
post_id: inserted_post.id,
|
|
||||||
person_id: inserted_person.id,
|
person_id: inserted_person.id,
|
||||||
published: inserted_comment_like.published,
|
published: inserted_comment_like.published,
|
||||||
score: 1,
|
score: 1,
|
||||||
|
|
|
@ -123,7 +123,6 @@ diesel::table! {
|
||||||
comment_like (person_id, comment_id) {
|
comment_like (person_id, comment_id) {
|
||||||
person_id -> Int4,
|
person_id -> Int4,
|
||||||
comment_id -> Int4,
|
comment_id -> Int4,
|
||||||
post_id -> Int4,
|
|
||||||
score -> Int2,
|
score -> Int2,
|
||||||
published -> Timestamptz,
|
published -> Timestamptz,
|
||||||
}
|
}
|
||||||
|
@ -999,7 +998,6 @@ diesel::joinable!(comment -> post (post_id));
|
||||||
diesel::joinable!(comment_aggregates -> comment (comment_id));
|
diesel::joinable!(comment_aggregates -> comment (comment_id));
|
||||||
diesel::joinable!(comment_like -> comment (comment_id));
|
diesel::joinable!(comment_like -> comment (comment_id));
|
||||||
diesel::joinable!(comment_like -> person (person_id));
|
diesel::joinable!(comment_like -> person (person_id));
|
||||||
diesel::joinable!(comment_like -> post (post_id));
|
|
||||||
diesel::joinable!(comment_reply -> comment (comment_id));
|
diesel::joinable!(comment_reply -> comment (comment_id));
|
||||||
diesel::joinable!(comment_reply -> person (recipient_id));
|
diesel::joinable!(comment_reply -> person (recipient_id));
|
||||||
diesel::joinable!(comment_report -> comment (comment_id));
|
diesel::joinable!(comment_report -> comment (comment_id));
|
||||||
|
|
|
@ -102,7 +102,6 @@ pub struct CommentUpdateForm {
|
||||||
pub struct CommentLike {
|
pub struct CommentLike {
|
||||||
pub person_id: PersonId,
|
pub person_id: PersonId,
|
||||||
pub comment_id: CommentId,
|
pub comment_id: CommentId,
|
||||||
pub post_id: PostId, // TODO this is redundant
|
|
||||||
pub score: i16,
|
pub score: i16,
|
||||||
pub published: DateTime<Utc>,
|
pub published: DateTime<Utc>,
|
||||||
}
|
}
|
||||||
|
@ -113,7 +112,6 @@ pub struct CommentLike {
|
||||||
pub struct CommentLikeForm {
|
pub struct CommentLikeForm {
|
||||||
pub person_id: PersonId,
|
pub person_id: PersonId,
|
||||||
pub comment_id: CommentId,
|
pub comment_id: CommentId,
|
||||||
pub post_id: PostId, // TODO this is redundant
|
|
||||||
pub score: i16,
|
pub score: i16,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -601,7 +601,6 @@ mod tests {
|
||||||
|
|
||||||
let comment_like_form = CommentLikeForm {
|
let comment_like_form = CommentLikeForm {
|
||||||
comment_id: inserted_comment_0.id,
|
comment_id: inserted_comment_0.id,
|
||||||
post_id: inserted_post.id,
|
|
||||||
person_id: inserted_timmy_person.id,
|
person_id: inserted_timmy_person.id,
|
||||||
score: 1,
|
score: 1,
|
||||||
};
|
};
|
||||||
|
@ -701,7 +700,6 @@ mod tests {
|
||||||
// Like a new comment
|
// Like a new comment
|
||||||
let comment_like_form = CommentLikeForm {
|
let comment_like_form = CommentLikeForm {
|
||||||
comment_id: data.inserted_comment_1.id,
|
comment_id: data.inserted_comment_1.id,
|
||||||
post_id: data.inserted_post.id,
|
|
||||||
person_id: data.timmy_local_user_view.person.id,
|
person_id: data.timmy_local_user_view.person.id,
|
||||||
score: 1,
|
score: 1,
|
||||||
};
|
};
|
||||||
|
|
|
@ -10,7 +10,7 @@ use diesel::{
|
||||||
use diesel_async::RunQueryDsl;
|
use diesel_async::RunQueryDsl;
|
||||||
use lemmy_db_schema::{
|
use lemmy_db_schema::{
|
||||||
newtypes::{CommentId, PostId},
|
newtypes::{CommentId, PostId},
|
||||||
schema::{comment_like, community_person_ban, person, post, post_like},
|
schema::{comment, comment_like, community_person_ban, person, post, post_like},
|
||||||
utils::{get_conn, limit_and_offset, DbPool},
|
utils::{get_conn, limit_and_offset, DbPool},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -59,7 +59,8 @@ impl VoteView {
|
||||||
|
|
||||||
comment_like::table
|
comment_like::table
|
||||||
.inner_join(person::table)
|
.inner_join(person::table)
|
||||||
.inner_join(post::table)
|
.inner_join(comment::table)
|
||||||
|
.inner_join(post::table.on(comment::post_id.eq(post::id)))
|
||||||
// Join to community_person_ban to get creator_banned_from_community
|
// Join to community_person_ban to get creator_banned_from_community
|
||||||
.left_join(
|
.left_join(
|
||||||
community_person_ban::table.on(
|
community_person_ban::table.on(
|
||||||
|
@ -173,7 +174,6 @@ mod tests {
|
||||||
|
|
||||||
// Timothy votes down his own comment
|
// Timothy votes down his own comment
|
||||||
let timmy_comment_vote_form = CommentLikeForm {
|
let timmy_comment_vote_form = CommentLikeForm {
|
||||||
post_id: inserted_post.id,
|
|
||||||
comment_id: inserted_comment.id,
|
comment_id: inserted_comment.id,
|
||||||
person_id: inserted_timmy.id,
|
person_id: inserted_timmy.id,
|
||||||
score: -1,
|
score: -1,
|
||||||
|
@ -182,7 +182,6 @@ mod tests {
|
||||||
|
|
||||||
// Sara upvotes timmy's comment
|
// Sara upvotes timmy's comment
|
||||||
let sara_comment_vote_form = CommentLikeForm {
|
let sara_comment_vote_form = CommentLikeForm {
|
||||||
post_id: inserted_post.id,
|
|
||||||
comment_id: inserted_comment.id,
|
comment_id: inserted_comment.id,
|
||||||
person_id: inserted_sara.id,
|
person_id: inserted_sara.id,
|
||||||
score: 1,
|
score: 1,
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
ALTER TABLE comment_like
|
||||||
|
ADD COLUMN post_id int;
|
||||||
|
|
||||||
|
UPDATE
|
||||||
|
comment_like
|
||||||
|
SET
|
||||||
|
post_id = comment.post_id
|
||||||
|
FROM
|
||||||
|
comment
|
||||||
|
WHERE
|
||||||
|
comment_id = comment.id;
|
||||||
|
|
||||||
|
ALTER TABLE comment_like
|
||||||
|
ALTER COLUMN post_id SET NOT NULL;
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
ALTER TABLE comment_like
|
||||||
|
DROP post_id;
|
||||||
|
|
Loading…
Reference in a new issue