Respect overridden migration directories in migration run

`revert` and `redo` are still not respecting them, but I will fix those
as a separate PR since they require code changes on the Diesel side.

Author: sgrif

CHANGELOG.md

@@ -14,6 +14,11 @@ for Rust libraries in [RFC #1105](https://github.com/rust-lang/rfcs/blob/master/
 * Added support for the `timestamp with time zone` type in PostgreSQL (referred
   to as `diesel::types::Timestamptz`)
 
+### Fixed
+
+* `diesel migrations run` will now respect migration directories overridden by
+  command line argument or environment variable
+
 ## [0.7.2] - 2016-08-20
 
 * Updated nightly version and syntex support.

diesel_cli/src/database.rs

@@ -15,19 +15,27 @@ use std::{env, fs};
 use std::path::Path;
 
 macro_rules! call_with_conn {
-    ( $database_url:ident,
-      $func:path
+    (
+        $database_url:ident,
+        $($func:ident)::+
+    ) => {{
+        call_with_conn!($database_url, $($func)::+ ())
+    }};
+
+    (
+        $database_url:ident,
+        $($func:ident)::+ ($($args:expr),*)
     ) => {{
         match ::database::backend(&$database_url) {
             #[cfg(feature = "postgres")]
             "postgres" => {
                 let conn = PgConnection::establish(&$database_url).unwrap();
-                $func(&conn)
+                $($func)::+(&conn, $($args),*)
             },
             #[cfg(feature = "sqlite")]
             "sqlite" => {
                 let conn = SqliteConnection::establish(&$database_url).unwrap();
-                $func(&conn)
+                $($func)::+(&conn, $($args),*)
             },
             _ => unreachable!("The backend function should ensure we never get here."),
         }

diesel_cli/src/main.rs

@@ -114,9 +114,10 @@ fn main() {
 
 fn run_migration_command(matches: &ArgMatches) {
     match matches.subcommand() {
-        ("run", Some(_)) => {
+        ("run", Some(args)) => {
             let database_url = database::database_url(matches);
-            call_with_conn!(database_url, migrations::run_pending_migrations)
+            let dir = migrations_dir(args);
+            call_with_conn!(database_url, migrations::run_pending_migrations_in_directory(&dir, &mut stdout()))
                 .unwrap_or_else(handle_error);
         }
         ("revert", Some(_)) => {