Updated disel-cli, some changes in generated code.

Extern crate diesel is no longer needed for macro usage.
kaj · Jul 31, 2024 · 553b103 · 553b103
1 parent 11143aa
commit 553b103
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -1,8 +1,5 @@
 #![allow(proc_macro_derive_resolution_fallback)]
 #![recursion_limit = "128"]
-#[macro_use]
-extern crate diesel;
-
 mod adm;
 mod dbopt;
 mod fetch_places;

diff --git a/src/schema.rs b/src/schema.rs
@@ -1,48 +1,50 @@
-table! {
+// @generated automatically by Diesel CLI.
+
+diesel::table! {
     attributions (id) {
         id -> Int4,
         name -> Varchar,
     }
 }
 
-table! {
+diesel::table! {
     cameras (id) {
         id -> Int4,
         manufacturer -> Varchar,
         model -> Varchar,
     }
 }
 
-table! {
+diesel::table! {
     people (id) {
         id -> Int4,
         slug -> Varchar,
         person_name -> Varchar,
     }
 }
 
-table! {
+diesel::table! {
     photo_people (photo_id, person_id) {
         photo_id -> Int4,
         person_id -> Int4,
     }
 }
 
-table! {
+diesel::table! {
     photo_places (photo_id, place_id) {
         photo_id -> Int4,
         place_id -> Int4,
     }
 }
 
-table! {
+diesel::table! {
     photo_tags (photo_id, tag_id) {
         photo_id -> Int4,
         tag_id -> Int4,
     }
 }
 
-table! {
+diesel::table! {
     photos (id) {
         id -> Int4,
         path -> Varchar,
@@ -57,7 +59,7 @@ table! {
     }
 }
 
-table! {
+diesel::table! {
     places (id) {
         id -> Int4,
         slug -> Varchar,
@@ -67,7 +69,7 @@ table! {
     }
 }
 
-table! {
+diesel::table! {
     positions (id) {
         id -> Int4,
         photo_id -> Int4,
@@ -76,33 +78,33 @@ table! {
     }
 }
 
-table! {
+diesel::table! {
     tags (id) {
         id -> Int4,
         slug -> Varchar,
         tag_name -> Varchar,
     }
 }
 
-table! {
+diesel::table! {
     users (id) {
         id -> Int4,
         username -> Varchar,
         password -> Varchar,
     }
 }
 
-joinable!(photo_people -> people (person_id));
-joinable!(photo_people -> photos (photo_id));
-joinable!(photo_places -> photos (photo_id));
-joinable!(photo_places -> places (place_id));
-joinable!(photo_tags -> photos (photo_id));
-joinable!(photo_tags -> tags (tag_id));
-joinable!(photos -> attributions (attribution_id));
-joinable!(photos -> cameras (camera_id));
-joinable!(positions -> photos (photo_id));
+diesel::joinable!(photo_people -> people (person_id));
+diesel::joinable!(photo_people -> photos (photo_id));
+diesel::joinable!(photo_places -> photos (photo_id));
+diesel::joinable!(photo_places -> places (place_id));
+diesel::joinable!(photo_tags -> photos (photo_id));
+diesel::joinable!(photo_tags -> tags (tag_id));
+diesel::joinable!(photos -> attributions (attribution_id));
+diesel::joinable!(photos -> cameras (camera_id));
+diesel::joinable!(positions -> photos (photo_id));
 
-allow_tables_to_appear_in_same_query!(
+diesel::allow_tables_to_appear_in_same_query!(
     attributions,
     cameras,
     people,

diff --git a/src/server/views_by_date.rs b/src/server/views_by_date.rs
@@ -92,6 +92,7 @@ sql_function! {
 
 mod filter {
     use diesel::sql_types::{Nullable, Timestamp};
+    use diesel::sql_function;
 
     sql_function! {
         fn year_of_timestamp(date: Nullable<Timestamp>) -> Nullable<SmallInt>