Merge branch 'main' into update-msrv

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 }}

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

@@ -96,6 +96,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/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,6 +1,7 @@
 [package]
 name = "refinery"
 version = "0.8.14"
+version = "0.8.16"
 rust-version = "1.83"
 authors = ["Katharina Fey <[email protected]>", "João Oliveira <[email protected]>"]
 license = "MIT"
@@ -27,8 +28,8 @@ toml = ["refinery-core/toml"]
 enums = ["refinery-macros/enums"]
 
 [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

@@ -67,8 +67,6 @@ mod postgres {
     }
 
     fn prep_database() {
-        let uri = db_uri();
-
         let mut client = Client::connect(&db_uri(), NoTls).unwrap();
 
         client

refinery_cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "refinery_cli"
-version = "0.8.14"
+version = "0.8.16"
 authors = ["Katharina Fey <[email protected]>", "João Oliveira <[email protected]>"]
 license = "MIT OR Apache-2.0"
 description = "Provides the CLI for the Refinery crate"
@@ -23,7 +23,7 @@ sqlite-bundled = ["sqlite", "refinery-core/rusqlite-bundled"]
 mssql = ["refinery-core/tiberius-config", "tokio"]
 
 [dependencies]
-refinery-core = { version = "0.8.14", path = "../refinery_core", default-features = false, features = ["toml"]  }
+refinery-core = { version = "0.8.16", path = "../refinery_core", default-features = false, features = ["toml"] }
 clap = { version = "4", features = ["derive"] }
 human-panic = "2"
 toml = "0.8"

refinery_core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "refinery-core"
-version = "0.8.14"
+version = "0.8.16"
 authors = ["Katharina Fey <[email protected]>", "João Oliveira <[email protected]>"]
 description = "This crate should not be used directly, it is internally related to Refinery"
 license = "MIT OR Apache-2.0"
@@ -24,16 +24,16 @@ cfg-if = "1.0"
 log = "0.4"
 regex = "1"
 siphasher = "1.0"
-thiserror = "1"
+thiserror = "2"
 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.34", optional = true }
 postgres = { version = ">=0.17, <= 0.19", 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 = { version = ">= 21.0.0, <= 26", 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/drivers/config.rs

@@ -18,10 +18,7 @@ use std::convert::Infallible;
 impl Transaction for Config {
     type Error = Infallible;
 
-    fn execute<'a, T: Iterator<Item = &'a str>>(
-        &mut self,
-        _queries: T,
-    ) -> Result<usize, Self::Error> {
+    fn execute(&mut self, _queries: &[&str]) -> Result<usize, Self::Error> {
         Ok(0)
     }
 }
@@ -36,10 +33,7 @@ impl Query<Vec<Migration>> for Config {
 impl AsyncTransaction for Config {
     type Error = Infallible;
 
-    async fn execute<'a, T: Iterator<Item = &'a str> + Send>(
-        &mut self,
-        _queries: T,
-    ) -> Result<usize, Self::Error> {
+    async fn execute(&mut self, _queries: &[&str]) -> Result<usize, Self::Error> {
         Ok(0)
     }
 }

refinery_core/src/drivers/mysql.rs

@@ -43,13 +43,10 @@ fn query_applied_migrations(
 impl Transaction for Conn {
     type Error = MError;
 
-    fn execute<'a, T: Iterator<Item = &'a str>>(
-        &mut self,
-        queries: T,
-    ) -> Result<usize, Self::Error> {
+    fn execute(&mut self, queries: &[&str]) -> Result<usize, Self::Error> {
         let mut transaction = self.start_transaction(get_tx_opts())?;
         let mut count = 0;
-        for query in queries {
+        for query in queries.iter() {
             transaction.query_iter(query)?;
             count += 1;
         }
@@ -61,14 +58,11 @@ impl Transaction for Conn {
 impl Transaction for PooledConn {
     type Error = MError;
 
-    fn execute<'a, T: Iterator<Item = &'a str>>(
-        &mut self,
-        queries: T,
-    ) -> Result<usize, Self::Error> {
+    fn execute(&mut self, queries: &[&str]) -> Result<usize, Self::Error> {
         let mut transaction = self.start_transaction(get_tx_opts())?;
         let mut count = 0;
 
-        for query in queries {
+        for query in queries.iter() {
             transaction.query_iter(query)?;
             count += 1;
         }

refinery_core/src/drivers/mysql_async.rs

@@ -39,18 +39,15 @@ async fn query_applied_migrations<'a>(
 impl AsyncTransaction for Pool {
     type Error = MError;
 
-    async fn execute<'a, T: Iterator<Item = &'a str> + Send>(
-        &mut self,
-        queries: T,
-    ) -> Result<usize, Self::Error> {
+    async fn execute(&mut self, queries: &[&str]) -> Result<usize, Self::Error> {
         let mut conn = self.get_conn().await?;
         let mut options = TxOpts::new();
         options.with_isolation_level(Some(IsolationLevel::ReadCommitted));
 
         let mut transaction = conn.start_transaction(options).await?;
         let mut count = 0;
         for query in queries {
-            transaction.query_drop(query).await?;
+            transaction.query_drop(*query).await?;
             count += 1;
         }
         transaction.commit().await?;

refinery_core/src/drivers/postgres.rs

@@ -33,13 +33,10 @@ fn query_applied_migrations(
 impl Transaction for PgClient {
     type Error = PgError;
 
-    fn execute<'a, T: Iterator<Item = &'a str>>(
-        &mut self,
-        queries: T,
-    ) -> Result<usize, Self::Error> {
+    fn execute(&mut self, queries: &[&str]) -> Result<usize, Self::Error> {
         let mut transaction = PgClient::transaction(self)?;
         let mut count = 0;
-        for query in queries {
+        for query in queries.iter() {
             PgTransaction::batch_execute(&mut transaction, query)?;
             count += 1;
         }

refinery_core/src/drivers/rusqlite.rs

@@ -32,13 +32,10 @@ fn query_applied_migrations(
 
 impl Transaction for RqlConnection {
     type Error = RqlError;
-    fn execute<'a, T: Iterator<Item = &'a str>>(
-        &mut self,
-        queries: T,
-    ) -> Result<usize, Self::Error> {
+    fn execute(&mut self, queries: &[&str]) -> Result<usize, Self::Error> {
         let transaction = self.transaction()?;
         let mut count = 0;
-        for query in queries {
+        for query in queries.iter() {
             transaction.execute_batch(query)?;
             count += 1;
         }

refinery_core/src/drivers/tiberius.rs

@@ -46,16 +46,13 @@ where
 {
     type Error = Error;
 
-    async fn execute<'a, T: Iterator<Item = &'a str> + Send>(
-        &mut self,
-        queries: T,
-    ) -> Result<usize, Self::Error> {
+    async fn execute(&mut self, queries: &[&str]) -> Result<usize, Self::Error> {
         // Tiberius doesn't support transactions, see https://github.com/prisma/tiberius/issues/28
         self.simple_query("BEGIN TRAN T1;").await?;
         let mut count = 0;
         for query in queries {
             // Drop the returning `QueryStream<'a>` to avoid compiler complaning regarding lifetimes
-            if let Err(err) = self.simple_query(query).await.map(drop) {
+            if let Err(err) = self.simple_query(*query).await.map(drop) {
                 if let Err(err) = self.simple_query("ROLLBACK TRAN T1").await {
                     log::error!("could not ROLLBACK transaction, {}", err);
                 }

refinery_core/src/drivers/tokio_postgres.rs

@@ -35,10 +35,7 @@ async fn query_applied_migrations(
 impl AsyncTransaction for Client {
     type Error = PgError;
 
-    async fn execute<'a, T: Iterator<Item = &'a str> + Send>(
-        &mut self,
-        queries: T,
-    ) -> Result<usize, Self::Error> {
+    async fn execute(&mut self, queries: &[&str]) -> Result<usize, Self::Error> {
         let transaction = self.transaction().await?;
         let mut count = 0;
         for query in queries {

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 }
     }