Adding barrel feature

diesel/src/migration/mod.rs

@@ -5,6 +5,7 @@ pub use self::errors::*;
 
 use connection::SimpleConnection;
 use std::path::Path;
+use std::fmt;
 
 /// Represents a migration that interacts with diesel
 pub trait Migration {
@@ -19,3 +20,67 @@ pub trait Migration {
         None
     }
 }
+
+/// A migration name
+#[allow(missing_debug_implementations)]
+#[derive(Clone, Copy)]
+pub struct MigrationName<'a> {
+    /// Wraps around a migration
+    pub migration: &'a Migration,
+}
+
+/// Get the name of a migration
+pub fn name(migration: &Migration) -> MigrationName {
+    MigrationName {
+        migration: migration,
+    }
+}
+
+impl<'a> fmt::Display for MigrationName<'a> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let file_name = self.migration
+            .file_path()
+            .and_then(|file_path| file_path.file_name())
+            .and_then(|file| file.to_str());
+        if let Some(name) = file_name {
+            f.write_str(name)?;
+        } else {
+            f.write_str(self.migration.version())?;
+        }
+        Ok(())
+    }
+}
+
+impl Migration for Box<Migration> {
+    fn version(&self) -> &str {
+        (&**self).version()
+    }
+
+    fn run(&self, conn: &SimpleConnection) -> Result<(), RunMigrationsError> {
+        (&**self).run(conn)
+    }
+
+    fn revert(&self, conn: &SimpleConnection) -> Result<(), RunMigrationsError> {
+        (&**self).revert(conn)
+    }
+    fn file_path(&self) -> Option<&Path> {
+        (&**self).file_path()
+    }
+}
+
+impl<'a> Migration for &'a Migration {
+    fn version(&self) -> &str {
+        (&**self).version()
+    }
+
+    fn run(&self, conn: &SimpleConnection) -> Result<(), RunMigrationsError> {
+        (&**self).run(conn)
+    }
+
+    fn revert(&self, conn: &SimpleConnection) -> Result<(), RunMigrationsError> {
+        (&**self).revert(conn)
+    }
+    fn file_path(&self) -> Option<&Path> {
+        (&**self).file_path()
+    }
+}

diesel_cli/Cargo.toml

@@ -37,6 +37,7 @@ lint = ["clippy"]
 postgres = ["diesel/postgres", "infer_schema_internals/postgres", "url"]
 sqlite = ["diesel/sqlite", "infer_schema_internals/sqlite"]
 mysql = ["diesel/mysql", "infer_schema_internals/mysql", "url"]
+barrels = ["migrations_internals/barrel", "barrel"]
 
 [[test]]
 name = "tests"

diesel_migrations/migrations_internals/src/lib.rs

@@ -95,11 +95,10 @@ pub use self::migration::*;
 use std::fs::DirEntry;
 use std::io::{stdout, Write};
 
-use diesel::migration::errors::*;
+use diesel::migration::*;
 use diesel::expression_methods::*;
 use diesel::{Connection, QueryDsl, QueryResult, RunQueryDsl};
 use self::schema::__diesel_schema_migrations::dsl::*;
-use self::migration::Migration;
 
 use std::env;
 use std::path::{Path, PathBuf};

diesel_migrations/migrations_internals/src/migration.rs

@@ -1,52 +1,12 @@
 use diesel::connection::SimpleConnection;
-use diesel::migration::errors::*;
+use diesel::migration::*;
 
 use std::path::{Path, PathBuf};
