Diesel 2.0.0 upgrade (#2452)

[lemmy.git] / crates / db_schema / src / source / comment.rs

diff --git a/crates/db_schema/src/source/comment.rs b/crates/db_schema/src/source/comment.rs
index fba61f4632de84b46043c4369fe0576d3dc02348..d9117bae134270b4d2ed3f78a5b9bab6b66d207c 100644 (file)
--- a/crates/db_schema/src/source/comment.rs
+++ b/crates/db_schema/src/source/comment.rs
@@ -1,75 +1,52 @@
-use crate::{
-  schema::{comment, comment_alias_1, comment_like, comment_saved},
-  source::post::Post,
-  CommentId,
-  DbUrl,
-  PersonId,
-  PostId,
-};
-use serde::Serialize;
+use crate::newtypes::{CommentId, DbUrl, LanguageId, LtreeDef, PersonId, PostId};
+use diesel_ltree::Ltree;
+use serde::{Deserialize, Serialize};
 
-// WITH RECURSIVE MyTree AS (
-//     SELECT * FROM comment WHERE parent_id IS NULL
-//     UNION ALL
-//     SELECT m.* FROM comment AS m JOIN MyTree AS t ON m.parent_id = t.id
-// )
-// SELECT * FROM MyTree;
+#[cfg(feature = "full")]
+use crate::schema::{comment, comment_like, comment_saved};
 
-#[derive(Clone, Queryable, Associations, Identifiable, PartialEq, Debug, Serialize)]
-#[belongs_to(Post)]
-#[table_name = "comment"]
+#[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize)]
+#[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable))]
+#[cfg_attr(feature = "full", diesel(belongs_to(crate::source::post::Post)))]
+#[cfg_attr(feature = "full", diesel(table_name = comment))]
 pub struct Comment {
   pub id: CommentId,
   pub creator_id: PersonId,
   pub post_id: PostId,
-  pub parent_id: Option<CommentId>,
   pub content: String,
   pub removed: bool,
-  pub read: bool, // Whether the recipient has read the comment or not
   pub published: chrono::NaiveDateTime,
   pub updated: Option<chrono::NaiveDateTime>,
   pub deleted: bool,
   pub ap_id: DbUrl,
   pub local: bool,
+  #[serde(with = "LtreeDef")]
+  pub path: Ltree,
+  pub distinguished: bool,
+  pub language_id: LanguageId,
 }
 
-#[derive(Clone, Queryable, Associations, Identifiable, PartialEq, Debug, Serialize)]
-#[belongs_to(Post)]
-#[table_name = "comment_alias_1"]
-pub struct CommentAlias1 {
-  pub id: CommentId,
-  pub creator_id: PersonId,
-  pub post_id: PostId,
-  pub parent_id: Option<CommentId>,
-  pub content: String,
-  pub removed: bool,
-  pub read: bool, // Whether the recipient has read the comment or not
-  pub published: chrono::NaiveDateTime,
-  pub updated: Option<chrono::NaiveDateTime>,
-  pub deleted: bool,
-  pub ap_id: DbUrl,
-  pub local: bool,
-}
-
-#[derive(Insertable, AsChangeset, Clone, Default)]
-#[table_name = "comment"]
+#[derive(Clone, Default)]
+#[cfg_attr(feature = "full", derive(Insertable, AsChangeset))]
+#[cfg_attr(feature = "full", diesel(table_name = comment))]
 pub struct CommentForm {
   pub creator_id: PersonId,
   pub post_id: PostId,
-  pub parent_id: Option<CommentId>,
   pub content: String,
   pub removed: Option<bool>,
-  pub read: Option<bool>,
   pub published: Option<chrono::NaiveDateTime>,
   pub updated: Option<chrono::NaiveDateTime>,
   pub deleted: Option<bool>,
   pub ap_id: Option<DbUrl>,
   pub local: Option<bool>,
+  pub distinguished: Option<bool>,
+  pub language_id: Option<LanguageId>,
 }
 
-#[derive(Identifiable, Queryable, Associations, PartialEq, Debug, Clone)]
-#[belongs_to(Comment)]
-#[table_name = "comment_like"]
+#[derive(PartialEq, Eq, Debug, Clone)]
+#[cfg_attr(feature = "full", derive(Identifiable, Queryable, Associations))]
+#[cfg_attr(feature = "full", diesel(belongs_to(crate::source::comment::Comment)))]
+#[cfg_attr(feature = "full", diesel(table_name = comment_like))]
 pub struct CommentLike {
   pub id: i32,
   pub person_id: PersonId,
@@ -79,8 +56,9 @@ pub struct CommentLike {
   pub published: chrono::NaiveDateTime,
 }
 
-#[derive(Insertable, AsChangeset, Clone)]
-#[table_name = "comment_like"]
+#[derive(Clone)]
+#[cfg_attr(feature = "full", derive(Insertable, AsChangeset))]
+#[cfg_attr(feature = "full", diesel(table_name = comment_like))]
 pub struct CommentLikeForm {
   pub person_id: PersonId,
   pub comment_id: CommentId,
@@ -88,9 +66,10 @@ pub struct CommentLikeForm {
   pub score: i16,
 }
 
-#[derive(Identifiable, Queryable, Associations, PartialEq, Debug)]
-#[belongs_to(Comment)]
-#[table_name = "comment_saved"]
+#[derive(PartialEq, Eq, Debug)]
+#[cfg_attr(feature = "full", derive(Identifiable, Queryable, Associations))]
+#[cfg_attr(feature = "full", diesel(belongs_to(crate::source::comment::Comment)))]
+#[cfg_attr(feature = "full", diesel(table_name = comment_saved))]
 pub struct CommentSaved {
   pub id: i32,
   pub comment_id: CommentId,
@@ -98,8 +77,8 @@ pub struct CommentSaved {
   pub published: chrono::NaiveDateTime,
 }
 
-#[derive(Insertable, AsChangeset)]
-#[table_name = "comment_saved"]
+#[cfg_attr(feature = "full", derive(Insertable, AsChangeset))]
+#[cfg_attr(feature = "full", diesel(table_name = comment_saved))]
 pub struct CommentSavedForm {
   pub comment_id: CommentId,
   pub person_id: PersonId,