Diesel 2.0.0 upgrade (#2452)

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

diff --git a/crates/db_schema/src/source/comment_report.rs b/crates/db_schema/src/source/comment_report.rs
index ec53408d125a13e677a8df257d7e9af856418695..6cc328d0de29f4d4adf6ba2c4288aa4237a33e73 100644 (file)
--- a/crates/db_schema/src/source/comment_report.rs
+++ b/crates/db_schema/src/source/comment_report.rs
@@ -1,28 +1,31 @@
-use crate::{schema::comment_report, source::comment::Comment};
+use crate::newtypes::{CommentId, CommentReportId, PersonId};
 use serde::{Deserialize, Serialize};
 
-#[derive(
-  Identifiable, Queryable, Associations, PartialEq, Serialize, Deserialize, Debug, Clone,
-)]
-#[belongs_to(Comment)]
-#[table_name = "comment_report"]
+#[cfg(feature = "full")]
+use crate::schema::comment_report;
+
+#[derive(PartialEq, Eq, Serialize, Deserialize, Debug, Clone)]
+#[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable))]
+#[cfg_attr(feature = "full", diesel(belongs_to(crate::source::comment::Comment)))]
+#[cfg_attr(feature = "full", diesel(table_name = comment_report))]
 pub struct CommentReport {
-  pub id: i32,
-  pub creator_id: i32,
-  pub comment_id: i32,
+  pub id: CommentReportId,
+  pub creator_id: PersonId,
+  pub comment_id: CommentId,
   pub original_comment_text: String,
   pub reason: String,
   pub resolved: bool,
-  pub resolver_id: Option<i32>,
+  pub resolver_id: Option<PersonId>,
   pub published: chrono::NaiveDateTime,
   pub updated: Option<chrono::NaiveDateTime>,
 }
 
-#[derive(Insertable, AsChangeset, Clone)]
-#[table_name = "comment_report"]
+#[derive(Clone)]
+#[cfg_attr(feature = "full", derive(Insertable, AsChangeset))]
+#[cfg_attr(feature = "full", diesel(table_name = comment_report))]
 pub struct CommentReportForm {
-  pub creator_id: i32,
-  pub comment_id: i32,
+  pub creator_id: PersonId,
+  pub comment_id: CommentId,
   pub original_comment_text: String,
   pub reason: String,
 }