Actually use JSON storage for JSON data

We also never use `features` as a `HashMap<String, Vec<String>>`, so we
can just pass it through from the database in a lower level
representation.

Author: sgrif

migrations/2018-01-18-172821_use_jsonb_for_features/down.sql

@@ -0,0 +1,3 @@
+ALTER TABLE versions ALTER COLUMN features DROP NOT NULL;
+ALTER TABLE versions ALTER COLUMN features DROP DEFAULT;
+ALTER TABLE versions ALTER COLUMN features SET DATA TYPE text;

migrations/2018-01-18-172821_use_jsonb_for_features/up.sql

@@ -0,0 +1,3 @@
+ALTER TABLE versions ALTER COLUMN features SET DATA TYPE jsonb USING features::jsonb;
+ALTER TABLE versions ALTER COLUMN features SET DEFAULT '{}';
+ALTER TABLE versions ALTER COLUMN features SET NOT NULL;

src/schema.rs

@@ -748,10 +748,10 @@ table! {
         downloads -> Int4,
         /// The `features` column of the `versions` table.
         ///
-        /// Its SQL type is `Nullable<Varchar>`.
+        /// Its SQL type is `Jsonb`.
         ///
         /// (Automatically generated by Diesel.)
-        features -> Nullable<Varchar>,
+        features -> Jsonb,
         /// The `yanked` column of the `versions` table.
         ///
         /// Its SQL type is `Bool`.

src/version/mod.rs

@@ -31,7 +31,7 @@ pub struct Version {
     pub updated_at: NaiveDateTime,
     pub created_at: NaiveDateTime,
     pub downloads: i32,
-    pub features: HashMap<String, Vec<String>>,
+    pub features: serde_json::Value,
     pub yanked: bool,
     pub license: Option<String>,
 }
@@ -41,7 +41,7 @@ pub struct Version {
 pub struct NewVersion {
     crate_id: i32,
     num: String,
-    features: String,
+    features: serde_json::Value,
     license: Option<String>,
 }
 
@@ -55,7 +55,7 @@ pub struct EncodableVersion {
     #[serde(with = "::util::rfc3339")] pub updated_at: NaiveDateTime,
     #[serde(with = "::util::rfc3339")] pub created_at: NaiveDateTime,
     pub downloads: i32,
-    pub features: HashMap<String, Vec<String>>,
+    pub features: serde_json::Value,
     pub yanked: bool,
     pub license: Option<String>,
     pub links: VersionLinks,
@@ -145,7 +145,7 @@ impl NewVersion {
         license: Option<String>,
         license_file: Option<&str>,
     ) -> CargoResult<Self> {
-        let features = serde_json::to_string(features)?;
+        let features = serde_json::to_value(features)?;
 
         let mut new_version = NewVersion {
             crate_id: crate_id,
@@ -224,24 +224,21 @@ impl Queryable<versions::SqlType, Pg> for Version {
         NaiveDateTime,
         NaiveDateTime,
         i32,
-        Option<String>,
+        serde_json::Value,
         bool,
         Option<String>,
         Option<NaiveDateTime>,
     );
 
     fn build(row: Self::Row) -> Self {
-        let features = row.6
-            .map(|s| serde_json::from_str(&s).unwrap())
-            .unwrap_or_else(HashMap::new);
         Version {
             id: row.0,
             crate_id: row.1,
             num: semver::Version::parse(&row.2).unwrap(),
             updated_at: row.3,
             created_at: row.4,
             downloads: row.5,
-            features: features,
+            features: row.6,
             yanked: row.7,
             license: row.8,
         }