From f30016e112d11017a896a5c6afbb6e42e06f3356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ger=C3=B3nimo=20Garcia=20Sgritta?= Date: Sat, 4 Jan 2020 22:04:35 +1100 Subject: [PATCH] Fix DB article code examples (#140) This change fixes issue #139 and renders the code example --- examples/og_databases/src/main.rs | 142 +++++++++++++++--------------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/examples/og_databases/src/main.rs b/examples/og_databases/src/main.rs index c78d064..42d9584 100644 --- a/examples/og_databases/src/main.rs +++ b/examples/og_databases/src/main.rs @@ -1,98 +1,98 @@ // -// use actix::prelude::*; +use actix::prelude::*; -// struct DbExecutor(SqliteConnection); +struct DbExecutor(SqliteConnection); -// impl Actor for DbExecutor { -// type Context = SyncContext; -// } +impl Actor for DbExecutor { + type Context = SyncContext; +} // // -// struct CreateUser { -// name: String, -// } +struct CreateUser { + name: String, +} -// impl Message for CreateUser { -// type Result = Result; -// } +impl Message for CreateUser { + type Result = Result; +} // // -// impl Handler for DbExecutor { -// type Result = Result; +impl Handler for DbExecutor { + type Result = Result; -// fn handle(&mut self, msg: CreateUser, _: &mut Self::Context) -> Self::Result { -// use self::schema::users::dsl::*; + fn handle(&mut self, msg: CreateUser, _: &mut Self::Context) -> Self::Result { + use self::schema::users::dsl::*; -// // Create insertion model -// let uuid = format!("{}", uuid::Uuid::new_v4()); -// let new_user = models::NewUser { -// id: &uuid, -// name: &msg.name, -// }; + // Create insertion model + let uuid = format!("{}", uuid::Uuid::new_v4()); + let new_user = models::NewUser { + id: &uuid, + name: &msg.name, + }; -// // normal diesel operations -// diesel::insert_into(users) -// .values(&new_user) -// .execute(&self.0) -// .expect("Error inserting person"); + // normal diesel operations + diesel::insert_into(users) + .values(&new_user) + .execute(&self.0) + .expect("Error inserting person"); -// let mut items = users -// .filter(id.eq(&uuid)) -// .load::(&self.0) -// .expect("Error loading person"); + let mut items = users + .filter(id.eq(&uuid)) + .load::(&self.0) + .expect("Error loading person"); -// Ok(items.pop().unwrap()) -// } -// } + Ok(items.pop().unwrap()) + } +} // //
-// /// This is state where we will store *DbExecutor* address. -// struct State { -// db: Addr, -// } +/// This is state where we will store *DbExecutor* address. +struct State { + db: Addr, +} -// fn main() { -// let sys = actix::System::new("diesel-example"); +fn main() { + let sys = actix::System::new("diesel-example"); -// // Start 3 parallel db executors -// let addr = SyncArbiter::start(3, || { -// DbExecutor(SqliteConnection::establish("test.db").unwrap()) -// }); + // Start 3 parallel db executors + let addr = SyncArbiter::start(3, || { + DbExecutor(SqliteConnection::establish("test.db").unwrap()) + }); -// // Start http server -// HttpServer::new(move || { -// App::with_state(State { db: addr.clone() }) -// .resource("/{name}", |r| r.method(Method::GET).a(index)) -// }) -// .bind("127.0.0.1:8080") -// .unwrap() -// .start() -// .unwrap(); + // Start http server + HttpServer::new(move || { + App::with_state(State { db: addr.clone() }) + .resource("/{name}", |r| r.method(Method::GET).a(index)) + }) + .bind("127.0.0.1:8080") + .unwrap() + .start() + .unwrap(); -// println!("Started http server: 127.0.0.1:8080"); -// let _ = sys.run(); -// } + println!("Started http server: 127.0.0.1:8080"); + let _ = sys.run(); +} //
// -// /// Async handler -// fn index(req: &HttpRequest) -> Box> { -// let name = &req.match_info()["name"]; +/// Async handler +fn index(req: &HttpRequest) -> Box> { + let name = &req.match_info()["name"]; -// // Send message to `DbExecutor` actor -// req.state() -// .db -// .send(CreateUser { -// name: name.to_owned(), -// }) -// .from_err() -// .and_then(|res| match res { -// Ok(user) => Ok(HttpResponse::Ok().json(user)), -// Err(_) => Ok(HttpResponse::InternalServerError().into()), -// }) -// .responder() -// } + // Send message to `DbExecutor` actor + req.state() + .db + .send(CreateUser { + name: name.to_owned(), + }) + .from_err() + .and_then(|res| match res { + Ok(user) => Ok(HttpResponse::Ok().json(user)), + Err(_) => Ok(HttpResponse::InternalServerError().into()), + }) + .responder() +} //