Merge branch 'main' into use_tls

Author: jxs

.github/workflows/ci.yml

@@ -174,16 +174,12 @@ jobs:
     strategy:
       matrix: 
         rust: ${{ fromJson(needs.set-rust-versions.outputs.versions) }}
-    services:
-      mssql:
-        image: mcr.microsoft.com/mssql/server:2017-latest
-        ports:
-          - 1433:1433
-        env:
-          ACCEPT_EULA: yes
-          SA_PASSWORD: Passw0rd
     steps:
       - uses: actions/checkout@v2
+      - uses: potatoqualitee/[email protected]
+        with:
+          install: sqlengine, sqlpackage
+          sa-password: Passw0rd
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: ${{ matrix.rust }}

README.md

@@ -74,6 +74,13 @@ let client = conn.deref_mut().deref_mut();
 let report = embedded::migrations::runner().run_async(client).await?;
 ```
 
+### Example: bb8
+
+```rust
+let mut client = pool.dedicated_connection().await?;
+let report = embedded::migrations::runner().run_async(&mut client).await?;
+```
+
 ### Non-contiguous VS Contiguous migrations
 
 Depending on how your project/team has been structured will define whether you want to use contiguous (adjacent) migrations `V{1}__{2}.[sql|rs]` or non-contiguous (not adjacent) migrations `U{1}__{2}.[sql|rs]`.

refinery_core/Cargo.toml

@@ -29,13 +29,13 @@ url = "2.0"
 walkdir = "2.3.1"
 
 # allow multiple versions of the same dependency if API is similar
-rusqlite = { version = ">= 0.23, <= 0.32", optional = true }
+rusqlite = { version = ">= 0.23, <= 0.33", optional = true }
 postgres = { version = ">=0.17, <= 0.19", optional = true }
 native-tls = { version = "0.2", optional = true }
 postgres-native-tls = { version = "0.5", optional = true}
 tokio-postgres = { version = ">= 0.5, <= 0.7", optional = true }
 mysql = { version = ">= 21.0.0, <= 25", optional = true, default-features = false, features = ["minimal"] }
-mysql_async = { version = ">= 0.28, <= 0.34", optional = true, default-features = false, features = ["minimal"] }
+mysql_async = { version = ">= 0.28, <= 0.35", optional = true, default-features = false, features = ["minimal"] }
 tiberius = { version = ">= 0.7, <= 0.12", optional = true, default-features = false }
 tokio = { version = "1.0", optional = true }
 futures = { version = "0.3.16", optional = true, features = ["async-await"] }

refinery_core/src/runner.rs

@@ -204,7 +204,7 @@ pub struct Report {
 
 impl Report {
     /// Instantiate a new Report
-    pub(crate) fn new(applied_migrations: Vec<Migration>) -> Report {
+    pub fn new(applied_migrations: Vec<Migration>) -> Report {
         Report { applied_migrations }
     }
 

refinery_core/src/traits/async.rs

@@ -132,15 +132,20 @@ where
         ASSERT_MIGRATIONS_TABLE_QUERY.replace("%MIGRATION_TABLE_NAME%", migration_table_name)
     }
 
+    fn get_last_applied_migration_query(migration_table_name: &str) -> String {
+        GET_LAST_APPLIED_MIGRATION_QUERY.replace("%MIGRATION_TABLE_NAME%", migration_table_name)
+    }
+
+    fn get_applied_migrations_query(migration_table_name: &str) -> String {
+        GET_APPLIED_MIGRATIONS_QUERY.replace("%MIGRATION_TABLE_NAME%", migration_table_name)
+    }
+
     async fn get_last_applied_migration(
         &mut self,
         migration_table_name: &str,
     ) -> Result<Option<Migration>, Error> {
         let mut migrations = self
-            .query(
-                &GET_LAST_APPLIED_MIGRATION_QUERY
-                    .replace("%MIGRATION_TABLE_NAME%", migration_table_name),
-            )
+            .query(Self::get_last_applied_migration_query(migration_table_name).as_str())
             .await
             .migration_err("error getting last applied migration", None)?;
 
@@ -152,10 +157,7 @@ where
         migration_table_name: &str,
     ) -> Result<Vec<Migration>, Error> {
         let migrations = self
-            .query(
-                &GET_APPLIED_MIGRATIONS_QUERY
-                    .replace("%MIGRATION_TABLE_NAME%", migration_table_name),
-            )
+            .query(Self::get_applied_migrations_query(migration_table_name).as_str())
             .await
             .migration_err("error getting applied migrations", None)?;
 
@@ -178,10 +180,7 @@ where
         .migration_err("error asserting migrations table", None)?;
 
         let applied_migrations = self
-            .query(
-                &GET_APPLIED_MIGRATIONS_QUERY
-                    .replace("%MIGRATION_TABLE_NAME%", migration_table_name),
-            )
+            .get_applied_migrations(migration_table_name)
             .await
             .migration_err("error getting current schema version", None)?;
 

refinery_core/src/traits/sync.rs

@@ -92,14 +92,24 @@ pub trait Migrate: Query<Vec<Migration>>
 where
     Self: Sized,
 {
+    // Needed cause some database vendors like Mssql have a non sql standard way of checking the migrations table
+    fn assert_migrations_table_query(migration_table_name: &str) -> String {
+        ASSERT_MIGRATIONS_TABLE_QUERY.replace("%MIGRATION_TABLE_NAME%", migration_table_name)
+    }
+
+    fn get_last_applied_migration_query(migration_table_name: &str) -> String {
+        GET_LAST_APPLIED_MIGRATION_QUERY.replace("%MIGRATION_TABLE_NAME%", migration_table_name)
+    }
+
+    fn get_applied_migrations_query(migration_table_name: &str) -> String {
+        GET_APPLIED_MIGRATIONS_QUERY.replace("%MIGRATION_TABLE_NAME%", migration_table_name)
+    }
+
     fn assert_migrations_table(&mut self, migration_table_name: &str) -> Result<usize, Error> {
         // Needed cause some database vendors like Mssql have a non sql standard way of checking the migrations table,
         // thou on this case it's just to be consistent with the async trait `AsyncMigrate`
         self.execute(
-            [ASSERT_MIGRATIONS_TABLE_QUERY
-                .replace("%MIGRATION_TABLE_NAME%", migration_table_name)
-                .as_str()]
-            .into_iter(),
+            [Self::assert_migrations_table_query(migration_table_name).as_str()].into_iter(),
         )
         .migration_err("error asserting migrations table", None)
     }
@@ -109,10 +119,7 @@ where
         migration_table_name: &str,
     ) -> Result<Option<Migration>, Error> {
         let mut migrations = self
-            .query(
-                &GET_LAST_APPLIED_MIGRATION_QUERY
-                    .replace("%MIGRATION_TABLE_NAME%", migration_table_name),
-            )
+            .query(Self::get_last_applied_migration_query(migration_table_name).as_str())
             .migration_err("error getting last applied migration", None)?;
 
         Ok(migrations.pop())
@@ -123,10 +130,7 @@ where
         migration_table_name: &str,
     ) -> Result<Vec<Migration>, Error> {
         let migrations = self
-            .query(
-                &GET_APPLIED_MIGRATIONS_QUERY
-                    .replace("%MIGRATION_TABLE_NAME%", migration_table_name),
-            )
+            .query(Self::get_applied_migrations_query(migration_table_name).as_str())
             .migration_err("error getting applied migrations", None)?;
 
         Ok(migrations)