Merge AppliedMigration with Migration

.circleci/config.yml

@@ -49,7 +49,7 @@ jobs:
       - run: rustup component add clippy
       - run: rustup component add rustfmt
       - run: cargo fmt --all -- --check
-      - run: cd refinery_core && cargo test
+      - run: cd refinery_core && cargo test --all-features
       - run: cd refinery && cargo build --all-features
       - run: cd refinery_macros && cargo clippy
       - run: cd refinery_cli && cargo clippy

.travis.yml

@@ -9,4 +9,4 @@ jobs:
       - stage: windows nightly
         rust: nightly
 script:
-  - cd refinery_core && cargo test --lib
+  - cd refinery_core && cargo test --lib --all-features

refinery/src/lib.rs

@@ -34,6 +34,6 @@ for more examples refer to the [examples](https://github.com/rust-db/refinery/tr
 
 pub use refinery_core::config;
 #[doc(hidden)]
-pub use refinery_core::{AppliedMigration, AsyncMigrate, Migrate};
+pub use refinery_core::{AsyncMigrate, Migrate};
 pub use refinery_core::{Error, Migration, Runner, Target};
 pub use refinery_macros::{embed_migrations, include_migration_mods};

refinery/tests/mysql.rs

@@ -30,31 +30,31 @@ mod mysql {
     }
 
     fn get_migrations() -> Vec<Migration> {
-        let migration1 = Migration::from_filename(
+        let migration1 = Migration::unapplied(
             "V1__initial.sql",
             include_str!("./sql_migrations/V1-2/V1__initial.sql"),
         )
         .unwrap();
 
-        let migration2 = Migration::from_filename(
+        let migration2 = Migration::unapplied(
             "V2__add_cars_and_motos_table.sql",
             include_str!("./sql_migrations/V1-2/V2__add_cars_and_motos_table.sql"),
         )
         .unwrap();
 
-        let migration3 = Migration::from_filename(
+        let migration3 = Migration::unapplied(
             "V3__add_brand_to_cars_table",
             include_str!("./sql_migrations/V3/V3__add_brand_to_cars_table.sql"),
         )
         .unwrap();
 
-        let migration4 = Migration::from_filename(
+        let migration4 = Migration::unapplied(
             "V4__add_year_to_motos_table.sql",
             include_str!("./sql_migrations/V4__add_year_to_motos_table.sql"),
         )
         .unwrap();
 
-        let migration5 = Migration::from_filename(
+        let migration5 = Migration::unapplied(
             "V5__add_year_field_to_cars",
             &"ALTER TABLE cars ADD year INTEGER;",
         )
@@ -184,8 +184,8 @@ mod mysql {
             embedded::migrations::runner().run(&mut conn).unwrap();
             let current = conn.get_last_applied_migration().unwrap().unwrap();
 
-            assert_eq!(4, current.version);
-            assert_eq!(Local::today(), current.applied_on.date());
+            assert_eq!(4, current.version());
+            assert_eq!(Local::today(), current.applied_on().unwrap().date());
         });
     }
 
@@ -204,8 +204,8 @@ mod mysql {
             embedded::migrations::runner().run(&mut conn).unwrap();
             let current = conn.get_last_applied_migration().unwrap().unwrap();
 
-            assert_eq!(4, current.version);
-            assert_eq!(Local::today(), current.applied_on.date());
+            assert_eq!(4, current.version());
+            assert_eq!(Local::today(), current.applied_on().unwrap().date());
         });
     }
 
@@ -222,7 +222,7 @@ mod mysql {
 
             let current = conn.get_last_applied_migration().unwrap().unwrap();
 
-            assert_eq!(2, current.version);
+            assert_eq!(2, current.version());
         });
     }
 
@@ -302,8 +302,8 @@ mod mysql {
 
             let current = conn.get_last_applied_migration().unwrap().unwrap();
 
-            assert_eq!(4, current.version);
-            assert_eq!(Local::today(), current.applied_on.date());
+            assert_eq!(4, current.version());
+            assert_eq!(Local::today(), current.applied_on().unwrap().date());
         });
     }
 
