WIP: Port crates#index to use Diesel

Cargo.toml

@@ -36,10 +36,11 @@ rustc-serialize = "0.3"
 license-exprs = "^1.3"
 dotenv = "0.8.0"
 toml = "0.2"
-diesel = { version = "0.11.0", features = ["postgres", "serde_json"] }
+diesel = { version = "0.11.0", features = ["postgres", "serde_json", "deprecated-time"] }
 diesel_codegen = { version = "0.11.0", features = ["postgres"] }
 r2d2-diesel = "0.11.0"
 diesel_full_text_search = "0.11.0"
+serde_json = "0.9.0"
 
 conduit = "0.8"
 conduit-conditional-get = "0.8"

migrations/20170307211844_versions_yanked_is_not_nullalbe/down.sql

@@ -0,0 +1 @@
+ALTER TABLE versions ALTER COLUMN yanked DROP NOT NULL;

migrations/20170307211844_versions_yanked_is_not_nullalbe/up.sql

@@ -0,0 +1 @@
+ALTER TABLE versions ALTER COLUMN yanked SET NOT NULL;

src/app.rs

@@ -54,7 +54,8 @@ impl App {
             .helper_threads(if config.env == ::Env::Production {3} else {1})
             .build();
         let diesel_db_config = r2d2::Config::builder()
-            .pool_size(if config.env == ::Env::Production {1} else {1})
+            .pool_size(if config.env == ::Env::Production {50} else {1})
+            .min_idle(if config.env == ::Env::Production {5} else {1})
             .helper_threads(if config.env == ::Env::Production {3} else {1})
             .build();
 

src/badge.rs

@@ -1,11 +1,15 @@
-use util::CargoResult;
-use krate::Crate;
 use Model;
+use krate::Crate;
+use schema::badges;
+use util::CargoResult;
 
-use std::collections::HashMap;
+use diesel::prelude::*;
+use diesel::pg::Pg;
 use pg::GenericConnection;
 use pg::rows::Row;
 use rustc_serialize::json::Json;
+use serde_json;
+use std::collections::HashMap;
 
 #[derive(Debug, PartialEq, Clone)]
 pub enum Badge {
@@ -26,6 +30,17 @@ pub struct EncodableBadge {
     pub attributes: HashMap<String, String>,
 }
 
+impl Queryable<badges::SqlType, Pg> for Badge {
+    type Row = (i32, String, serde_json::Value);
+
+    fn build((_, badge_type, attributes): Self::Row) -> Self {
+        let attributes = serde_json::from_value::<HashMap<String, String>>(attributes)
+            .expect("attributes was not a map in the database");
+        Self::from_attributes(&badge_type, &attributes)
+            .expect("invalid badge in the database")
+    }
+}
+
 impl Model for Badge {
     fn from_row(row: &Row) -> Badge {
         let attributes: Json = row.get("attributes");

src/category.rs

@@ -8,10 +8,13 @@ use pg::rows::Row;
 
 use {Model, Crate};
 use db::RequestTransaction;
+use schema::*;
 use util::{RequestUtils, CargoResult, ChainError};
 use util::errors::NotFound;
 
-#[derive(Clone)]
+#[derive(Clone, Identifiable, Associations)]
+#[has_many(crates_categories)]
+#[table_name="categories"]
 pub struct Category {
     pub id: i32,
     pub category: String,
@@ -21,6 +24,15 @@ pub struct Category {
     pub crates_cnt: i32,
 }
 
+#[derive(Associations)]
+#[belongs_to(Category)]
+#[table_name="crates_categories"]
+#[allow(dead_code)] // FIXME: Hey @sgrif add better many-to-many support to Diesel, wouldya?
+struct CrateCategory {
+    crate_id: i32,
+    category_id: i32,
+}
+
 #[derive(RustcEncodable, RustcDecodable)]
 pub struct EncodableCategory {
     pub id: String,

src/keyword.rs

@@ -9,17 +9,28 @@ use pg::rows::Row;
 
 use {Model, Crate};
 use db::RequestTransaction;
+use schema::*;
 use util::{RequestUtils, CargoResult, ChainError, internal};
 use util::errors::NotFound;
 
-#[derive(Clone)]
+#[derive(Clone, Identifiable, Associations)]
+#[has_many(crates_keywords)]
 pub struct Keyword {
     pub id: i32,
     pub keyword: String,
     pub created_at: Timespec,
     pub crates_cnt: i32,
 }
 
+#[derive(Associations)]
+#[belongs_to(Keyword)]
+#[table_name="crates_keywords"]
+#[allow(dead_code)]
+struct CrateKeyword {
+    crate_id: i32,
+    keyword_id: i32,
+}
+
 #[derive(RustcEncodable, RustcDecodable)]
 pub struct EncodableKeyword {
     pub id: String,