From caed6e6367f75f51a4bed8e293a1904850747cd1 Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Tue, 4 Apr 2023 15:15:29 -0500 Subject: [PATCH] setting diesel up more --- diesel.toml | 1 + src/rust/image_model.rs | 1 + src/rust/lib.rs | 8 ++++---- src/rust/models.rs | 1 + src/rust/schema.rs | 10 +++------- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/diesel.toml b/diesel.toml index a80bc13..176aaf1 100644 --- a/diesel.toml +++ b/diesel.toml @@ -3,6 +3,7 @@ [print_schema] file = "src/rust/schema.rs" +generate_missing_sql_type_definitions = false [migrations_directory] dir = "src/rust/migrations" diff --git a/src/rust/image_model.rs b/src/rust/image_model.rs index ee0d40b..35c59d2 100644 --- a/src/rust/image_model.rs +++ b/src/rust/image_model.rs @@ -83,6 +83,7 @@ mod image_model { println!("SHOWING IMAGES"); for image in results { println!("{}", image.title); + println!("{}", image.id); println!("--------------\n"); println!("{}", image.path); } diff --git a/src/rust/lib.rs b/src/rust/lib.rs index 027d133..f54fbde 100644 --- a/src/rust/lib.rs +++ b/src/rust/lib.rs @@ -15,12 +15,12 @@ // mod my_object; mod file_helper; +pub mod image_model; +pub mod models; +pub mod schema; mod service_thing; mod settings; -mod slide_obj; mod slide_model; -mod image_model; -mod models; -mod schema; +mod slide_obj; // mod entities; // mod video_thumbnail; diff --git a/src/rust/models.rs b/src/rust/models.rs index 45e0ce7..f3ce7c1 100644 --- a/src/rust/models.rs +++ b/src/rust/models.rs @@ -4,5 +4,6 @@ use diesel::prelude::*; pub struct Image { pub id: i32, pub title: String, + #[diesel(column_name = "filePath")] pub path: String, } diff --git a/src/rust/schema.rs b/src/rust/schema.rs index 146c2f7..96fcc85 100644 --- a/src/rust/schema.rs +++ b/src/rust/schema.rs @@ -4,7 +4,8 @@ diesel::table! { images (id) { id -> Integer, title -> Text, - filePath -> Text, + #[sql_name = "filePath"] + path -> Text, } } @@ -47,9 +48,4 @@ diesel::table! { } } -diesel::allow_tables_to_appear_in_same_query!( - images, - presentations, - songs, - videos, -); +diesel::allow_tables_to_appear_in_same_query!(images, presentations, songs, videos,);