mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-09-09 05:08:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #157 from krircc/master

Browse source 
only use diesel::r2d2 feature. no need r2d2_diesel create
This commit is contained in:
Nikolay Kim 2018-04-03 08:18:16 -07:00 committed by GitHub
commit b693d5491b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
examples/diesel/Cargo.toml
View file

@ -15,7 +15,6 @@ serde = "1.0"
serde_json = "1.0"
serde_derive = "1.0"
diesel = { version = "1.0", features = ["sqlite"] }
diesel = { version = "^1.1.0", features = ["sqlite", "r2d2"] }
r2d2 = "0.8"
r2d2-diesel = "1.0"
dotenv = "0.10"

3
examples/diesel/src/db.rs
View file

@ -4,8 +4,7 @@ use diesel;
use actix_web::*;
use actix::prelude::*;
use diesel::prelude::*;
use r2d2::Pool;
use r2d2_diesel::ConnectionManager;
use diesel::r2d2::{ Pool, ConnectionManager };
use models;
use schema;

3
examples/diesel/src/main.rs
View file

@ -11,7 +11,6 @@ extern crate serde_derive;
#[macro_use]
extern crate diesel;
extern crate r2d2;
extern crate r2d2_diesel;
extern crate uuid;
extern crate futures;
extern crate actix;
@ -23,7 +22,7 @@ use actix_web::{http, server, middleware,
App, Path, State, HttpResponse, AsyncResponder, FutureResponse};
use diesel::prelude::*;
use r2d2_diesel::ConnectionManager;
use diesel::r2d2::{ Pool, ConnectionManager };
use futures::future::Future;
mod db;