-use std::fmt;
-
-pub trait Migration {
-    fn version(&self) -> &str;
-    fn run(&self, conn: &SimpleConnection) -> Result<(), RunMigrationsError>;
-    fn revert(&self, conn: &SimpleConnection) -> Result<(), RunMigrationsError>;
-    fn file_path(&self) -> Option<&Path> {
-        None
-    }
-}
-
-#[allow(missing_debug_implementations)]
-#[derive(Clone, Copy)]
-pub struct MigrationName<'a> {
-    pub migration: &'a Migration,
-}
-
-pub fn name(migration: &Migration) -> MigrationName {
-    MigrationName {
-        migration: migration,
-    }
-}
-
-impl<'a> fmt::Display for MigrationName<'a> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let file_name = self.migration
-            .file_path()
-            .and_then(|file_path| file_path.file_name())
-            .and_then(|file| file.to_str());
-        if let Some(name) = file_name {
-            f.write_str(name)?;
-        } else {
-            f.write_str(self.migration.version())?;
-        }
-        Ok(())
-    }
-}
 
 pub fn migration_from(path: PathBuf) -> Result<Box<Migration>, MigrationError> {
     #[cfg(feature = "barrel")]
     match ::barrel::diesel::migration_from(&path) {
-        Some(sql) => {
-            let version = try!(version_from_path(&path));
-            return barrel_to_migration(path, version, sql);
-        }
+        Some(migration) => return Ok(migration),
         None => {}
     }
 
@@ -58,74 +18,6 @@ pub fn migration_from(path: PathBuf) -> Result<Box<Migration>, MigrationError> {
     }
 }
 
-#[cfg(feature = "barrel")]
-struct BarrelMigration(PathBuf, String, String, String);
-
-#[cfg(feature = "barrel")]
-impl Migration for BarrelMigration {
-    fn file_path(&self) -> Option<&Path> {
-        Some(self.0.as_path())
-    }
-
-    fn version(&self) -> &str {
-        &self.1
-    }
-
-    fn run(&self, conn: &SimpleConnection) -> Result<(), RunMigrationsError> {
-        try!(conn.batch_execute(&self.2));
-        Ok(())
-    }
-
-    fn revert(&self, conn: &SimpleConnection) -> Result<(), RunMigrationsError> {
-        try!(conn.batch_execute(&self.3));
-        Ok(())
-    }
-}
-
-#[cfg(feature = "barrel")]
-fn barrel_to_migration(
-    path: PathBuf,
-    version: String,
-    sql: (String, String),
-) -> Result<Box<Migration>, MigrationError> {
-    Ok(Box::new(BarrelMigration(path, version, sql.0, sql.1)))
-}
-
-
-impl Migration for Box<Migration> {
-    fn version(&self) -> &str {
-        (&**self).version()
-    }
-
-    fn run(&self, conn: &SimpleConnection) -> Result<(), RunMigrationsError> {
-        (&**self).run(conn)
-    }
-
-    fn revert(&self, conn: &SimpleConnection) -> Result<(), RunMigrationsError> {
-        (&**self).revert(conn)
-    }
-    fn file_path(&self) -> Option<&Path> {
-        (&**self).file_path()
-    }
-}
-
-impl<'a> Migration for &'a Migration {
-    fn version(&self) -> &str {
-        (&**self).version()
-    }
-
-    fn run(&self, conn: &SimpleConnection) -> Result<(), RunMigrationsError> {
-        (&**self).run(conn)
-    }
-
-    fn revert(&self, conn: &SimpleConnection) -> Result<(), RunMigrationsError> {
-        (&**self).revert(conn)
-    }
-    fn file_path(&self) -> Option<&Path> {
-        (&**self).file_path()
-    }
-}
-
 fn valid_sql_migration_directory(path: &Path) -> bool {
     file_names(path)
         .map(|files| files.contains(&"down.sql".into()) && files.contains(&"up.sql".into()))

diesel_migrations/src/lib.rs

@@ -78,10 +78,6 @@ extern crate migrations_macros;
 #[doc(hidden)]
 pub use migrations_macros::*;
 #[doc(inline)]
-pub use migrations_internals::migration::Migration;
-#[doc(inline)]
-pub use migrations_internals::MigrationName;
-#[doc(inline)]
 pub use migrations_internals::MigrationConnection;
 // #[doc(inline)]
 // pub use migrations_internals::MigrationError;
@@ -117,8 +113,8 @@ pub use migrations_internals::find_migrations_directory;
 pub use migrations_internals::search_for_migrations_directory;
 #[doc(inline)]
 pub use migrations_internals::version_from_path;
-#[doc(inline)]
-pub use migrations_internals::name;
+// #[doc(inline)]
+// pub use migrations_internals::name;
 
 pub mod connection {
     #[doc(inline)]