Upgrade diesel from 0.16 -> 1.x (#229)

See [diesel changelog](https://github.com/diesel-rs/diesel/blob/master/CHANGELOG.md) for details about the API changes.

Admittedly this is mainly motivated because I was getting confused at the old `on_conflict` syntax compared with newer versions of diesel.

(I also had to add `#![feature(never_type)]` to make rfcbot compile at all).

(I cheekily ran cargo update as well, which I had forgotten about).

Author: erikjohnston

Cargo.lock

@@ -12,8 +12,6 @@ hyper = "0.10"
 hyper-native-tls = "0.2.1"
 lazy_static = "0.2.0"
 log = "0.3.6"
-r2d2 = "0.7.1"
-r2d2-diesel = "0.16"
 rocket = "0.3.3"
 rocket_codegen = "0.3.3"
 rocket_contrib = "0.3.3"
@@ -33,10 +31,5 @@ version = "0.4"
 
 [dependencies.diesel]
 default-features = false
-features = ["postgres", "chrono", "large-tables"]
-version = "0.16"
-
-[dependencies.diesel_codegen]
-default-features = false
-features = ["dotenv", "postgres"]
-version = "0.16"
+features = ["postgres", "chrono", "r2d2", "32-column-tables"]
+version = "1.3.2"

Cargo.toml

@@ -170,3 +170,23 @@ joinable!(poll -> githubuser (fk_initiator));
 joinable!(poll -> issue (fk_issue));
 joinable!(poll_response_request -> poll (fk_poll));
 joinable!(poll_response_request -> githubuser (fk_respondent));
+
+
+allow_tables_to_appear_in_same_query!(fcp_concern, githubuser);
+allow_tables_to_appear_in_same_query!(fcp_concern, fcp_proposal);
+allow_tables_to_appear_in_same_query!(fcp_proposal, githubuser);
+allow_tables_to_appear_in_same_query!(fcp_proposal, issue);
+allow_tables_to_appear_in_same_query!(fcp_review_request, fcp_proposal);
+allow_tables_to_appear_in_same_query!(fcp_review_request, githubuser);
+allow_tables_to_appear_in_same_query!(issue, milestone);
+allow_tables_to_appear_in_same_query!(issuecomment, issue);
+allow_tables_to_appear_in_same_query!(issuecomment, githubuser);
+allow_tables_to_appear_in_same_query!(milestone, githubuser);
+allow_tables_to_appear_in_same_query!(pullrequest, githubuser);
+allow_tables_to_appear_in_same_query!(pullrequest, milestone);
+allow_tables_to_appear_in_same_query!(rfc_feedback_request, issuecomment);
+allow_tables_to_appear_in_same_query!(rfc_feedback_request, issue);
+allow_tables_to_appear_in_same_query!(poll, githubuser);
+allow_tables_to_appear_in_same_query!(poll, issue);
+allow_tables_to_appear_in_same_query!(poll_response_request, poll);
+allow_tables_to_appear_in_same_query!(poll_response_request, githubuser);

src/domain/schema.rs

@@ -7,7 +7,6 @@ use std::io;
 use diesel;
 use handlebars;
 use hyper;
-use r2d2;
 use serde_json;
 
 pub type DashResult<T> = std::result::Result<T, DashError>;
@@ -17,7 +16,7 @@ pub enum DashError {
     Hyper(hyper::error::Error),
     Io(io::Error),
     Serde(serde_json::error::Error),
-    R2d2Timeout(r2d2::GetTimeout),
+    R2d2(diesel::r2d2::PoolError),
     DieselError(diesel::result::Error),
     Template(handlebars::RenderError),
     Misc(Option<String>),
@@ -39,8 +38,8 @@ impl From<serde_json::error::Error> for DashError {
     fn from(e: serde_json::error::Error) -> Self { DashError::Serde(e) }
 }
 
-impl From<r2d2::GetTimeout> for DashError {
-    fn from(e: r2d2::GetTimeout) -> Self { DashError::R2d2Timeout(e) }
+impl From<diesel::r2d2::PoolError> for DashError {
+    fn from(e: diesel::r2d2::PoolError) -> Self { DashError::R2d2(e) }
 }
 
 impl From<diesel::result::Error> for DashError {

src/error.rs

@@ -10,7 +10,6 @@ pub mod webhooks;
 use chrono::{DateTime, NaiveDate, NaiveDateTime, NaiveTime, Utc};
 use diesel::prelude::*;
 use diesel::pg::PgConnection;
-use diesel::pg::upsert::*;
 use diesel;
 
 use DB_POOL;
@@ -56,7 +55,7 @@ pub fn record_successful_update(ingest_start: NaiveDateTime) -> DashResult<()> {
         message: None,
     };
 
-    diesel::insert(&sync_record).into(githubsync).execute(conn)?;
+    diesel::insert_into(githubsync).values(&sync_record).execute(conn)?;
     Ok(())
 }
 
@@ -123,9 +122,14 @@ pub fn handle_pr(conn: &PgConnection, pr: PullRequestFromJson, repo: &str) -> Da
     }
 
     let pr: PullRequest = pr.with_repo(repo);
-    diesel::insert(&pr.on_conflict((repository, number), do_update().set(&pr)))
-        .into(pullrequest)
+
+    diesel::insert_into(pullrequest)
+        .values(&pr)
+        .on_conflict((repository, number))
+        .do_update()
+        .set(&pr)
         .execute(conn)?;
+
     Ok(())
 }
 
@@ -144,8 +148,8 @@ pub fn handle_comment(conn: &PgConnection, comment: CommentFromJson, repo: &str)
             .set(&comment)
             .execute(conn)?;
     } else {
-        diesel::insert(&comment)
-            .into(issuecomment::table)
+        diesel::insert_into(issuecomment::table)
+            .values(&comment)
             .execute(conn)?;
 
         ok_or!(nag::update_nags(&comment), why => {
@@ -170,25 +174,35 @@ pub fn handle_issue(conn: &PgConnection, issue: IssueFromJson, repo: &str) -> Da
     let (i, milestone) = issue.with_repo(repo);
 
     if let Some(milestone) = milestone {
-        diesel::insert(&milestone.on_conflict(milestone::id, do_update().set(&milestone)))
-            .into(milestone::table)
+        diesel::insert_into(milestone::table)
+            .values(&milestone)
+            .on_conflict(milestone::id)
+            .do_update()
+            .set(&milestone)
             .execute(conn)?;
     }
 
     // handle issue itself
     {
         use domain::schema::issue::dsl::*;
-        diesel::insert(&i.on_conflict((repository, number), do_update().set(&i)))
-            .into(issue)
+
+        diesel::insert_into(issue)
+            .values(&i)
+            .on_conflict((repository, number))
+            .do_update()
+            .set(&i)
             .execute(conn)?;
     }
 
     Ok(())
 }
 
 pub fn handle_user(conn: &PgConnection, user: &GitHubUser) -> DashResult<()> {
-    diesel::insert(&user.on_conflict(githubuser::id, do_update().set(user)))
-        .into(githubuser::table)
+    diesel::insert_into(githubuser::table)
+        .values(user)
+        .on_conflict(githubuser::id)
+        .do_update()
+        .set(user)
         .execute(conn)?;
     Ok(())
 }

src/github/mod.rs

@@ -699,9 +699,9 @@ fn post_insert_comment(issue: &Issue, comment: CommentType) -> DashResult<IssueC
     // we need to insert it
     let comment = comment.with_repo(&issue.repository)?;
     if let Err(why) =
-        diesel::insert(&comment)
-                .into(issuecomment::table)
-                .execute(conn) 
+        diesel::insert_into(issuecomment::table)
+                .values(&comment)
+                .execute(conn)
     {
         warn!("issue inserting new record, maybe received webhook for it: {:?}",
                 why);
@@ -775,7 +775,9 @@ fn process_poll
         poll_closed: false,
         poll_teams: &*teams_str,
     };
-    let new_poll = diesel::insert(&new_poll).into(poll).get_result::<Poll>(conn)?;
+    let new_poll = diesel::insert_into(poll)
+        .values(&new_poll)
+        .get_result::<Poll>(conn)?;
 
     debug!("poll inserted into the database");
 
@@ -791,8 +793,8 @@ fn process_poll
         })
         .collect::<Vec<_>>();
 
-    diesel::insert(&response_requests)
-        .into(poll_response_request::table)
+    diesel::insert_into(poll_response_request::table)
+        .values(&response_requests)
         .execute(conn)?;
 
     // they're in the database, but now we need them paired with githubuser
@@ -843,8 +845,8 @@ fn process_fcp_propose
             fcp_start: None,
             fcp_closed: false,
         };
