Update to diesel changes

Author: weiznich

Cargo.toml

@@ -8,10 +8,10 @@ members = [
 ]
 
 [replace]
-"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" }
+"diesel:1.3.2" = { git = "https://github.com/weiznich/diesel", rev = "d4184dbb85ee" }
+"diesel_migrations:1.3.0" = { git = "https://github.com/weiznich/diesel", rev = "d4184dbb85ee" }
+"migrations_internals:1.3.0" = { git = "https://github.com/weiznich/diesel", rev = "d4184dbb85ee" }
+"migrations_macros:1.3.0" = { git = "https://github.com/weiznich/diesel", rev = "d4184dbb85ee" }
+"diesel_derives:1.3.0" = { git = "https://github.com/weiznich/diesel", rev = "d4184dbb85ee" }
 "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/src/query_helper/has_one.rs

@@ -7,7 +7,7 @@ use helper::FromLookAheadValue;
 use juniper::meta::MetaType;
 use juniper::{
     Arguments, ExecutionResult, Executor, FieldError, FromInputValue, GraphQLType, InputValue,
-    Registry, Selection, ToInputValue, Value, LookAheadValue
+    LookAheadValue, Registry, Selection, ToInputValue, Value,
 };
 
 use std::hash::Hash;
@@ -31,6 +31,20 @@ where
     }
 }
 
+impl<'a, K, I> Into<Option<&'a K>> for &'a HasOne<Option<K>, Option<I>>
+where
+    &'a I: Identifiable<Id = &'a K>,
+    K: Eq + Hash,
+{
+    fn into(self) -> Option<&'a K> {
+        match *self {
+            HasOne::Id(Some(ref k)) => Some(k),
+            HasOne::Item(Some(ref i)) => Some(i.id()),
+            HasOne::Id(None) | HasOne::Item(None) => None,
+        }
+    }
+}
+
 impl<R, T> FromInputValue for HasOne<R, T>
 where
     R: FromInputValue,

wundergraph_derive/src/filter.rs

@@ -25,15 +25,17 @@ pub fn derive(item: &syn::DeriveInput) -> Result<TokenStream, Diagnostic> {
             if f.has_flag("skip") {
                 None
             } else if is_has_one(field_ty) {
-                let reference_ty = if is_option_ty(field_ty) {
-                    quote!(self::wundergraph::filter::NullableReferenceFilter)
-                } else {
-                    quote!(self::wundergraph::filter::ReferenceFilter)
-                };
+                let reference_ty =
+                    if is_option_ty(inner_ty_arg(field_ty, "HasOne", 1).expect("It's there")) {
+                        quote!(self::wundergraph::filter::NullableReferenceFilter)
+                    } else {
+                        quote!(self::wundergraph::filter::ReferenceFilter)
+                    };
                 let remote_table = f.remote_table().map(|t| quote!(#t::table)).unwrap_or_else(
                     |_| {
-                        let remote_type = inner_ty_arg(inner_of_option_ty(&f.ty), "HasOne", 1)
-                            .expect("It's HasOne");
+                        let remote_type = inner_of_option_ty(
+                            inner_ty_arg(&f.ty, "HasOne", 1).expect("It's HasOne"),
+                        );
                         quote!{
                             <#remote_type as diesel::associations::HasTable>::Table
                         }

wundergraph_derive/src/wundergraph_entity.rs

@@ -255,18 +255,15 @@ fn handle_has_one(
                     .remote_table()
                     .map(|t| quote!(#t::table))
                     .unwrap_or_else(|_| {
-                        let remote_type = inner_of_option_ty(
-                            inner_ty_arg(inner_of_option_ty(&f.ty), "HasOne", 1)
-                                .expect("It's HasOne"),
-                        );
+                        let remote_type = inner_of_option_ty(inner_of_option_ty(
+                            inner_ty_arg(&f.ty, "HasOne", 1).expect("It's HasOne"),
+                        ));
                         quote!{
                             <#remote_type as diesel::associations::HasTable>::Table
                         }
                     });
-                let map_fn = if is_option_ty(&f.ty) {
-                    quote!(filter_map(|i| i#field_access.as_ref().map(|g| {
-                        g.expect_id("Id is there").clone()
-                    })))
+                let map_fn = if is_option_ty(inner_ty_arg(&f.ty, "HasOne", 1).expect("Is HasOne")) {
+                    quote!(filter_map(|i| i#field_access.expect_id("Id is there").clone()))
                 } else {
                     quote!(map(|i| i#field_access.expect_id("Id is there").clone()))
                 };
@@ -277,20 +274,20 @@ fn handle_has_one(
                         .#map_fn
                         .collect::<self::std::collections::HashSet<_>>();
                 };
-                let lookup_and_assign = if is_option_ty(&f.ty) {
+                let lookup_and_assign = if is_option_ty(
+                    inner_ty_arg(&f.ty, "HasOne", 1).expect("It's there"),
+                ) {
                     quote!{
                         if let std::option::Option::Some(id)
-                            = i#field_access.as_ref().map(|g| {
-                                g.expect_id("Id is there").clone()
-                            })
+                            = i#field_access.expect_id("Id is there").clone()
                         {
                             if let std::option::Option::Some(c) = items.get(&id).cloned() {
-                                i#field_access = std::option::Option::Some(
-                                    self::wundergraph::query_helper::HasOne::Item(c)
+                                i#field_access = self::wundergraph::query_helper::HasOne::Item(
+                                    std::option::Option::Some(c)
                                 );
                             }
                         } else {
-                            i#field_access = std::option::Option::None;
+                            i#field_access = self::wundergraph::query_helper::HasOne::Item(std::option::Option::None);
                         }
                     }
                 } else {

wundergraph_example/src/main.rs

@@ -257,7 +257,7 @@ mod hero {
         /// Which species a hero belongs to
         species: HasOne<i32, Species>,
         /// On which world a hero was born
-        home_world: Option<HasOne<i32, HomeWorld>>,
+        home_world: HasOne<Option<i32>, Option<HomeWorld>>,
         /// Episodes a hero appears in
         appears_in: HasMany<AppearsIn>,
         /// List of friends of the current hero