migrations/2023-11-04-093417_create_shows/up.sql

@@ -4,7 +4,6 @@ CREATE TABLE
     id INT UNSIGNED PRIMARY KEY AUTO_INCREMENT,
     dancer INT UNSIGNED NOT NULL,
     start DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
-    estimated_end DATETIME NOT NULL,
     end DATETIME DEFAULT NULL,
     FOREIGN KEY (dancer) REFERENCES dancers (id) ON DELETE RESTRICT
   )

src/lib/models.rs

@@ -22,15 +22,6 @@ pub struct Drink {
     pub time: chrono::NaiveDateTime,
 }
 
-#[derive(Insertable, Deserialize, Debug)]
-#[diesel(table_name = crate::schema::drinks)]
-#[diesel(check_for_backend(diesel::mysql::Mysql))]
-pub struct NewDrink {
-    pub price: u32,
-    pub quantity: u32,
-    pub shift: u32,
-}
-
 #[derive(Identifiable, Queryable, Selectable, Debug, Clone)]
 #[diesel(table_name = crate::schema::dancers)]
 #[diesel(check_for_backend(diesel::mysql::Mysql))]
@@ -56,6 +47,14 @@ pub struct Show {
     pub id: u32,
     pub dancer: u32,
     pub start: chrono::NaiveDateTime,
-    pub estimated_end: chrono::NaiveDateTime,
     pub end: Option<chrono::NaiveDateTime>,
 }
+
+#[derive(Insertable, Deserialize, Debug)]
+#[diesel(table_name = crate::schema::drinks)]
+#[diesel(check_for_backend(diesel::mysql::Mysql))]
+pub struct NewDrink {
+    pub price: u32,
+    pub quantity: u32,
+    pub shift: u32,
+}

src/lib/schema.rs

@@ -31,7 +31,6 @@ diesel::table! {
         id -> Unsigned<Integer>,
         dancer -> Unsigned<Integer>,
         start -> Datetime,
-        estimated_end -> Datetime,
         end -> Nullable<Datetime>,
     }
 }