aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2018-01-18 20:11:07 +0100
committerHarald Eilertsen <haraldei@anduin.net>2018-01-18 20:11:07 +0100
commit337c9d2b2280f8e252e8c9acd7e73caf1291d7a5 (patch)
tree9468fa1820970e846ef4868f0ec2dba655b81679 /src
parente96c58580b2ac1874718f3d31a1d4abcdcc6dbb6 (diff)
downloadrocket-blog-337c9d2b2280f8e252e8c9acd7e73caf1291d7a5.tar.gz
rocket-blog-337c9d2b2280f8e252e8c9acd7e73caf1291d7a5.tar.bz2
rocket-blog-337c9d2b2280f8e252e8c9acd7e73caf1291d7a5.zip
Upgrade to Diesel 1.1 and r2d2 0.8.2.
Also drop the now obsolete diesel_codegen crate.
Diffstat (limited to 'src')
-rw-r--r--src/main.rs1
-rw-r--r--src/models/post.rs7
-rw-r--r--src/utils/mod.rs7
3 files changed, 7 insertions, 8 deletions
diff --git a/src/main.rs b/src/main.rs
index 4876b35..424dbde 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,7 +2,6 @@
#![plugin(rocket_codegen)]
#[macro_use] extern crate bart_derive;
-#[macro_use] extern crate diesel_codegen;
#[macro_use] extern crate diesel;
#[macro_use] extern crate serde_derive;
diff --git a/src/models/post.rs b/src/models/post.rs
index 3dd0879..17ac74a 100644
--- a/src/models/post.rs
+++ b/src/models/post.rs
@@ -1,6 +1,6 @@
use schema::posts;
use diesel::prelude::*;
-use diesel::{self, ExecuteDsl};
+use diesel;
use utils;
#[derive(AsChangeset, FromForm, Identifiable, Serialize, Queryable)]
@@ -40,8 +40,9 @@ impl Post {
}
pub fn create(new_post: &NewPost, conn: utils::DbConn) {
- diesel::insert(new_post)
- .into(posts::table)
+ use ::schema::posts::dsl::*;
+ diesel::insert_into(posts)
+ .values(new_post)
.execute(&*conn)
.expect("Error saving post.");
}
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
index 495440a..57975bc 100644
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -1,16 +1,15 @@
-use diesel::pg::PgConnection;
-use std::fmt::Display;
+use diesel::PgConnection;
use r2d2;
use r2d2_diesel::ConnectionManager;
+use std::fmt::Display;
// An alias to the type for a pool of Diesel PostgreSql connections.
type Pool = r2d2::Pool<ConnectionManager<PgConnection>>;
/// Initializes a database pool.
pub fn init_db_pool<'a>(dburl: &'a str) -> Pool {
- let config = r2d2::Config::default();
let manager = ConnectionManager::<PgConnection>::new(dburl);
- r2d2::Pool::new(config, manager).expect("db pool")
+ r2d2::Pool::builder().build(manager).expect("db pool")
}
use std::ops::Deref;