Merge branch 'main' of github.com:rust-db/refinery into int8-versions

Author: jxs

.github/workflows/ci.yml

@@ -62,7 +62,6 @@ jobs:
       - run: cd refinery_core && cargo test --all-features -- --test-threads 1
       - run: cd refinery && cargo build --all-features
       - run: cd refinery_macros && cargo test --all-features
-      - run: cd refinery_macros && cargo test --features enums enum_fn
       - run: cd refinery_cli && cargo test
 
   test-sqlite:
@@ -176,16 +175,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/mssqlsuite@v1.8
+        with:
+          install: sqlengine, sqlpackage
+          sa-password: Passw0rd
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: ${{ matrix.rust }}

CHANGELOG.md

@@ -4,6 +4,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.8.16] - 2024-02-21
+### Fixed
+- Revert [#346](https://github.com/rust-db/refinery/pull/346) as it breaks Semver, save it for a minor release in the future.
+
+## [0.8.15] - **YANKED** - 2024-02-18 
+
+### Added
+- Make a query overridable. [#358](https://github.com/rust-db/refinery/pull/358)
+- Enable math functions for SQLite. [#335](https://github.com/rust-db/refinery/pull/335)
+- Add serde subfeature to tiberius-config. [#334](https://github.com/rust-db/refinery/pull/334)
+
+### Changed
+- Update `mysql` version to allow `26`, [#365](https://github.com/rust-db/refinery/pull/365)
+- Update `mysql_async` to allow `0.35`, [#359](https://github.com/rust-db/refinery/pull/359)
+- Update `rusqlite` to allow `0.33`, [#361](https://github.com/rust-db/refinery/pull/361)
+- Update migrate Transaction and AsyncTransaction execute functions to avoid double iteration when calling migrate with the grouped option active. [#346](https://github.com/rust-db/refinery/pull/346)
+- Update overall dependencies. [#340](https://github.com/rust-db/refinery/pull/340)
+
+### Fixed
+- Fix misleading CLI arguments descriptions [#336](https://github.com/rust-db/refinery/pull/336)
+
+
 ## [0.8.14] - 2024-04-03
 
 ### Added

Cargo.toml

@@ -7,3 +7,7 @@ members = [
     "refinery_macros",
     "examples",
 ]
+
+[profile.release]
+codegen-units = 1
+lto = true

README.md

@@ -76,6 +76,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]`.
@@ -91,6 +98,7 @@ This would stop developer 1's migration from ever running if you were using cont
 
 refinery works by creating a table that keeps all the applied migrations' versions and their metadata. When you [run](https://docs.rs/refinery/latest/refinery/struct.Runner.html#method.run) the migrations `Runner`, refinery compares the applied migrations with the ones to be applied, checking for [divergent](https://docs.rs/refinery/latest/refinery/struct.Runner.html#method.set_abort_divergent) and [missing](https://docs.rs/refinery/latest/refinery/struct.Runner.html#method.set_abort_missing) and executing unapplied migrations.\
 By default, refinery runs each migration in a single transaction. Alternatively, you can also configure refinery to wrap the entire execution of all migrations in a single transaction by setting [set_grouped](https://docs.rs/refinery/latest/refinery/struct.Runner.html#method.set_grouped) to true.
+The rust crate intentionally ignores new migration files until your sourcecode is rebuild. This prevents accidental migrations and altering the database schema without any code changes. We can also bake the migrations into the binary, so no additional files are needed when deployed.
 
 ### Rollback
 

examples/Cargo.toml

@@ -14,7 +14,7 @@ int8-versions = ["refinery/int8-versions"]
 
 [dependencies]
 refinery = { path = "../refinery", features = ["rusqlite"] }
-rusqlite = "0.31"
+rusqlite = "0.37"
 barrel = { version = "0.7", features = ["sqlite3"] }
 log = "0.4"
 env_logger = "0.11"

examples/src/main.rs

@@ -1,4 +1,3 @@
-use barrel::backend::Sqlite as Sql;
 use log::info;
 use refinery::Migration;
 use rusqlite::Connection;

refinery/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "refinery"
-version = "0.8.14"
-rust-version = "1.75"
+version = "0.8.16"
+rust-version = "1.83"
 authors = ["Katharina Fey <kookie@spacekookie.de>", "João Oliveira <hello@jxs.pt>"]
 license = "MIT"
 description = "Powerful SQL migration toolkit for Rust"
@@ -28,8 +28,8 @@ enums = ["refinery-macros/enums"]
 int8-versions = ["refinery-core/int8-versions", "refinery-macros/int8-versions"]
 
 [dependencies]
-refinery-core = { version = "0.8.14", path = "../refinery_core" }
-refinery-macros = { version = "0.8.14", path = "../refinery_macros" }
+refinery-core = { version = "0.8.16", path = "../refinery_core" }
+refinery-macros = { version = "0.8.16", path = "../refinery_macros" }
 
 [dev-dependencies]
 barrel = { git = "https://github.com/jxs/barrel", features = ["sqlite3", "pg", "mysql", "mssql"] }

refinery/tests/mysql_async.rs

@@ -94,7 +94,7 @@ mod mysql_async {
                 .await
                 .unwrap();
 
-            conn.query(&format!(
+            conn.query(format!(
                 "SELECT table_name FROM information_schema.tables WHERE table_name='{}'",
                 DEFAULT_TABLE_NAME
             ))
@@ -122,7 +122,7 @@ mod mysql_async {
                 .unwrap();
 
             let result = conn
-                .query(&format!(
+                .query(format!(
                     "SELECT table_name FROM information_schema.tables WHERE table_name='{}'",
                     DEFAULT_TABLE_NAME
                 ))

refinery/tests/postgres.rs

@@ -4,6 +4,7 @@ use barrel::backend::Pg as Sql;
 mod postgres {
     use assert_cmd::prelude::*;
     use predicates::str::contains;
+    use refinery::config::ConfigDbType;
     use refinery::{
         config::Config, embed_migrations, error::Kind, Migrate, Migration, Runner, Target,
     };
@@ -73,8 +74,6 @@ mod postgres {
     }
 
     fn prep_database() {
-        let uri = db_uri();
-
         let mut client = Client::connect(&db_uri(), NoTls).unwrap();
 
         client
@@ -774,4 +773,38 @@ mod postgres {
                 .stdout(contains("applying migration: V3__add_brand_to_cars_table"));
         })
     }
+
+    #[test]
+    fn migrates_with_tls_enabled() {
+        run_test(|| {
+            let mut config = Config::new(ConfigDbType::Postgres)
+                .set_db_name("postgres")
+                .set_db_user("postgres")
+                .set_db_host("localhost")
+                .set_db_port("5432")
+                .set_use_tls(true);
+
+            let migrations = get_migrations();
+            let runner = Runner::new(&migrations)
+                .set_grouped(false)
+                .set_abort_divergent(true)
+                .set_abort_missing(true);
+
+            let report = runner.run(&mut config).unwrap();
+
+            let applied_migrations = report.applied_migrations();
+            assert_eq!(5, applied_migrations.len());
+
+            let last_migration = runner
+                .get_last_applied_migration(&mut config)
+                .unwrap()
+                .unwrap();
+
+            assert_eq!(5, last_migration.version());
+            assert_eq!(migrations[4].name(), last_migration.name());
+            assert_eq!(migrations[4].checksum(), last_migration.checksum());
+
+            assert!(config.use_tls());
+        });
+    }
 }

refinery/tests/tokio_postgres.rs

@@ -12,6 +12,7 @@ mod tokio_postgres {
     use refinery_core::tokio_postgres;
     use refinery_core::tokio_postgres::NoTls;
     use std::panic::AssertUnwindSafe;
+    use std::str::FromStr;
     use time::OffsetDateTime;
 
     const DEFAULT_TABLE_NAME: &str = "refinery_schema_history";
@@ -953,4 +954,37 @@ mod tokio_postgres {
         })
         .await;
     }
+
+    #[tokio::test]
+    async fn migrates_with_tls_enabled() {
+        run_test(async {
+            let mut config =
+                Config::from_str("postgres://postgres@localhost:5432/postgres?sslmode=require")
+                    .unwrap();
+
+            let migrations = get_migrations();
+            let runner = Runner::new(&migrations)
+                .set_grouped(false)
+                .set_abort_divergent(true)
+                .set_abort_missing(true);
+
+            let report = runner.run_async(&mut config).await.unwrap();
+
+            let applied_migrations = report.applied_migrations();
+            assert_eq!(5, applied_migrations.len());
+
+            let last_migration = runner
+                .get_last_applied_migration_async(&mut config)
+                .await
+                .unwrap()
+                .unwrap();
+
+            assert_eq!(5, last_migration.version());
+            assert_eq!(migrations[4].name(), last_migration.name());
+            assert_eq!(migrations[4].checksum(), last_migration.checksum());
+
+            assert!(config.use_tls());
+        })
+        .await;
+    }
 }