Merge #1204

1204: Update to Diesel 1.0.0-beta1 r=carols10cents

Author: bors-voyager[bot]

Cargo.lock

@@ -46,9 +46,9 @@ htmlescape = "0.3.1"
 license-exprs = "^1.3"
 dotenv = "0.10.0"
 toml = "0.4"
-diesel = { version = "0.99.0", features = ["postgres", "serde_json", "chrono"] }
-r2d2-diesel = "0.99.0"
-diesel_full_text_search = "0.99.0"
+diesel = { version = "1.0.0-beta1", features = ["postgres", "serde_json", "chrono"] }
+r2d2-diesel = "1.0.0-beta1"
+diesel_full_text_search = "1.0.0-beta1"
 serde_json = "1.0.0"
 serde_derive = "1.0.0"
 serde = "1.0.0"
@@ -82,5 +82,5 @@ tokio-service = "0.1"
 
 [build-dependencies]
 dotenv = "0.10"
-diesel = { version = "0.99.0", features = ["postgres"] }
-diesel_migrations = { version = "0.99.0", features = ["postgres"] }
+diesel = { version = "1.0.0-beta1", features = ["postgres"] }
+diesel_migrations = { version = "1.0.0-beta1", features = ["postgres"] }

Cargo.toml

@@ -27,10 +27,12 @@ pub struct Dependency {
     pub kind: Kind,
 }
 
-#[derive(Debug)]
+#[derive(Debug, QueryableByName)]
 pub struct ReverseDependency {
-    dependency: Dependency,
-    crate_downloads: i32,
+    #[diesel(embed)] dependency: Dependency,
+    #[sql_type = "::diesel::types::Integer"] crate_downloads: i32,
+    #[sql_type = "::diesel::types::Text"]
+    #[column_name(crate_name)]
     name: String,
 }
 
@@ -211,15 +213,3 @@ impl QueryableByName<Pg> for Dependency {
         })
     }
 }
-
-impl QueryableByName<Pg> for ReverseDependency {
-    fn build<R: NamedRow<Pg>>(row: &R) -> Result<Self, Box<Error + Send + Sync>> {
-        use diesel::types::{Integer, Text};
-
-        Ok(ReverseDependency {
-            dependency: QueryableByName::build(row)?,
-            crate_downloads: row.get::<Integer, _>("crate_downloads")?,
-            name: row.get::<Text, _>("crate_name")?,
-        })
-    }
-}

src/dependency.rs

@@ -25,6 +25,8 @@ impl<T: Query> Query for Paginated<T> {
     type SqlType = (T::SqlType, BigInt);
 }
 
+impl<T, DB> RunQueryDsl<DB> for Paginated<T> {}
+
 impl<T> QueryFragment<Pg> for Paginated<T>
 where
     T: QueryFragment<Pg>,

src/pagination.rs

@@ -6,6 +6,7 @@ extern crate conduit;
 extern crate conduit_middleware;
 extern crate conduit_test;
 extern crate curl;
+#[macro_use]
 extern crate diesel;
 extern crate dotenv;
 extern crate flate2;

src/tests/all.rs

@@ -1,8 +1,5 @@
-use diesel::pg::Pg;
 use diesel::prelude::*;
-use diesel::query_source::QueryableByName;
-use diesel::row::NamedRow;
-use std::error::Error;
+use diesel::types::Text;
 
 #[test]
 fn all_columns_called_crate_id_have_a_cascading_foreign_key() {
@@ -46,37 +43,24 @@ fn all_columns_called_version_id_have_a_cascading_foreign_key() {
     }
 }
 
+#[derive(QueryableByName)]
 struct FkConstraint {
+    #[sql_type = "Text"]
+    #[column_name(conname)]
     name: String,
-    definition: String,
+    #[sql_type = "Text"] definition: String,
 }
 
+#[derive(QueryableByName)]
 struct TableNameAndConstraint {
+    #[sql_type = "Text"]
+    #[column_name(relname)]
     table_name: String,
-    constraint: Option<FkConstraint>,
-}
-
-impl QueryableByName<Pg> for TableNameAndConstraint {
-    fn build<R: NamedRow<Pg>>(row: &R) -> Result<Self, Box<Error + Send + Sync>> {
-        use diesel::types::{Nullable, Text};
-
-        let constraint = match row.get::<Nullable<Text>, _>("conname")? {
-            Some(name) => Some(FkConstraint {
-                definition: row.get::<Text, _>("definition")?,
-                name,
-            }),
-            None => None,
-        };
-        Ok(TableNameAndConstraint {
-            table_name: row.get::<Text, _>("relname")?,
-            constraint,
-        })
-    }
+    #[diesel(embed)] constraint: Option<FkConstraint>,
 }
 
 fn get_fk_constraint_definitions(column_name: &str) -> Vec<TableNameAndConstraint> {
     use diesel::sql_query;
-    use diesel::types::Text;
 
     let (_r, app, _) = ::app();
     let conn = app.diesel_database.get().unwrap();

src/tests/schema_details.rs

@@ -1,25 +1,7 @@
-use diesel::pg::Pg;
-use diesel::query_source::QueryableByName;
-use diesel::row::NamedRow;
-use std::error::Error;
-
+#[derive(QueryableByName)]
 pub struct WithCount<T> {
-    total: i64,
-    record: T,
-}
-
-impl<T> QueryableByName<Pg> for WithCount<T>
-where
-    T: QueryableByName<Pg>,
-{
-    fn build<R: NamedRow<Pg>>(row: &R) -> Result<Self, Box<Error + Send + Sync>> {
-        use diesel::types::BigInt;
-
-        Ok(WithCount {
-            total: row.get::<BigInt, _>("total")?,
-            record: T::build(row)?,
-        })
-    }
+    #[sql_type = "::diesel::types::BigInt"] total: i64,
+    #[diesel(embed)] record: T,
 }
 
 pub trait WithCountExtension<T> {