Merge remote-tracking branch 'upstream/master' into multi-token

Author: carols10cents

migrations/20170611165120_add_license_to_versions/down.sql

@@ -0,0 +1 @@
+ALTER TABLE versions DROP COLUMN license;

migrations/20170611165120_add_license_to_versions/up.sql

@@ -0,0 +1 @@
+ALTER TABLE versions ADD COLUMN license VARCHAR;

src/bin/populate.rs

@@ -40,8 +40,8 @@ fn update(tx: &postgres::transaction::Transaction) -> postgres::Result<()> {
             dls += rng.gen_range(-100, 100);
             tx.execute(
                 "INSERT INTO version_downloads \
-                              (version_id, downloads, date) \
-                              VALUES ($1, $2, $3)",
+                 (version_id, downloads, date) \
+                 VALUES ($1, $2, $3)",
                 &[&id, &dls, &moment],
             )?;
         }

src/bin/update-licenses.rs

@@ -0,0 +1,65 @@
+//! Updates all of the licenses from the existing crates into each of their
+//! already existing versions.
+
+//
+// Usage:
+//      cargo run --bin update-licenses
+
+extern crate cargo_registry;
+extern crate postgres;
+
+use std::io::prelude::*;
+
+fn main() {
+    let conn = cargo_registry::db::connect_now();
+    {
+        let tx = conn.transaction().unwrap();
+        transfer(&tx);
+        tx.set_commit();
+        tx.finish().unwrap();
+    }
+}
+
+fn transfer(tx: &postgres::transaction::Transaction) {
+    let stmt = tx.prepare("SELECT id, name, license FROM crates").unwrap();
+    let rows = stmt.query(&[]).unwrap();
+
+    for row in rows.iter() {
+        let id: i32 = row.get("id");
+        let name: String = row.get("name");
+        let license: Option<String> = row.get("license");
+
+        if let Some(license) = license {
+            println!(
+                "Setting the license for all versions of {} to {}.",
+                name,
+                license
+            );
+
+            let num_updated = tx.execute(
+                "UPDATE versions SET license = $1 WHERE crate_id = $2",
+                &[&license, &id],
+            ).unwrap();
+            assert!(num_updated > 0);
+        } else {
+            println!(
+                "Ignoring crate `{}` because it doesn't have a license.",
+                name
+            );
+        }
+    }
+
+    get_confirm("Finish committing?");
+}
+
+fn get_confirm(msg: &str) {
+    print!("{} [y/N]: ", msg);
+    std::io::stdout().flush().unwrap();
+
+    let mut line = String::new();
+    std::io::stdin().read_line(&mut line).unwrap();
+
+    if !line.starts_with("y") {
+        std::process::exit(0);
+    }
+}

src/categories.rs

