Update all dependencies to newest avaible versions

Author: weiznich

wundergraph/Cargo.toml

@@ -14,7 +14,7 @@ description = "A GraphQL ORM build on top of diesel"
 [dependencies]
 serde = "1"
 diesel = { version = "1.4", features = ["r2d2"]}
-juniper = "0.11"
+juniper = "0.12"
 indexmap = "1"
 wundergraph_derive = { path = "../wundergraph_derive" }
 uuid_internal = { version = "0.7", optional = true, package = "uuid" }
@@ -30,7 +30,7 @@ diesel_migrations = "1.4.0"
 serde_json = "1"
 criterion = "0.2"
 lazy_static = "1"
-insta = "0.7"
+insta = "0.8"
 
 [features]
 default = ["postgres", "extras"]

wundergraph/src/query_builder/mutations/delete.rs

@@ -17,7 +17,7 @@ use juniper::{
 };
 
 #[derive(Debug, GraphQLObject, Clone, Copy)]
-#[graphql(scalar = "WundergraphScalarValue")]
+#[graphql(scalar = WundergraphScalarValue)]
 pub struct DeletedCount {
     pub count: i64,
 }

wundergraph_bench/Cargo.toml

@@ -14,14 +14,12 @@ edition = "2018"
 [dependencies]
 wundergraph = {path = "../wundergraph", default-features = false, features = ["chrono"]}
 diesel = {version = "1.4", features = ["r2d2", "chrono"]}
-juniper = "0.11.0"
-actix = "0.7"
-actix-web = "0.7"
+juniper = "0.12.0"
+actix-web = "1.0.0-rc"
 failure = "0.1"
 serde = {version = "1", features = ["derive"]}
 serde_json = "1"
-futures = "0.1"
-env_logger = "0.5"
+env_logger = "0.6"
 chrono = "0.4"
 num_cpus = "1.8"
 structopt = "0.2"

wundergraph_bench/src/bin/main.rs

@@ -29,35 +29,16 @@
     clippy::wildcard_dependencies
 )]
 
-use actix;
-
-use structopt;
-
-#[macro_use]
-extern crate serde;
-
-use num_cpus;
-use serde_json;
-use wundergraph_bench;
-
-use std::sync::Arc;
-
-use actix::{Actor, Addr, Handler, Message, SyncArbiter, SyncContext};
-use actix_web::{
-    http, server, App, AsyncResponder, FutureResponse, HttpRequest, HttpResponse, Json, State,
-};
-
+use actix_web::web::{Data, Json};
+use actix_web::{middleware, web, App, HttpResponse, HttpServer};
 use diesel::pg::PgConnection;
 use diesel::r2d2::{ConnectionManager, Pool};
-
 use failure::Error;
-use futures::Future;
-
 use juniper::graphiql::graphiql_source;
 use juniper::http::GraphQLRequest;
-
+use serde::{Deserialize, Serialize};
+use std::sync::Arc;
 use structopt::StructOpt;
-
 use wundergraph::scalar::WundergraphScalarValue;
 
 #[derive(Debug, StructOpt)]
