From 4a701d5e2da5edc5e4211f70cfaadf5812164d0a Mon Sep 17 00:00:00 2001 From: Chris Tsang Date: Mon, 6 Sep 2021 23:09:01 +0800 Subject: [PATCH] Tweak rocket example --- examples/rocket_example/src/main.rs | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/examples/rocket_example/src/main.rs b/examples/rocket_example/src/main.rs index 97c0a413..07ec3939 100644 --- a/examples/rocket_example/src/main.rs +++ b/examples/rocket_example/src/main.rs @@ -11,7 +11,7 @@ use rocket_db_pools::{sqlx, Connection, Database}; use rocket_dyn_templates::{context, Template}; use sea_orm::entity::*; -use sea_orm::QueryOrder; +use sea_orm::query::*; mod pool; use pool::RocketDbPool; @@ -34,11 +34,11 @@ fn new() -> Template { #[post("/", data = "")] async fn create(conn: Connection, post_form: Form) -> Flash { - let post = post_form.into_inner(); + let form = post_form.into_inner(); - let _post = post::ActiveModel { - title: Set(post.title.to_owned()), - text: Set(post.text.to_owned()), + post::ActiveModel { + title: Set(form.title.to_owned()), + text: Set(form.text.to_owned()), ..Default::default() } .save(&conn) @@ -57,12 +57,12 @@ async fn update(conn: Connection, id: i32, post_form: Form) -> .unwrap() .into(); - let post_data = post_form.into_inner(); + let form = post_form.into_inner(); - let _edited_post = post::ActiveModel { + post::ActiveModel { id: post.id, - title: Set(post_data.title.to_owned()), - text: Set(post_data.text.to_owned()), + title: Set(form.title.to_owned()), + text: Set(form.text.to_owned()), } .save(&conn) .await @@ -113,14 +113,15 @@ async fn delete(conn: Connection, id: i32) -> Flash { .unwrap() .unwrap() .into(); - let _result = post.delete(&conn).await.unwrap(); + + post.delete(&conn).await.unwrap(); Flash::success(Redirect::to("/"), "Post successfully deleted.") } #[delete("/")] async fn destroy(conn: Connection) -> Result<()> { - let _result = Post::delete_many().exec(&conn).await.unwrap(); + Post::delete_many().exec(&conn).await.unwrap(); Ok(()) } @@ -137,7 +138,7 @@ pub fn not_found(req: &Request<'_>) -> Template { async fn run_migrations(rocket: Rocket) -> fairing::Result { let db_url = Db::fetch(&rocket).unwrap().db_url.clone(); let conn = sea_orm::Database::connect(&db_url).await.unwrap(); - let _create_post_table = setup::create_post_table(&conn).await; + setup::create_post_table(&conn).await; Ok(rocket) }