Update diesel to a version that is likely to be merged

Author: weiznich

Cargo.toml

@@ -8,10 +8,10 @@ members = [
 ]
 
 [replace]
-"diesel:1.2.2" = { git = "https://github.com/weiznich/diesel", rev = "deb2cd532d05" }
-"diesel_migrations:1.2.0" = { git = "https://github.com/weiznich/diesel", rev = "deb2cd532d05" }
-"migrations_internals:1.2.0" = { git = "https://github.com/weiznich/diesel", rev = "deb2cd532d05" }
-"migrations_macros:1.2.0" = { git = "https://github.com/weiznich/diesel", rev = "deb2cd532d05" }
-"diesel_derives:1.2.0" = { git = "https://github.com/weiznich/diesel", rev = "deb2cd532d05" }
+"diesel:1.3.2" = { git = "https://github.com/weiznich/diesel", rev = "a0e25315820290" }
+"diesel_migrations:1.3.0" = { git = "https://github.com/weiznich/diesel", rev = "a0e25315820290" }
+"migrations_internals:1.3.0" = { git = "https://github.com/weiznich/diesel", rev = "a0e25315820290" }
+"migrations_macros:1.3.0" = { git = "https://github.com/weiznich/diesel", rev = "a0e25315820290" }
+"diesel_derives:1.3.0" = { git = "https://github.com/weiznich/diesel", rev = "a0e25315820290" }
 "juniper:0.9.2" = { git = "https://github.com/weiznich/juniper", rev = "15cfff0a78" }
 "juniper_codegen:0.9.2" = { git = "https://github.com/weiznich/juniper/", rev = "15cfff0a78" }

wundergraph/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Georg Semmler <[email protected]>"]
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-diesel = { version = "=1.2.2", features = ["r2d2"]}
+diesel = { version = "=1.3.2", features = ["r2d2"]}
 juniper = "=0.9.2"
 indexmap = "1"
 wundergraph_derive = { path = "../wundergraph_derive" }

wundergraph/src/helper/primary_keys.rs

@@ -359,6 +359,7 @@ where
     }
 }
 
+#[derive(Debug)]
 pub struct PrimaryKeyInfo(String);
 
 impl PrimaryKeyInfo {

wundergraph/src/lib.rs

@@ -1,4 +1,4 @@
-//#![deny(warnings, missing_debug_implementations, missing_copy_implementations)]
+#![deny(missing_debug_implementations, missing_copy_implementations)]
 // Clippy lints
 #![cfg_attr(feature = "clippy", allow(unstable_features))]
 #![cfg_attr(feature = "clippy", feature(plugin))]

wundergraph/src/mutations/delete.rs

@@ -43,7 +43,9 @@ pub trait DeleteHelper<DB, R, Ctx> {
     type Handler: HandleDelete<DB, R, Ctx>;
 }
 
+
 #[doc(hidden)]
+#[derive(Debug)]
 pub struct DeleteableWrapper<D>(D);
 
 impl<I, R, DB, Ctx, T> DeleteHelper<DB, R, Ctx> for I

wundergraph/src/mutations/insert.rs

@@ -96,6 +96,7 @@ pub trait HandleInsert<DB, R, Ctx>: Sized {
 }
 
 #[doc(hidden)]
+#[derive(Debug)]
 pub struct InsertableWrapper<I>(I);
 
 impl<I, DB, R, Ctx> InsertHelper<DB, R, Ctx> for I

wundergraph/src/mutations/update.rs

@@ -41,6 +41,7 @@ pub trait UpdateHelper<DB, R, Ctx> {
 }
 
 #[doc(hidden)]
+#[derive(Debug)]
 pub struct AsChangeSetWrapper<U>(U);
 
 impl<U, DB, R, Ctx, T> UpdateHelper<DB, R, Ctx> for U

wundergraph/src/query_helper/has_many.rs

@@ -1,3 +1,6 @@
+use diesel::backend::Backend;
+use diesel::sql_types::{Bool, Nullable};
+use diesel::Queryable;
 use juniper::meta::MetaType;
 use juniper::{
     Arguments, ExecutionResult, Executor, FieldError, GraphQLType, Registry, Selection, Value,
@@ -25,6 +28,19 @@ impl<T> HasMany<T> {
     }
 }
 
+impl<DB, T> Queryable<Nullable<Bool>, DB> for HasMany<T>
+where
+    DB: Backend,
+    bool: Queryable<Bool, DB>,
+{
+    type Row = <Option<bool> as Queryable<Nullable<Bool>, DB>>::Row;
+
+    fn build(row: Self::Row) -> Self {
+        assert!(<Option<bool> as Queryable<_, _>>::build(row).is_none());
+        HasMany::NotLoaded
+    }
+}
+
 impl<T> GraphQLType for HasMany<T>
 where
     T: GraphQLType,

wundergraph/src/query_helper/has_one.rs

@@ -1,12 +1,15 @@
-use diesel::associations::ForeignKey;
+use diesel::associations::Identifiable;
 use diesel::backend::Backend;
 use diesel::expression::bound::Bound;
 use diesel::expression::AsExpression;
 use diesel::Queryable;
+use helper::FromLookAheadValue;
 use juniper::meta::MetaType;
 use juniper::{
-    Arguments, ExecutionResult, Executor, FieldError, GraphQLType, Registry, Selection, Value,
+    Arguments, ExecutionResult, Executor, FieldError, FromInputValue, GraphQLType, InputValue,
+    Registry, Selection, ToInputValue, Value, LookAheadValue
 };
+
 use std::hash::Hash;
 
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]
@@ -15,16 +18,46 @@ pub enum HasOne<R, T> {
     Item(T),
 }
 