@@ -73,65 +54,28 @@ struct Opt {
 #[derive(Serialize, Deserialize, Debug)]
 pub struct GraphQLData(GraphQLRequest<WundergraphScalarValue>);
 
-impl Message for GraphQLData {
-    type Result = Result<String, Error>;
-}
-
-#[allow(missing_debug_implementations)]
-pub struct GraphQLExecutor {
+#[derive(Clone)]
+struct AppState {
     schema: Arc<wundergraph_bench::Schema<PgConnection>>,
     pool: Arc<Pool<ConnectionManager<PgConnection>>>,
 }
 
-impl GraphQLExecutor {
-    fn new(
-        schema: Arc<wundergraph_bench::Schema<PgConnection>>,
-        pool: Arc<Pool<ConnectionManager<PgConnection>>>,
-    ) -> Self {
-        Self { schema, pool }
-    }
-}
-
-impl Actor for GraphQLExecutor {
-    type Context = SyncContext<Self>;
-}
-
-impl Handler<GraphQLData> for GraphQLExecutor {
-    type Result = Result<String, Error>;
-
-    fn handle(&mut self, msg: GraphQLData, _: &mut Self::Context) -> Self::Result {
-        let ctx = self.pool.get()?;
-        //        let ctx = MyContext::new(self.pool.get()?);
-        let res = msg.0.execute(&*self.schema, &ctx);
-        let res_text = serde_json::to_string(&res)?;
-        Ok(res_text)
-    }
-}
-
-struct AppState {
-    executor: Addr<GraphQLExecutor>,
-}
-
-#[cfg_attr(feature = "clippy", allow(needless_pass_by_value))]
-fn graphiql(_req: &HttpRequest<AppState>) -> Result<HttpResponse, Error> {
+fn graphiql() -> Result<HttpResponse, Error> {
     let html = graphiql_source("/graphql");
     Ok(HttpResponse::Ok()
         .content_type("text/html; charset=utf-8")
         .body(html))
 }
 
-#[cfg_attr(feature = "clippy", allow(needless_pass_by_value))]
-fn graphql((st, data): (State<AppState>, Json<GraphQLData>)) -> FutureResponse<HttpResponse> {
-    st.executor
-        .send(data.0)
-        .from_err()
-        .and_then(|res| match res {
-            Ok(user) => Ok(HttpResponse::Ok()
-                .content_type("application/json")
-                .body(user)),
-            Err(_) => Ok(HttpResponse::InternalServerError().into()),
-        })
-        .responder()
+fn graphql(
+    Json(GraphQLData(data)): Json<GraphQLData>,
+    st: Data<AppState>,
+) -> Result<HttpResponse, Error> {
+    let ctx = st.get_ref().pool.get()?;
+    let res = data.execute(&st.get_ref().schema, &ctx);
+    Ok(HttpResponse::Ok()
+        .content_type("application/json")
+        .body(serde_json::to_string(&res)?))
 }
 
 #[allow(clippy::print_stdout)]
@@ -147,36 +91,29 @@ fn main() {
     let mutation = wundergraph_bench::api::Mutation::default();
     let schema = wundergraph_bench::Schema::new(query, mutation);
 
-    let sys = actix::System::new("wundergraph-bench");
-
     let schema = Arc::new(schema);
     let pool = Arc::new(pool);
-    let addr = SyncArbiter::start(num_cpus::get() + 1, move || {
-        GraphQLExecutor::new(schema.clone(), pool.clone())
-    });
+    let data = AppState { schema, pool };
     let url = opt.socket;
 
     // Start http server
-    server::new(move || {
-        App::with_state(AppState {
-            executor: addr.clone(),
-        })
-        .resource("/graphql", |r| r.method(http::Method::POST).with(graphql))
-        .resource("/graphql", |r| r.method(http::Method::GET).with(graphql))
-        .resource("/graphiql", |r| r.method(http::Method::GET).h(graphiql))
-        .default_resource(|r| {
-            r.get().f(|_| {
+    println!("Started http server: http://{}", url);
+
+    HttpServer::new(move || {
+        App::new()
+            .data(data.clone())
+            .wrap(middleware::Logger::default())
+            .route("/graphql", web::get().to(graphql))
+            .route("/graphql", web::post().to(graphql))
+            .route("/graphiql", web::get().to(graphiql))
+            .default_service(web::route().to(|| {
                 HttpResponse::Found()
                     .header("location", "/graphiql")
                     .finish()
-            })
-        })
+            }))
     })
-    .workers(num_cpus::get() * 2)
     .bind(&url)
     .expect("Failed to start server")
-    .start();
-
-    println!("Started http server: http://{}", url);
-    let _ = sys.run();
+    .run()
+    .unwrap();
 }

wundergraph_cli/Cargo.toml

@@ -16,7 +16,7 @@ clap = "2.27"
 diesel = "1.2"
 
 [dev-dependencies]
-dotenv = "0.10"
+dotenv = "0.14"
 
 [features]
 default = ["postgres", "sqlite"]

wundergraph_cli/src/print_schema/mod.rs

@@ -27,7 +27,7 @@ pub fn print(database_url: &str, schema_name: Option<&str>) -> Result<(), Box<dy
     let mutations = GraphqlMutations {
         tables: &table_data,
     };
-    println!("use wundergraph::query_helper::{{HasMany, HasOne}};");
+    println!("use wundergraph::query_builder::types::{{HasMany, HasOne}};");
     println!("use wundergraph::scalar::WundergraphScalarValue;");
     println!("use wundergraph::WundergraphEntity;");
     println!();

wundergraph_example/Cargo.toml

@@ -14,15 +14,13 @@ edition = "2018"
 [dependencies]
 diesel = { version = "1.4.0", features = ["r2d2", "sqlite", "chrono", "postgres"]}
 diesel_migrations = "1.4.0"
-juniper = "0.11.0"
-actix = "0.7"
-actix-web = "0.7"
+juniper = "0.12"
+actix-web = "1.0.0-rc"
 indexmap = "1"
 failure = "0.1"
 serde = {version = "1", features = ["derive"]}
 serde_json = "1"
-futures = "0.1"
-env_logger = "0.5"
+env_logger = "0.6"
 structopt = "0.2"
 
 [dependencies.wundergraph]