More fixes to reach feature parity with old version

Author: weiznich

wundergraph/Cargo.toml

@@ -17,29 +17,28 @@ diesel = { version = "1.4", features = ["r2d2"]}
 juniper = "0.11"
 indexmap = "1"
 wundergraph_derive = { path = "../wundergraph_derive" }
-uuid = { version = "0.7", optional = true }
-chrono = { version = "0.4", optional = true }
+uuid_internal = { version = "0.7", optional = true, package = "uuid" }
+chrono_internal = { version = "0.4", optional = true, package = "chrono" }
 failure = "0.1"
 log = "0.4"
 paste = "0.1"
 
 [dev-dependencies]
 wundergraph_example = { path = "../wundergraph_example", default-features = false }
 wundergraph_bench = { path = "../wundergraph_bench", default-features = false }
-diesel_migrations = "1.3.0"
+diesel_migrations = "1.4.0"
 serde_json = "1"
 criterion = "0.2"
 lazy_static = "1"
 
 [features]
 default = ["postgres", "extras"]
-#default = ["postgres", "extras"]
 debug = ["wundergraph_derive/debug"]
 sqlite = ["diesel/sqlite", "wundergraph_derive/sqlite"]
 postgres = ["diesel/postgres", "wundergraph_derive/postgres"]
 extras = ["chrono", "uuid"]
-
-
+uuid = ["uuid_internal", "diesel/uuidv07"]
+chrono = ["chrono_internal", "diesel/chrono"]
 
 [[test]]
 name = "integration_tests"

wundergraph/src/filter/filter_helper.rs

@@ -15,7 +15,7 @@ use crate::scalar::WundergraphScalarValue;
 use crate::{ApplyOffset, LoadingHandler};
 use diesel::associations::HasTable;
 use diesel::backend::Backend;
-use diesel::expression::NonAggregate;
+use diesel::expression::{NonAggregate, SelectableExpression};
 use diesel::query_builder::QueryFragment;
 use diesel::sql_types::Bool;
 use diesel::Expression;
@@ -104,21 +104,18 @@ pub trait AsNonColumnFilter<L, DB, Ctx> {
     type Filter;
 }
 
-impl<L, O, DB, Ctx> AsNonColumnFilter<L, DB, Ctx> for HasMany<O>
+impl<L, O, DB, Ctx, FK> AsNonColumnFilter<L, DB, Ctx> for HasMany<O, FK>
 where
     L: HasTable,
-    O: WundergraphBelongsTo<L::Table, DB, Ctx>,
+    FK: Default + NonAggregate + QueryFragment<DB> + SelectableExpression<O::Table>,
+    O: WundergraphBelongsTo<L::Table, DB, Ctx, FK>,
     O::Table: 'static,
     DB: Backend + ApplyOffset + 'static,
     <O::Table as QuerySource>::FromClause: QueryFragment<DB>,
     DB::QueryBuilder: Default,
 {
-    type Filter = ReferenceFilter<
-        <L::Table as Table>::PrimaryKey,
-        Filter<O::Filter, O::Table>,
-        O::ForeignKeyColumn,
-        (),
-    >;
+    type Filter =
+        ReferenceFilter<<L::Table as Table>::PrimaryKey, Filter<O::Filter, O::Table>, FK, ()>;
 }
 
 impl<C, DB, Ctx> AsColumnFilter<C, DB, Ctx> for i16 {
@@ -161,7 +158,17 @@ where
 }
 
 #[cfg(feature = "chrono")]
-impl<C, DB, Ctx> AsColumnFilter<C, DB, Ctx> for chrono::NaiveDateTime {
+impl<C, DB, Ctx> AsColumnFilter<C, DB, Ctx> for chrono_internal::NaiveDateTime {
+    type Filter = FilterOption<Self, C>;
+}
+
+#[cfg(feature = "chrono")]
+impl<C, DB, Ctx> AsColumnFilter<C, DB, Ctx> for chrono_internal::DateTime<chrono_internal::Utc> {
+    type Filter = FilterOption<Self, C>;
+}
+
+#[cfg(feature = "uuid")]
+impl<C, DB, Ctx> AsColumnFilter<C, DB, Ctx> for uuid_internal::Uuid {
     type Filter = FilterOption<Self, C>;
 }
 

wundergraph/src/filter/filter_value.rs

@@ -86,18 +86,15 @@ where
 }
 
 #[cfg(feature = "chrono")]
-extern crate chrono;
-
-#[cfg(feature = "chrono")]
-impl<C> FilterValue<C> for self::chrono::NaiveDateTime {
+impl<C> FilterValue<C> for chrono_internal::NaiveDateTime {
     type RawValue = Self;
     type AdditionalFilter = ();
 }
 
 #[cfg(feature = "chrono")]
-impl<O, C> FilterValue<C> for self::chrono::DateTime<O>
+impl<O, C> FilterValue<C> for chrono_internal::DateTime<O>
 where
-    O: self::chrono::TimeZone,
+    O: chrono_internal::TimeZone,
     Self: ToInputValue<WundergraphScalarValue>
         + FromInputValue<WundergraphScalarValue>
         + FromLookAheadValue,
@@ -107,16 +104,13 @@ where
 }
 
 #[cfg(feature = "chrono")]