-impl<R, T, ST> ForeignKey<ST> for HasOne<R, T>
+impl<'a, K, I> Into<Option<&'a K>> for &'a HasOne<K, I>
 where
-    R: ForeignKey<ST> + ::std::cmp::Eq + Hash,
+    &'a I: Identifiable<Id = &'a K>,
+    K: Eq + Hash,
 {
-    type KeyType = <R as ForeignKey<ST>>::KeyType;
+    fn into(self) -> Option<&'a K> {
+        match *self {
+            HasOne::Id(ref k) => Some(k),
+            HasOne::Item(ref i) => Some(i.id()),
+        }
+    }
+}
 
-    fn key(&self) -> Option<&Self::KeyType> {
+impl<R, T> FromInputValue for HasOne<R, T>
+where
+    R: FromInputValue,
+{
+    fn from_input_value(v: &InputValue) -> Option<Self> {
+        R::from_input_value(v).map(HasOne::Id)
+    }
+}
+
+impl<R, T> FromLookAheadValue for HasOne<R, T>
+where
+    R: FromLookAheadValue,
+{
+    fn from_look_ahead(v: &LookAheadValue) -> Option<Self> {
+        R::from_look_ahead(v).map(HasOne::Id)
+    }
+}
+
+impl<R, T> ToInputValue for HasOne<R, T>
+where
+    R: ToInputValue,
+    T: ToInputValue,
+{
+    fn to_input_value(&self) -> InputValue {
         match *self {
-            HasOne::Id(ref id) => id.key(),
-            _ => None,
+            HasOne::Id(ref i) => i.to_input_value(),
+            HasOne::Item(ref i) => i.to_input_value(),
         }
     }
 }

wundergraph/src/query_helper/lazy_load.rs

@@ -1,4 +1,5 @@
 use diesel::backend::Backend;
+use diesel::sql_types::{NotNull, Nullable};
 use diesel::Queryable;
 use filter::filter_value::FilterValue;
 use helper::{FromLookAheadValue, Nameable};
@@ -30,27 +31,30 @@ impl<T> LazyLoad<T> {
     }
 }
 
-impl<T, C> FilterValue<C> for LazyLoad<T>
-where
-    T: FilterValue<C>,
-{
-    type RawValue = <T as FilterValue<C>>::RawValue;
-    type AdditionalFilter = <T as FilterValue<C>>::AdditionalFilter;
-}
-
-impl<T, ST, DB> Queryable<ST, DB> for LazyLoad<T>
+impl<DB, T, ST> Queryable<Nullable<ST>, DB> for LazyLoad<T>
 where
     DB: Backend,
     T: Queryable<ST, DB>,
+    ST: NotNull,
 {
-    type Row = <T as Queryable<ST, DB>>::Row;
+    type Row = <Option<T> as Queryable<Nullable<ST>, DB>>::Row;
 
     fn build(row: Self::Row) -> Self {
-        let row = Queryable::build(row);
-        LazyLoad::Item(row)
+        match Queryable::build(row) {
+            None => LazyLoad::NotLoaded,
+            Some(i) => LazyLoad::Item(i),
+        }
     }
 }
 
+impl<T, C> FilterValue<C> for LazyLoad<T>
+where
+    T: FilterValue<C>,
+{
+    type RawValue = <T as FilterValue<C>>::RawValue;
+    type AdditionalFilter = <T as FilterValue<C>>::AdditionalFilter;
+}
+
 impl<T> GraphQLType for LazyLoad<T>
 where
     T: GraphQLType,

wundergraph/src/query_helper/mod.rs

@@ -1,7 +1,9 @@
 mod has_many;
 mod has_one;
 mod lazy_load;
+pub mod null;
 
 pub use self::has_many::HasMany;
 pub use self::has_one::HasOne;
 pub use self::lazy_load::LazyLoad;
+pub use self::null::Null;

wundergraph/src/query_helper/null.rs

