Merge remote-tracking branch 'upstream/master' into update-itertools-log

Author: carols10cents

.diesel_version

@@ -1 +1 @@
-1.3.0
+1.4.0

.travis.yml

@@ -30,7 +30,7 @@ install:
   - cargo install --force diesel_cli --vers `cat .diesel_version` --no-default-features --features postgres && export PATH=$HOME/.cargo/bin:$PATH
 
 before_script:
-  - diesel database setup
+  - diesel database setup --locked-schema
 
 addons:
   chrome: stable

Cargo.lock

@@ -47,7 +47,7 @@ htmlescape = "0.3.1"
 license-exprs = "^1.4"
 dotenv = "0.11.0"
 toml = "0.4"
-diesel = { version = "1.3.0", features = ["postgres", "serde_json", "chrono", "r2d2"] }
+diesel = { version = "1.4.0", features = ["postgres", "serde_json", "chrono", "r2d2"] }
 diesel_full_text_search = "1.0.0"
 diesel_ltree = "0.1.3"
 serde_json = "1.0.0"
@@ -62,14 +62,15 @@ scheduled-thread-pool = "0.2.0"
 derive_deref = "1.0.0"
 reqwest = "0.9.1"
 tempdir = "0.3.7"
+parking_lot = "0.7.1"
 
 lettre = {git = "https://github.com/lettre/lettre", version = "0.9"}
 lettre_email = {git = "https://github.com/lettre/lettre", version = "0.9"}
 
 conduit = "0.8"
 conduit-conditional-get = "0.8"
-conduit-cookie = "0.8"
-cookie = "0.9"
+conduit-cookie = "0.8.5"
+cookie = "0.11"
 conduit-middleware = "0.8"
 conduit-router = "0.8"
 conduit-static = "0.8"
@@ -89,7 +90,3 @@ tokio-service = "0.1"
 dotenv = "0.11"
 diesel = { version = "1.3.0", features = ["postgres"] }
 diesel_migrations = { version = "1.3.0", features = ["postgres"] }
-
-# Remove once cookie depends on ring >= 0.13.0
-[patch.crates-io]
-ring = { git = "https://github.com/SergioBenitez/ring", branch = "v0.11" }

Cargo.toml

@@ -1,2 +1,2 @@
-web: bin/diesel migration run && bin/start-nginx ./target/release/server
+web: bin/diesel migration run --locked-schema && bin/start-nginx ./target/release/server
 worker: ./target/release/update-downloads daemon 300

Procfile

@@ -73,6 +73,7 @@ impl App {
         let db_connection_timeout = match (env::var("DB_TIMEOUT"), config.env) {
             (Ok(num), _) => num.parse().expect("couldn't parse DB_TIMEOUT"),
             (_, Env::Production) => 10,
+            (_, Env::Test) => 1,
             _ => 30,
         };
 
@@ -88,7 +89,7 @@ impl App {
         let repo = git2::Repository::open(&config.git_repo_checkout).unwrap();
 
         App {
-            diesel_database: db::diesel_pool(&config.db_url, diesel_db_config),
+            diesel_database: db::diesel_pool(&config.db_url, config.env, diesel_db_config),
             github,
             session_key: config.session_key.clone(),
             git_repo: Mutex::new(repo),

src/app.rs

@@ -1,5 +1,4 @@
 #![deny(warnings)]
-#![allow(unknown_lints, proc_macro_derive_resolution_fallback)] // This can be removed after diesel-1.4
 
 #[macro_use]
 extern crate diesel;
@@ -138,7 +137,7 @@ mod test {
             name: "foo",
             ..Default::default()
         }
-        .create_or_update(&conn, None, user_id)
+        .create_or_update(conn, None, user_id)
         .unwrap();
         let version = NewVersion::new(
             krate.id,
@@ -149,7 +148,7 @@ mod test {
             0,
         )
         .unwrap();
-        let version = version.save(&conn, &[]).unwrap();
+        let version = version.save(conn, &[]).unwrap();
         (krate, version)
     }
 

src/bin/update-downloads.rs

@@ -32,11 +32,11 @@ struct OwnerInvitation {
 
 /// Handles the `PUT /me/crate_owner_invitations/:crate_id` route.
 pub fn handle_invite(req: &mut dyn Request) -> CargoResult<Response> {
-    let conn = &*req.db_conn()?;
-
     let mut body = String::new();
     req.body().read_to_string(&mut body)?;
 
+    let conn = &*req.db_conn()?;
+
     let crate_invite: OwnerInvitation =
         serde_json::from_str(&body).map_err(|_| human("invalid json request"))?;
 
@@ -50,7 +50,7 @@ pub fn handle_invite(req: &mut dyn Request) -> CargoResult<Response> {
 }
 
 fn accept_invite(
-    req: &mut dyn Request,
+    req: &dyn Request,
     conn: &PgConnection,
     crate_invite: InvitationResponse,
 ) -> CargoResult<Response> {
@@ -88,7 +88,7 @@ fn accept_invite(
 }
 
 fn decline_invite(
-    req: &mut dyn Request,
+    req: &dyn Request,
     conn: &PgConnection,
     crate_invite: InvitationResponse,
 ) -> CargoResult<Response> {

src/controllers/crate_owner_invitation.rs

@@ -63,7 +63,7 @@ pub fn publish(req: &mut dyn Request) -> CargoResult<Response> {
     let categories = new_crate.categories.as_ref().map(|s| &s[..]).unwrap_or(&[]);
     let categories: Vec<_> = categories.iter().map(|k| &***k).collect();
 
-    let conn = req.db_conn()?;
+    let conn = app.diesel_database.get()?;
 
     let mut other_warnings = vec![];
     if !user.has_verified_email(&conn)? {

src/controllers/krate/publish.rs

@@ -171,7 +171,7 @@ pub fn search(req: &mut dyn Request) -> CargoResult<Response> {
 
     let badges = CrateBadge::belonging_to(&crates)
         .select((badges::crate_id, badges::all_columns))
-        .load::<CrateBadge>(&conn)?
+        .load::<CrateBadge>(&*conn)?
         .grouped_by(&crates)
         .into_iter()
         .map(|badges| badges.into_iter().map(|cb| cb.badge).collect());