Merge branch 'master' of github.com:weiznich/wundergraph

Author: weiznich

wundergraph_example/migrations/pg/2018-01-24-131925_setup/up.sql

@@ -20,7 +20,7 @@ CREATE TABLE heros(
 
 CREATE TABLE appears_in(
     hero_id INTEGER NOT NULL REFERENCES heros(id) ON DELETE CASCADE ON UPDATE RESTRICT,
-    episode INTEGER NOT NULL CHECK(episode IN (1,2,3)),
+    episode SMALLINT NOT NULL CHECK(episode IN (1,2,3)),
     PRIMARY KEY(hero_id, episode)
 );
 

wundergraph_example/migrations/sqlite/2018-01-24-131925_setup/up.sql

@@ -20,7 +20,7 @@ CREATE TABLE heros(
 
 CREATE TABLE appears_in(
     hero_id INTEGER NOT NULL REFERENCES heros(id) ON DELETE CASCADE ON UPDATE RESTRICT,
-    episode INTEGER NOT NULL CHECK(episode IN (1,2,3)),
+    episode SMALLINT NOT NULL CHECK(episode IN (1,2,3)),
     PRIMARY KEY(hero_id, episode)
 );
 

wundergraph_example/src/bin/main.rs

@@ -32,6 +32,7 @@ use diesel::r2d2::{ConnectionManager, Pool};
 use juniper::graphiql::graphiql_source;
 use juniper::http::GraphQLRequest;
 use serde::{Deserialize, Serialize};
+use std::path::PathBuf;
 use std::sync::Arc;
 use structopt::StructOpt;
 use wundergraph::scalar::WundergraphScalarValue;
@@ -75,6 +76,24 @@ fn graphql(
         .body(serde_json::to_string(&res)?))
 }
 
+fn run_migrations(conn: &DBConnection) {
+    let mut migration_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    migration_path.push("migrations");
+    if cfg!(feature = "postgres") {
+        migration_path.push("pg");
+    } else if cfg!(feature = "sqlite") {
+        migration_path.push("sqlite");
+    }
+    let pending_migrations =
+        ::diesel_migrations::mark_migrations_in_directory(conn, &migration_path)
+            .unwrap()
+            .into_iter()
+            .filter_map(|(migration, run)| if run { None } else { Some(migration) });
+
+    ::diesel_migrations::run_migrations(conn, pending_migrations, &mut ::std::io::stdout())
+        .expect("Failed to run migrations");
+}
+
 #[allow(clippy::print_stdout)]
 fn main() {
     let opt = Opt::from_args();
@@ -85,8 +104,8 @@ fn main() {
         .max_size(1)
         .build(manager)
         .expect("Failed to init pool");
-//    ::diesel_migrations::run_pending_migrations(&pool.get().expect("Failed to get db connection"))
-//        .expect("Failed to run migrations");
+
+    run_migrations(&pool.get().expect("Failed to get db connection"));
 
     let query = Query::<MyContext<DBConnection>>::default();
     let mutation = Mutation::<MyContext<DBConnection>>::default();