-        let proposal = diesel::insert(&proposal)
-            .into(fcp_proposal)
+        let proposal = diesel::insert_into(fcp_proposal)
+            .values(&proposal)
             .get_result::<FcpProposal>(conn)?;
 
         debug!("proposal inserted into the database");
@@ -861,8 +863,8 @@ fn process_fcp_propose
             })
             .collect::<Vec<_>>();
 
-        diesel::insert(&review_requests)
-            .into(fcp_review_request::table)
+        diesel::insert_into(fcp_review_request::table)
+            .values(&review_requests)
             .execute(conn)?;
 
         // they're in the database, but now we need them paired with githubuser
@@ -940,7 +942,9 @@ fn process_new_concern
                 name: concern_name,
                 fk_initiating_comment: comment.id,
             };
-            diesel::insert(&new_concern).into(fcp_concern).execute(conn)?;
+            diesel::insert_into(fcp_concern)
+                .values(&new_concern)
+                .execute(conn)?;
 
             // Take us out of FCP and back into PFCP if need be:
             if proposal.fcp_start.is_some() {
@@ -1025,7 +1029,9 @@ fn process_feedback_request(author: &GitHubUser, issue: &Issue, username: &str)
             fk_issue: issue.id,
             fk_feedback_comment: None,
         };