@@ -101,11 +101,11 @@ pub fn sync() -> CargoResult<()> {
     for category in &categories {
         tx.execute(
             "\
-            INSERT INTO categories (slug, category, description) \
-            VALUES (LOWER($1), $2, $3) \
-            ON CONFLICT (slug) DO UPDATE \
-                SET category = EXCLUDED.category, \
-                    description = EXCLUDED.description;",
+             INSERT INTO categories (slug, category, description) \
+             VALUES (LOWER($1), $2, $3) \
+             ON CONFLICT (slug) DO UPDATE \
+             SET category = EXCLUDED.category, \
+             description = EXCLUDED.description;",
             &[&category.slug, &category.name, &category.description],
         )?;
     }
@@ -119,8 +119,8 @@ pub fn sync() -> CargoResult<()> {
     tx.execute(
         &format!(
             "\
-        DELETE FROM categories \
-        WHERE slug NOT IN ({});",
+             DELETE FROM categories \
+             WHERE slug NOT IN ({});",
             in_clause
         ),
         &[],

src/category.rs

@@ -60,7 +60,7 @@ impl Category {
     pub fn find_by_category(conn: &GenericConnection, name: &str) -> CargoResult<Category> {
         let stmt = conn.prepare(
             "SELECT * FROM categories \
-                                      WHERE category = $1",
+             WHERE category = $1",
         )?;
         let rows = stmt.query(&[&name])?;
         rows.iter().next().chain_error(|| NotFound).map(|row| {
@@ -71,7 +71,7 @@ impl Category {
     pub fn find_by_slug(conn: &GenericConnection, slug: &str) -> CargoResult<Category> {
         let stmt = conn.prepare(
             "SELECT * FROM categories \
-                                      WHERE slug = LOWER($1)",
+             WHERE slug = LOWER($1)",
         )?;
         let rows = stmt.query(&[&slug])?;
         rows.iter().next().chain_error(|| NotFound).map(|row| {
@@ -168,8 +168,8 @@ impl Category {
         if !to_rm.is_empty() {
             conn.execute(
                 "DELETE FROM crates_categories \
-                                WHERE category_id = ANY($1) \
-                                  AND crate_id = $2",
+                 WHERE category_id = ANY($1) \
+                 AND crate_id = $2",
                 &[&to_rm, &krate.id],
             )?;
         }
@@ -183,7 +183,7 @@ impl Category {
             conn.execute(
                 &format!(
                     "INSERT INTO crates_categories \
-                                        (crate_id, category_id) VALUES {}",
+                     (crate_id, category_id) VALUES {}",
                     insert
                 ),
                 &[],
@@ -196,9 +196,9 @@ impl Category {
     pub fn count_toplevel(conn: &GenericConnection) -> CargoResult<i64> {
         let sql = format!(
             "\
-            SELECT COUNT(*) \
-            FROM {} \
-            WHERE category NOT LIKE '%::%'",
+             SELECT COUNT(*) \
+             FROM {} \
+             WHERE category NOT LIKE '%::%'",
             Model::table_name(None::<Self>)
         );
         let stmt = conn.prepare(&sql)?;
@@ -272,16 +272,16 @@ impl Category {
     pub fn subcategories(&self, conn: &GenericConnection) -> CargoResult<Vec<Category>> {
         let stmt = conn.prepare(
             "\
-            SELECT c.id, c.category, c.slug, c.description, c.created_at, \
-            COALESCE (( \
-                SELECT sum(c2.crates_cnt)::int \
-                FROM categories as c2 \
-                WHERE c2.slug = c.slug \
-                OR c2.slug LIKE c.slug || '::%' \
-            ), 0) as crates_cnt \
-            FROM categories as c \
-            WHERE c.category ILIKE $1 || '::%' \
-            AND c.category NOT ILIKE $1 || '::%::%'",
+             SELECT c.id, c.category, c.slug, c.description, c.created_at, \
+             COALESCE (( \
+             SELECT sum(c2.crates_cnt)::int \
+             FROM categories as c2 \
+             WHERE c2.slug = c.slug \
+             OR c2.slug LIKE c.slug || '::%' \
+             ), 0) as crates_cnt \
+             FROM categories as c \
+             WHERE c.category ILIKE $1 || '::%' \
+             AND c.category NOT ILIKE $1 || '::%::%'",
         )?;
 
         let rows = stmt.query(&[&self.category])?;
@@ -391,7 +391,7 @@ pub fn slugs(req: &mut Request) -> CargoResult<Response> {
     let conn = req.tx()?;
     let stmt = conn.prepare(
         "SELECT slug FROM categories \
-                                  ORDER BY slug",
+         ORDER BY slug",
     )?;
     let rows = stmt.query(&[])?;
 

src/dependency.rs

@@ -149,9 +149,9 @@ pub fn add_dependencies(
             if dep.version_req == semver::VersionReq::parse("*").unwrap() {
                 return Err(human(
                     "wildcard (`*`) dependency constraints are not allowed \
-                              on crates.io. See http://doc.crates.io/faq.html#can-\
-                              libraries-use--as-a-version-for-their-dependencies for more \
-                              information",
+                     on crates.io. See http://doc.crates.io/faq.html#can-\
+                     libraries-use--as-a-version-for-their-dependencies for more \
+                     information",
                 ));
             }
             let features: Vec<_> = dep.features.iter().map(|s| &**s).collect();

src/http.rs

@@ -49,19 +49,19 @@ pub fn parse_github_response<T: Decodable>(mut resp: Easy, data: &[u8]) -> Cargo
         403 => {
             return Err(human(
                 "It looks like you don't have permission \
-                              to query a necessary property from Github \
-                              to complete this request. \
-                              You may need to re-authenticate on \
-                              crates.io to grant permission to read \
-                              github org memberships. Just go to \
-                              https://crates.io/login",
+                 to query a necessary property from Github \
+                 to complete this request. \
+                 You may need to re-authenticate on \
+                 crates.io to grant permission to read \
+                 github org memberships. Just go to \
+                 https://crates.io/login",
             ));
         }
         n => {
             let resp = String::from_utf8_lossy(data);
             return Err(internal(&format_args!(
                 "didn't get a 200 result from \
-                                        github, got {} with: {}",
+                 github, got {} with: {}",
                 n,
                 resp
             )));