-impl<C> FilterValue<C> for self::chrono::NaiveDate {
+impl<C> FilterValue<C> for chrono_internal::NaiveDate {
     type RawValue = Self;
     type AdditionalFilter = ();
 }
 
 #[cfg(feature = "uuid")]
-extern crate uuid;
-
-#[cfg(feature = "uuid")]
-impl<C> FilterValue<C> for self::uuid::Uuid {
+impl<C> FilterValue<C> for uuid_internal::Uuid {
     type RawValue = Self;
     type AdditionalFilter = ();
 }

wundergraph/src/helper/from_lookahead.rs

@@ -130,11 +130,9 @@ static RFC3339_PARSE_FORMAT: &'static str = "%+";
 #[cfg(feature = "chrono")]
 static RFC3339_FORMAT: &'static str = "%Y-%m-%dT%H:%M:%S%.f%:z";
 
-#[cfg(feature = "chrono")]
-extern crate chrono;
 
 #[cfg(feature = "chrono")]
-impl FromLookAheadValue for self::chrono::NaiveDateTime {
+impl FromLookAheadValue for chrono_internal::NaiveDateTime {
     fn from_look_ahead(v: &LookAheadValue<'_, WundergraphScalarValue>) -> Option<Self> {
         if let LookAheadValue::Scalar(WundergraphScalarValue::String(ref s)) = *v {
             Self::parse_from_str(s, RFC3339_PARSE_FORMAT).ok()
@@ -145,7 +143,7 @@ impl FromLookAheadValue for self::chrono::NaiveDateTime {
 }
 
 #[cfg(feature = "chrono")]
-impl FromLookAheadValue for self::chrono::DateTime<self::chrono::Utc> {
+impl FromLookAheadValue for chrono_internal::DateTime<chrono_internal::Utc> {
     fn from_look_ahead(v: &LookAheadValue<'_, WundergraphScalarValue>) -> Option<Self> {
         if let LookAheadValue::Scalar(WundergraphScalarValue::String(ref s)) = *v {
             s.parse().ok()
@@ -156,7 +154,7 @@ impl FromLookAheadValue for self::chrono::DateTime<self::chrono::Utc> {
 }
 
 #[cfg(feature = "chrono")]
-impl FromLookAheadValue for self::chrono::DateTime<self::chrono::FixedOffset> {
+impl FromLookAheadValue for chrono_internal::DateTime<chrono_internal::FixedOffset> {
     fn from_look_ahead(v: &LookAheadValue<'_, WundergraphScalarValue>) -> Option<Self> {
         if let LookAheadValue::Scalar(WundergraphScalarValue::String(ref s)) = *v {
             Self::parse_from_rfc3339(s).ok()
@@ -167,7 +165,7 @@ impl FromLookAheadValue for self::chrono::DateTime<self::chrono::FixedOffset> {
 }
 
 #[cfg(feature = "chrono")]
-impl FromLookAheadValue for self::chrono::NaiveDate {
+impl FromLookAheadValue for chrono_internal::NaiveDate {
     fn from_look_ahead(v: &LookAheadValue<'_, WundergraphScalarValue>) -> Option<Self> {
         if let LookAheadValue::Scalar(WundergraphScalarValue::String(ref s)) = *v {
             Self::parse_from_str(s, RFC3339_FORMAT).ok()
@@ -178,10 +176,7 @@ impl FromLookAheadValue for self::chrono::NaiveDate {
 }
 
 #[cfg(feature = "uuid")]
-extern crate uuid;
-
-#[cfg(feature = "uuid")]
-impl FromLookAheadValue for self::uuid::Uuid {
+impl FromLookAheadValue for uuid_internal::Uuid {
     fn from_look_ahead(v: &LookAheadValue<'_, WundergraphScalarValue>) -> Option<Self> {
         if let LookAheadValue::Scalar(WundergraphScalarValue::String(ref s)) = *v {
             Self::parse_str(s).ok()

wundergraph/src/helper/nameable.rs

@@ -109,36 +109,30 @@ impl Nameable for () {
 }
 
 #[cfg(feature = "chrono")]
-extern crate chrono;
-
-#[cfg(feature = "chrono")]
-impl Nameable for self::chrono::NaiveDateTime {
+impl Nameable for chrono_internal::NaiveDateTime {
     fn name() -> String {
         String::from("NaiveDateTime")
     }
 }
 
 #[cfg(feature = "chrono")]
-impl<O> Nameable for self::chrono::DateTime<O>
+impl<O> Nameable for chrono_internal::DateTime<O>
 where
-    O: self::chrono::TimeZone,
+    O: chrono_internal::TimeZone,
 {
     fn name() -> String {
         String::from("DateTime")
     }
 }
 #[cfg(feature = "chrono")]
-impl Nameable for self::chrono::NaiveDate {
+impl Nameable for chrono_internal::NaiveDate {
     fn name() -> String {
         String::from("Date")
     }
 }
 
 #[cfg(feature = "uuid")]
-extern crate uuid;
-
-#[cfg(feature = "uuid")]
-impl Nameable for self::uuid::Uuid {
+impl Nameable for uuid_internal::Uuid {
     fn name() -> String {
         String::from("Uuid")
     }

wundergraph/src/helper/primary_keys.rs

@@ -188,14 +188,15 @@ macro_rules! primary_key_input_object_impl {
 __diesel_for_each_tuple!(primary_key_input_object_impl);
 
 #[derive(Debug)]
-pub struct PrimaryKeyInfo(String);
+pub struct PrimaryKeyInfo<T>(String, PhantomData<T>);
 
-impl PrimaryKeyInfo {
-    pub fn new<T>(table: &T) -> Self
-    where
-        T: QuerySource<FromClause = Identifier<'static>>,
-    {
-        Self(format!("{}Key", table.from_clause().0))
+impl<T> Default for PrimaryKeyInfo<T>
+where
+    T: QuerySource<FromClause = Identifier<'static>> + HasTable<Table = T> + Table,
+{
+    fn default() -> Self {
+        let table = T::table();
+        Self(format!("{}Key", table.from_clause().0), PhantomData)
     }
 }
 
@@ -226,7 +227,7 @@ where
     V: UnRef<'a>,
 {
     type Context = Ctx;
-    type TypeInfo = PrimaryKeyInfo;
+    type TypeInfo = PrimaryKeyInfo<T>;
 
     fn name(info: &Self::TypeInfo) -> Option<&str> {
         Some(&info.0)

wundergraph/src/lib.rs

@@ -27,7 +27,6 @@
     clippy::unnecessary_unwrap,
     clippy::unseparated_literal_suffix,
     clippy::wildcard_dependencies
-
 )]
 #![allow(clippy::type_complexity)]
 
@@ -60,7 +59,6 @@ pub mod helper;
 pub mod mutations;
 pub mod order;
 pub mod query_helper;
-//pub mod query_modifier;
 pub mod scalar;
 #[macro_use]
 mod macros;
@@ -69,22 +67,32 @@ pub mod graphql_type;
 use self::error::WundergraphError;
 use self::helper::FromLookAheadValue;
 use self::scalar::WundergraphScalarValue;
-
+use crate::diesel_ext::BoxableFilter;
+use crate::filter::build_filter::BuildFilter;
+use crate::filter::inner_filter::InnerFilter;
+use crate::filter::Filter;
 use crate::helper::primary_keys::{PrimaryKeyArgument, UnRef};
+use crate::query_helper::order::BuildOrder;
 use crate::query_helper::placeholder::*;
+use crate::query_helper::select::BuildSelect;
+use crate::query_helper::tuple::IsPrimaryKeyIndex;
 use diesel::associations::HasTable;
 use diesel::backend::Backend;
 use diesel::dsl::SqlTypeOf;
 use diesel::expression::NonAggregate;
 use diesel::query_builder::{BoxedSelectStatement, QueryFragment};
 use diesel::query_dsl::methods::BoxedDsl;
+use diesel::query_dsl::methods::FilterDsl;
 use diesel::query_dsl::methods::{LimitDsl, OffsetDsl, SelectDsl};
 use diesel::r2d2;
+use diesel::sql_types::{Bool, HasSqlType};
+use diesel::BoxableExpression;
 use diesel::EqAll;
 use diesel::Identifiable;
 use diesel::QuerySource;
 use diesel::{AppearsOnTable, Connection, QueryDsl, Table};
 use failure::Error;
+use juniper::LookAheadValue;
 use juniper::{Executor, LookAheadSelection, Selection};
 
 pub trait WundergraphContext {
@@ -161,18 +169,6 @@ where
     }
 }
 
-use crate::diesel_ext::BoxableFilter;
-use crate::filter::build_filter::BuildFilter;
-use crate::filter::inner_filter::InnerFilter;
-use crate::filter::Filter;
-use crate::query_helper::order::BuildOrder;
-use crate::query_helper::select::BuildSelect;
-use crate::query_helper::tuple::IsPrimaryKeyIndex;
-use diesel::query_dsl::methods::FilterDsl;
-use diesel::sql_types::{Bool, HasSqlType};
-use diesel::BoxableExpression;
-use juniper::LookAheadValue;
-
 pub trait LoadingHandler<DB, Ctx>: HasTable + Sized
 where
     DB: Backend + ApplyOffset + 'static,