@@ -316,23 +316,24 @@ mod mysql {
 
             embedded::migrations::runner().run(&mut conn).unwrap();
 
-            let migrations = conn.get_applied_migrations().unwrap();
-            assert_eq!(4, migrations.len());
-
-            assert_eq!(1, migrations[0].version);
-            assert_eq!(2, migrations[1].version);
-            assert_eq!(3, migrations[2].version);
-            assert_eq!(4, migrations[3].version);
-
-            assert_eq!("initial", migrations[0].name);
-            assert_eq!("add_cars_and_motos_table", migrations[1].name);
-            assert_eq!("add_brand_to_cars_table", migrations[2].name);
-            assert_eq!("add_year_to_motos_table", migrations[3].name);
-
-            assert_eq!("2959965718684201605", migrations[0].checksum);
-            assert_eq!("15750824261375377119", migrations[1].checksum);
-            assert_eq!("5789498757482767533", migrations[2].checksum);
-            assert_eq!("2544180288160291571", migrations[3].checksum)
+            let migrations = get_migrations();
+            let applied_migrations = conn.get_applied_migrations().unwrap();
+            assert_eq!(4, applied_migrations.len());
+
+            assert_eq!(migrations[0].version(), applied_migrations[0].version());
+            assert_eq!(migrations[1].version(), applied_migrations[1].version());
+            assert_eq!(migrations[2].version(), applied_migrations[2].version());
+            assert_eq!(migrations[3].version(), applied_migrations[3].version());
+
+            assert_eq!(migrations[0].name(), migrations[0].name());
+            assert_eq!(migrations[1].name(), applied_migrations[1].name());
+            assert_eq!(migrations[2].name(), applied_migrations[2].name());
+            assert_eq!(migrations[3].name(), applied_migrations[3].name());
+
+            assert_eq!(migrations[0].checksum(), applied_migrations[0].checksum());
+            assert_eq!(migrations[1].checksum(), applied_migrations[1].checksum());
+            assert_eq!(migrations[2].checksum(), applied_migrations[2].checksum());
+            assert_eq!(migrations[3].checksum(), applied_migrations[3].checksum());
         });
     }
 
@@ -352,8 +353,8 @@ mod mysql {
 
             let current = conn.get_last_applied_migration().unwrap().unwrap();
 
-            assert_eq!(5, current.version);
-            assert_eq!(mchecksum.to_string(), current.checksum);
+            assert_eq!(5, current.version());
+            assert_eq!(mchecksum, current.checksum());
         });
     }
 
@@ -371,7 +372,7 @@ mod mysql {
 
             let current = conn.get_last_applied_migration().unwrap().unwrap();
 
-            assert_eq!(3, current.version);
+            assert_eq!(3, current.version());
         });
     }
 
@@ -390,7 +391,7 @@ mod mysql {
 
             let current = conn.get_last_applied_migration().unwrap().unwrap();
 
-            assert_eq!(3, current.version);
+            assert_eq!(3, current.version());
         });
     }
 
@@ -403,7 +404,7 @@ mod mysql {
 
             mod_migrations::runner().run(&mut conn).unwrap();
 
-            let migration = Migration::from_filename(
+            let migration = Migration::unapplied(
                 "V4__add_year_field_to_cars",
                 &"ALTER TABLE cars ADD year INTEGER;",
             )
@@ -414,8 +415,8 @@ mod mysql {
 
             match err {
                 Error::MissingVersion(missing) => {
-                    assert_eq!(1, missing.version);
-                    assert_eq!("initial", missing.name);
+                    assert_eq!(1, missing.version());
+                    assert_eq!("initial", missing.name());
                 }
                 _ => panic!("failed test"),
             }
@@ -431,7 +432,7 @@ mod mysql {
 
             mod_migrations::runner().run(&mut conn).unwrap();
 
-            let migration = Migration::from_filename(
+            let migration = Migration::unapplied(
                 "V2__add_year_field_to_cars",
                 &"ALTER TABLE cars ADD year INTEGER;",
             )
@@ -443,8 +444,8 @@ mod mysql {
             match err {
                 Error::DivergentVersion(applied, divergent) => {
                     assert_eq!(migration, divergent);
-                    assert_eq!(2, applied.version);
-                    assert_eq!("add_cars_table", applied.name);
+                    assert_eq!(2, applied.version());
+                    assert_eq!("add_cars_table", applied.name());
                 }
                 _ => panic!("failed test"),
             }
@@ -460,7 +461,7 @@ mod mysql {
 
             missing::migrations::runner().run(&mut conn).unwrap();
 
-            let migration1 = Migration::from_filename(
+            let migration1 = Migration::unapplied(
                 "V1__initial",
                 concat!(
                     "CREATE TABLE persons (",
@@ -472,7 +473,7 @@ mod mysql {
             )
             .unwrap();
 
-            let migration2 = Migration::from_filename(
+            let migration2 = Migration::unapplied(
                 "V2__add_cars_table",
                 include_str!("./sql_migrations_missing/V2__add_cars_table.sql"),
             )
@@ -482,8 +483,8 @@ mod mysql {
                 .unwrap_err();
             match err {
                 Error::MissingVersion(missing) => {
-                    assert_eq!(1, missing.version);
-                    assert_eq!("initial", missing.name);
+                    assert_eq!(1, missing.version());
+                    assert_eq!("initial", missing.name());
                 }
                 _ => panic!("failed test"),
             }