-        diesel::insert(&new_request).into(rfc_feedback_request).execute(conn)?;
+        diesel::insert_into(rfc_feedback_request)
+            .values(&new_request)
+            .execute(conn)?;
     }
 
     Ok(())
@@ -1222,7 +1228,7 @@ impl<'a> RfcBotComment<'a> {
                 if let Some(comment_id) = existing_comment {
                     self.maybe_add_pfcp_label();
                     GH.edit_comment(&self.issue.repository, comment_id, &self.body)
-                } else { 
+                } else {
                     GH.new_comment(&self.issue.repository, self.issue.number, &self.body)
                 }
             } else {

src/github/nag.rs

@@ -1,14 +1,13 @@
 #![feature(never_type)]
 
 #![feature(plugin)]
+#![feature(never_type)]
 #![plugin(rocket_codegen)]
 
 extern crate chrono;
 extern crate crypto;
 #[macro_use]
 extern crate diesel;
-#[macro_use]
-extern crate diesel_codegen;
 extern crate dotenv;
 extern crate env_logger;
 extern crate handlebars;
@@ -20,8 +19,6 @@ extern crate hyper_native_tls;
 extern crate lazy_static;
 #[macro_use]
 extern crate log;
-extern crate r2d2;
-extern crate r2d2_diesel;
 extern crate rocket;
 extern crate rocket_contrib;
 extern crate serde;
@@ -50,10 +47,10 @@ mod teams;
 
 use chrono::Local;
 use diesel::pg::PgConnection;
+use diesel::r2d2::Pool;
+use diesel::r2d2::ConnectionManager;
 use env_logger::LogBuilder;
 use log::LogRecord;
-use r2d2::Pool;
-use r2d2_diesel::ConnectionManager;
 
 use config::CONFIG;
 
@@ -96,12 +93,12 @@ lazy_static! {
     pub static ref DB_POOL: Pool<ConnectionManager<PgConnection>> = {
         info!("Initializing database connection pool.");
 
-        let config = r2d2::Config::builder()
-                         .pool_size(CONFIG.db_pool_size)
-                         .build();
-
         let manager = ConnectionManager::<PgConnection>::new(CONFIG.db_url.clone());
-        match Pool::new(config, manager) {
+
+        match Pool::builder()
+            .max_size(CONFIG.db_pool_size)
+            .build(manager)
+        {
             Ok(p) => {
                 info!("DB connection pool established.");
                 p