db_schema crate is close to building?

LemmyNet · May 11, 2022 · bf8f55d · bf8f55d
1 parent a523e4e
commit bf8f55d
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 11 deletions.
diff --git a/crates/db_schema/src/aggregates/structs.rs b/crates/db_schema/src/aggregates/structs.rs
@@ -13,6 +13,7 @@ use crate::schema::{
 #[derive(PartialEq, Debug, Serialize, Deserialize, Clone)]
 #[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable))]
 #[cfg_attr(feature = "full", table_name = "comment_aggregates")]
+#[cfg_attr(feature = "full", belongs_to(crate::source::comment::Comment))]
 pub struct CommentAggregates {
   pub id: i32,
   pub comment_id: CommentId,
@@ -25,6 +26,7 @@ pub struct CommentAggregates {
 #[derive(PartialEq, Debug, Serialize, Deserialize, Clone)]
 #[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable))]
 #[cfg_attr(feature = "full", table_name = "community_aggregates")]
+#[cfg_attr(feature = "full", belongs_to(crate::source::community::Community))]
 pub struct CommunityAggregates {
   pub id: i32,
   pub community_id: CommunityId,
@@ -41,6 +43,7 @@ pub struct CommunityAggregates {
 #[derive(PartialEq, Debug, Serialize, Deserialize, Clone, Default)]
 #[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable))]
 #[cfg_attr(feature = "full", table_name = "person_aggregates")]
+#[cfg_attr(feature = "full", belongs_to(crate::source::person::Person))]
 pub struct PersonAggregates {
   pub id: i32,
   pub person_id: PersonId,
@@ -53,6 +56,7 @@ pub struct PersonAggregates {
 #[derive(PartialEq, Debug, Serialize, Deserialize, Clone)]
 #[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable))]
 #[cfg_attr(feature = "full", table_name = "post_aggregates")]
+#[cfg_attr(feature = "full", belongs_to(crate::source::post::Post))]
 pub struct PostAggregates {
   pub id: i32,
   pub post_id: PostId,
@@ -69,6 +73,7 @@ pub struct PostAggregates {
 #[derive(PartialEq, Debug, Serialize, Deserialize, Clone)]
 #[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable))]
 #[cfg_attr(feature = "full", table_name = "site_aggregates")]
+#[cfg_attr(feature = "full", belongs_to(crate::source::site::Site))]
 pub struct SiteAggregates {
   pub id: i32,
   pub site_id: i32,

diff --git a/crates/db_schema/src/source/comment.rs b/crates/db_schema/src/source/comment.rs
@@ -68,7 +68,7 @@ pub struct CommentForm {
 
 #[derive(PartialEq, Debug, Clone)]
 #[cfg_attr(feature = "full", derive(Identifiable, Queryable, Associations))]
-#[cfg_attr(feature = "full", belongs_to(Comment))]
+#[cfg_attr(feature = "full", belongs_to(crate::source::comment::Comment))]
 #[cfg_attr(feature = "full", table_name = "comment_like")]
 pub struct CommentLike {
   pub id: i32,
@@ -91,7 +91,7 @@ pub struct CommentLikeForm {
 
 #[derive(PartialEq, Debug)]
 #[cfg_attr(feature = "full", derive(Identifiable, Queryable, Associations))]
-#[cfg_attr(feature = "full", belongs_to(Comment))]
+#[cfg_attr(feature = "full", belongs_to(crate::source::comment::Comment))]
 #[cfg_attr(feature = "full", table_name = "comment_saved")]
 pub struct CommentSaved {
   pub id: i32,

diff --git a/crates/db_schema/src/source/community.rs b/crates/db_schema/src/source/community.rs
@@ -81,7 +81,7 @@ pub struct CommunityForm {
 
 #[derive(PartialEq, Debug)]
 #[cfg_attr(feature = "full", derive(Identifiable, Queryable, Associations))]
-#[cfg_attr(feature = "full", belongs_to(Community))]
+#[cfg_attr(feature = "full", belongs_to(crate::source::community::Community))]
 #[cfg_attr(feature = "full", table_name = "community_moderator")]
 pub struct CommunityModerator {
   pub id: i32,
@@ -100,7 +100,7 @@ pub struct CommunityModeratorForm {
 
 #[derive(PartialEq, Debug)]
 #[cfg_attr(feature = "full", derive(Identifiable, Queryable, Associations))]
-#[cfg_attr(feature = "full", belongs_to(Community))]
+#[cfg_attr(feature = "full", belongs_to(crate::source::community::Community))]
 #[cfg_attr(feature = "full", table_name = "community_person_ban")]
 pub struct CommunityPersonBan {
   pub id: i32,
@@ -121,7 +121,7 @@ pub struct CommunityPersonBanForm {
 
 #[derive(PartialEq, Debug)]
 #[cfg_attr(feature = "full", derive(Identifiable, Queryable, Associations))]
-#[cfg_attr(feature = "full", belongs_to(Community))]
+#[cfg_attr(feature = "full", belongs_to(crate::source::community::Community))]
 #[cfg_attr(feature = "full", table_name = "community_follower")]
 pub struct CommunityFollower {
   pub id: i32,

diff --git a/crates/db_schema/src/source/person_block.rs b/crates/db_schema/src/source/person_block.rs
@@ -6,6 +6,7 @@ use crate::schema::person_block;
 
 #[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
 #[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable))]
+#[cfg_attr(feature = "full", belongs_to(crate::source::person::Person))]
 #[cfg_attr(feature = "full", table_name = "person_block")]
 pub struct PersonBlock {
   pub id: PersonBlockId,

diff --git a/crates/db_schema/src/source/post.rs b/crates/db_schema/src/source/post.rs
@@ -55,7 +55,7 @@ pub struct PostForm {
 
 #[derive(PartialEq, Debug)]
 #[cfg_attr(feature = "full", derive(Identifiable, Queryable, Associations))]
-#[cfg_attr(feature = "full", belongs_to(Post))]
+#[cfg_attr(feature = "full", belongs_to(crate::source::post::Post))]
 #[cfg_attr(feature = "full", table_name = "post_like")]
 pub struct PostLike {
   pub id: i32,
@@ -76,7 +76,7 @@ pub struct PostLikeForm {
 
 #[derive(PartialEq, Debug)]
 #[cfg_attr(feature = "full", derive(Identifiable, Queryable, Associations))]
-#[cfg_attr(feature = "full", belongs_to(Post))]
+#[cfg_attr(feature = "full", belongs_to(crate::source::post::Post))]
 #[cfg_attr(feature = "full", table_name = "post_saved")]
 pub struct PostSaved {
   pub id: i32,
@@ -94,7 +94,7 @@ pub struct PostSavedForm {
 
 #[derive(PartialEq, Debug)]
 #[cfg_attr(feature = "full", derive(Identifiable, Queryable, Associations))]
-#[cfg_attr(feature = "full", belongs_to(Post))]
+#[cfg_attr(feature = "full", belongs_to(crate::source::post::Post))]
 #[cfg_attr(feature = "full", table_name = "post_read")]
 pub struct PostRead {
   pub id: i32,

diff --git a/crates/db_schema/src/source/post_report.rs b/crates/db_schema/src/source/post_report.rs
@@ -6,7 +6,7 @@ use crate::schema::post_report;
 
 #[derive(PartialEq, Serialize, Deserialize, Debug, Clone)]
 #[cfg_attr(feature = "full", derive(Identifiable, Queryable, Associations))]
-#[cfg_attr(feature = "full", belongs_to(crate::source::post::Post))]
+#[cfg_attr(feature = "full", belongs_to(crate::source::post::Post))]  // Is this the right assoc?
 #[cfg_attr(feature = "full", table_name = "post_report")]
 pub struct PostReport {
   pub id: PostReportId,

diff --git a/crates/db_schema/src/source/private_message.rs b/crates/db_schema/src/source/private_message.rs
@@ -6,6 +6,7 @@ use crate::schema::private_message;
 
 #[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
 #[cfg_attr(feature = "full", derive(Queryable, Associations, Identifiable))]
+#[cfg_attr(feature = "full", belongs_to(crate::source::person::Person, foreign_key = "creator_id"))]  // Is this the right assoc?
 #[cfg_attr(feature = "full", table_name = "private_message")]
 pub struct PrivateMessage {
   pub id: PrivateMessageId,

diff --git a/crates/db_schema/src/utils.rs b/crates/db_schema/src/utils.rs
@@ -1,4 +1,5 @@
 use crate::newtypes::DbUrl;
+use diesel_migrations::EmbeddedMigrations;
 use chrono::NaiveDateTime;
 use diesel::{
   backend::Backend,
@@ -65,7 +66,7 @@ pub fn diesel_option_overwrite_to_url(
   }
 }
 
-embed_migrations!();
+pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!();
 
 pub fn establish_unpooled_connection() -> PgConnection {
   let db_url = match get_database_url_from_env() {
@@ -77,7 +78,7 @@ pub fn establish_unpooled_connection() -> PgConnection {
   };
   let conn =
     PgConnection::establish(&db_url).unwrap_or_else(|_| panic!("Error connecting to {}", db_url));
-  embedded_migrations::run(&conn).expect("load migrations");
+  conn.run_pending_migrations(MIGRATIONS).unwrap();
   conn
 }