@@ -0,0 +1,52 @@
+use diesel::backend::Backend;
+use diesel::expression::{AppearsOnTable, Expression, NonAggregate, SelectableExpression};
+use diesel::query_builder::{AstPass, QueryFragment, QueryId};
+use diesel::result::QueryResult;
+use diesel::sql_types::{NotNull, Nullable};
+use std::marker::PhantomData;
+
+#[derive(Debug, Clone, Copy)]
+pub struct Null<ST>(PhantomData<ST>);
+
+pub fn null<ST>() -> Null<ST> {
+    Null(PhantomData)
+}
+
+impl<ST> Expression for Null<ST>
+where
+    ST: NotNull,
+{
+    type SqlType = Nullable<ST>;
+}
+
+impl<ST, DB> QueryFragment<DB> for Null<ST>
+where
+    DB: Backend,
+{
+    fn walk_ast(&self, mut pass: AstPass<DB>) -> QueryResult<()> {
+        pass.push_sql(" NULL ");
+        Ok(())
+    }
+}
+
+impl<ST> QueryId for Null<ST>
+where
+    ST: QueryId + NotNull,
+{
+    type QueryId = <Nullable<ST> as QueryId>::QueryId;
+    const HAS_STATIC_QUERY_ID: bool = true;
+}
+
+impl<ST> NonAggregate for Null<ST> {}
+
+impl<ST, QS> AppearsOnTable<QS> for Null<ST>
+where
+    Self: Expression,
+{
+}
+
+impl<T, ST> SelectableExpression<T> for Null<ST>
+where
+    Self: Expression,
+{
+}

wundergraph_bench/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Georg Semmler <[email protected]>"]
 
 [dependencies]
 wundergraph = {path = "../wundergraph", default-features = false, features = ["postgres", "chrono"]}
-diesel = {version = "=1.2.2", features = ["r2d2", "sqlite", "chrono", "postgres"]}
+diesel = {version = "=1.3.2", features = ["r2d2", "sqlite", "chrono", "postgres"]}
 juniper = "=0.9.2"
 actix = "0.7"
 actix-web = "0.7"

wundergraph_bench/src/api.rs

@@ -202,7 +202,6 @@ struct Album {
     id: i32,
     title: String,
     artist_id: HasOne<i32, Artist>,
-    #[diesel(default)]
     #[wundergraph(is_nullable_reference = "true")]
     tracks: HasMany<Track>,
 }
@@ -214,7 +213,6 @@ struct Album {
 struct Artist {
     id: i32,
     name: Option<String>,
-    #[diesel(default)]
     albums: HasMany<Album>,
 }
 
@@ -246,8 +244,7 @@ struct Customer {
     phone: Option<String>,
     fax: Option<String>,
     email: String,
-    support_rep_id: HasOne<Option<i32>, Option<Employee>>,
-    #[diesel(default)]
+    support_rep_id: Option<HasOne<i32, Employee>>,
     invoices: HasMany<Invoice>,
 }
 
@@ -271,7 +268,6 @@ struct Employee {
     phone: Option<String>,
     fax: Option<String>,
     email: Option<String>,
-    #[diesel(default)]
     #[wundergraph(is_nullable_reference = "true")]
     customers: HasMany<Customer>,
 }
@@ -313,7 +309,6 @@ struct Film {
 struct Genre {
     id: i32,
     name: Option<String>,
-    #[diesel(default)]
     #[wundergraph(is_nullable_reference = "true")]
     tracks: HasMany<Track>,
 }
@@ -347,7 +342,6 @@ struct Invoice {
     billing_country: Option<String>,
     billing_postal_code: Option<String>,
     //    total: BigDecimal,
-    #[diesel(default)]
     invoice_lines: HasMany<InvoiceLine>,
 }
 
@@ -358,7 +352,6 @@ struct Invoice {
 struct MediaType {
     id: i32,
     name: Option<String>,
-    #[diesel(default)]
     tracks: HasMany<Track>,
 }
 
@@ -369,7 +362,6 @@ struct MediaType {
 struct Playlist {
     id: i32,
     name: Option<String>,
-    #[diesel(default)]
     playlist_track: HasMany<PlaylistTrack>,
 }
 
@@ -394,16 +386,14 @@ struct PlaylistTrack {
 struct Track {
     id: i32,
     name: String,
-    album_id: HasOne<Option<i32>, Option<Album>>,
+    album_id: Option<HasOne<i32, Album>>,
     media_type_id: HasOne<i32, MediaType>,
-    genre_id: HasOne<Option<i32>, Option<Genre>>,
+    genre_id: Option<HasOne<i32, Genre>>,
     composer: Option<String>,
     milliseconds: i32,
     bytes: Option<i32>,
     //    unit_price: BigDecimal,
-    #[diesel(default)]
     invoice_lines: HasMany<InvoiceLine>,
-    #[diesel(default)]
     playlist_track: HasMany<PlaylistTrack>,
 }