Replace tiberius with mssql (maintained fork with security fixes)

README.md

@@ -23,8 +23,8 @@ Powerful SQL migration toolkit for Rust.
 Refinery strives to make running migrations for different databases as easy as possible.
 It works by running your migrations on a provided database connection, either by embedding them on your Rust code, or via the [refinery_cli].
 
-Currently [`postgres`](https://crates.io/crates/postgres), [`tokio-postgres`](https://crates.io/crates/tokio-postgres) , [`mysql`](https://crates.io/crates/mysql), [`mysql_async`](https://crates.io/crates/mysql_async), [`rusqlite`](https://crates.io/crates/rusqlite) and [`tiberius`](https://github.com/prisma/tiberius) are supported.
-If you are using a driver that is not yet supported, namely [`SQLx`](https://github.com/launchbadge/sqlx) you can run migrations providing a [`Config`](https://docs.rs/refinery/latest/refinery/config/struct.Config.html) instead of the connection type, as `Config` impl's `Migrate`. You will still need to provide the `postgres`/`mysql`/`rusqlite`/`tiberius` driver as a feature for [`Runner::run`](https://docs.rs/refinery/latest/refinery/struct.Runner.html#method.run) and `tokio-postgres`/`mysql_async` for [`Runner::run_async`](https://docs.rs/refinery/latest/refinery/struct.Runner.html#method.run_async).
+Currently [`postgres`](https://crates.io/crates/postgres), [`tokio-postgres`](https://crates.io/crates/tokio-postgres) , [`mysql`](https://crates.io/crates/mysql), [`mysql_async`](https://crates.io/crates/mysql_async), [`rusqlite`](https://crates.io/crates/rusqlite) and [`mssql`](https://github.com/mssql-rust/mssql-rust) (a maintained fork of [`tiberius`](https://github.com/prisma/tiberius)) are supported.
+If you are using a driver that is not yet supported, namely [`SQLx`](https://github.com/launchbadge/sqlx) you can run migrations providing a [`Config`](https://docs.rs/refinery/latest/refinery/config/struct.Config.html) instead of the connection type, as `Config` impl's `Migrate`. You will still need to provide the `postgres`/`mysql`/`rusqlite`/`mssql` driver as a feature for [`Runner::run`](https://docs.rs/refinery/latest/refinery/struct.Runner.html#method.run) and `tokio-postgres`/`mysql_async` for [`Runner::run_async`](https://docs.rs/refinery/latest/refinery/struct.Runner.html#method.run_async).
 `refinery` works best with [`Barrel`](https://crates.io/crates/barrel) but you can also have your migrations in `.sql` files or use any other Rust crate for schema generation.
 
 ## Usage

refinery/Cargo.toml

@@ -23,8 +23,8 @@ tokio-postgres-tls = ["tokio-postgres", "refinery-core/tokio-postgres-tls"]
 tokio-postgres = ["refinery-core/tokio-postgres"]
 tokio-postgres-rustls = ["tokio-postgres", "refinery-core/tokio-postgres-rustls"]
 mysql_async = ["refinery-core/mysql_async", "config"]
-tiberius = ["refinery-core/tiberius", "config"]
-tiberius-config = ["refinery-core/tiberius", "refinery-core/tiberius-config", "config"]
+mssql = ["refinery-core/mssql", "config"]
+mssql-config = ["refinery-core/mssql", "refinery-core/mssql-config", "config"]
 serde = ["refinery-core/serde"]
 toml = ["refinery-core/toml"]
 enums = ["refinery-macros/enums"]

refinery/tests/tiberius.rs → refinery/tests/mssql.rs

@@ -1,14 +1,14 @@
 use barrel::backend::MsSql as Sql;
 
-#[cfg(feature = "tiberius-config")]
-mod tiberius {
+#[cfg(feature = "mssql-config")]
+mod mssql_tests {
     use assert_cmd::prelude::*;
     use futures::FutureExt;
     use predicates::str::contains;
     use refinery::{
         config::Config, embed_migrations, error::Kind, AsyncMigrate, Migration, Runner, Target,
     };
-    use refinery_core::tiberius::{self, Config as TConfig};
+    use refinery_core::mssql::{self, Config as TConfig};
     use std::convert::TryInto;
     use std::panic::AssertUnwindSafe;
     use std::process::Command;
@@ -79,7 +79,7 @@ mod tiberius {
         .unwrap();
         let mut tconfig: TConfig = (&config).try_into().unwrap();
         tconfig.trust_cert();
-        let mut client = tiberius::Client::connect(tconfig, tcp.compat_write())
+        let mut client = mssql::Client::connect(tconfig, tcp.compat_write())
             .await
             .unwrap();
 
@@ -116,7 +116,7 @@ mod tiberius {
             .unwrap();
             let mut tconfig: TConfig = (&config).try_into().unwrap();
             tconfig.trust_cert();
-            let mut client = tiberius::Client::connect(tconfig, tcp.compat_write())
+            let mut client = mssql::Client::connect(tconfig, tcp.compat_write())
                 .await
                 .unwrap();
 
@@ -167,7 +167,7 @@ mod tiberius {
             .unwrap();
             let mut tconfig: TConfig = (&config).try_into().unwrap();
             tconfig.trust_cert();
-            let mut client = tiberius::Client::connect(tconfig, tcp.compat_write())
+            let mut client = mssql::Client::connect(tconfig, tcp.compat_write())
                 .await
                 .unwrap();
 
@@ -219,7 +219,7 @@ mod tiberius {
             .unwrap();
             let mut tconfig: TConfig = (&config).try_into().unwrap();
             tconfig.trust_cert();
-            let mut client = tiberius::Client::connect(tconfig, tcp.compat_write())
+            let mut client = mssql::Client::connect(tconfig, tcp.compat_write())
                 .await
                 .unwrap();
 
@@ -281,7 +281,7 @@ mod tiberius {
             .unwrap();
             let mut tconfig: TConfig = (&config).try_into().unwrap();
             tconfig.trust_cert();
-            let mut client = tiberius::Client::connect(tconfig, tcp.compat_write())
+            let mut client = mssql::Client::connect(tconfig, tcp.compat_write())
                 .await
                 .unwrap();
 
@@ -321,7 +321,7 @@ mod tiberius {
             .unwrap();
             let mut tconfig: TConfig = (&config).try_into().unwrap();
             tconfig.trust_cert();
-            let mut client = tiberius::Client::connect(tconfig, tcp.compat_write())
+            let mut client = mssql::Client::connect(tconfig, tcp.compat_write())
                 .await
                 .unwrap();
 
@@ -362,7 +362,7 @@ mod tiberius {
             .unwrap();
             let mut tconfig: TConfig = (&config).try_into().unwrap();
             tconfig.trust_cert();
-            let mut client = tiberius::Client::connect(tconfig, tcp.compat_write())
+            let mut client = mssql::Client::connect(tconfig, tcp.compat_write())
                 .await
                 .unwrap();
 
@@ -408,7 +408,7 @@ mod tiberius {
             .unwrap();
             let mut tconfig: TConfig = (&config).try_into().unwrap();
             tconfig.trust_cert();
-            let mut client = tiberius::Client::connect(tconfig, tcp.compat_write())
+            let mut client = mssql::Client::connect(tconfig, tcp.compat_write())
                 .await
                 .unwrap();
 
@@ -454,7 +454,7 @@ mod tiberius {
             .unwrap();
             let mut tconfig: TConfig = (&config).try_into().unwrap();
             tconfig.trust_cert();
-            let mut client = tiberius::Client::connect(tconfig, tcp.compat_write())
+            let mut client = mssql::Client::connect(tconfig, tcp.compat_write())
                 .await
                 .unwrap();
 
@@ -501,7 +501,7 @@ mod tiberius {
             .unwrap();
             let mut tconfig: TConfig = (&config).try_into().unwrap();
             tconfig.trust_cert();
-            let mut client = tiberius::Client::connect(tconfig, tcp.compat_write())
+            let mut client = mssql::Client::connect(tconfig, tcp.compat_write())
                 .await
                 .unwrap();
 
@@ -550,7 +550,7 @@ mod tiberius {
             .unwrap();
             let mut tconfig: TConfig = (&config).try_into().unwrap();
             tconfig.trust_cert();
-            let mut client = tiberius::Client::connect(tconfig, tcp.compat_write())
+            let mut client = mssql::Client::connect(tconfig, tcp.compat_write())
                 .await
                 .unwrap();
 
@@ -587,7 +587,7 @@ mod tiberius {
             .unwrap();
             let mut tconfig: TConfig = (&config).try_into().unwrap();
             tconfig.trust_cert();
-            let mut client = tiberius::Client::connect(tconfig, tcp.compat_write())
+            let mut client = mssql::Client::connect(tconfig, tcp.compat_write())
                 .await
                 .unwrap();
 
@@ -625,7 +625,7 @@ mod tiberius {
             .unwrap();
             let mut tconfig: TConfig = (&config).try_into().unwrap();
             tconfig.trust_cert();
-            let mut client = tiberius::Client::connect(tconfig, tcp.compat_write())
+            let mut client = mssql::Client::connect(tconfig, tcp.compat_write())
                 .await
                 .unwrap();
 
@@ -674,7 +674,7 @@ mod tiberius {
             .unwrap();
             let mut tconfig: TConfig = (&config).try_into().unwrap();
             tconfig.trust_cert();
-            let mut client = tiberius::Client::connect(tconfig, tcp.compat_write())
+            let mut client = mssql::Client::connect(tconfig, tcp.compat_write())
                 .await
                 .unwrap();
 
@@ -720,7 +720,7 @@ mod tiberius {
             .unwrap();
             let mut tconfig: TConfig = (&config).try_into().unwrap();
             tconfig.trust_cert();
-            let mut client = tiberius::Client::connect(tconfig, tcp.compat_write())
+            let mut client = mssql::Client::connect(tconfig, tcp.compat_write())
                 .await
                 .unwrap();
 
@@ -872,7 +872,7 @@ mod tiberius {
             .unwrap();
             let mut tconfig: TConfig = (&config).try_into().unwrap();
             tconfig.trust_cert();
-            let mut client = tiberius::Client::connect(tconfig, tcp.compat_write())
+            let mut client = mssql::Client::connect(tconfig, tcp.compat_write())
                 .await
                 .unwrap();
 
@@ -923,7 +923,7 @@ mod tiberius {
             .unwrap();
             let mut tconfig: TConfig = (&config).try_into().unwrap();
             tconfig.trust_cert();
-            let mut client = tiberius::Client::connect(tconfig, tcp.compat_write())
+            let mut client = mssql::Client::connect(tconfig, tcp.compat_write())
                 .await
                 .unwrap();
 
@@ -975,7 +975,7 @@ mod tiberius {
             .unwrap();
             let mut tconfig: TConfig = (&config).try_into().unwrap();
             tconfig.trust_cert();
-            let mut client = tiberius::Client::connect(tconfig, tcp.compat_write())
+            let mut client = mssql::Client::connect(tconfig, tcp.compat_write())
                 .await
                 .unwrap();
 
@@ -1029,7 +1029,7 @@ mod tiberius {
             .unwrap();
             let mut tconfig: TConfig = (&config).try_into().unwrap();
             tconfig.trust_cert();
-            let mut client = tiberius::Client::connect(tconfig, tcp.compat_write())
+            let mut client = mssql::Client::connect(tconfig, tcp.compat_write())
                 .await
                 .unwrap();
 
@@ -1077,7 +1077,7 @@ mod tiberius {
                 .args([
                     "migrate",
                     "-c",
-                    "tests/tiberius_refinery.toml",
+                    "tests/mssql_refinery.toml",
                     "-p",
                     "tests/migrations",
                 ])

refinery_cli/Cargo.toml

@@ -20,7 +20,7 @@ postgresql = ["refinery-core/postgres-tls"]
 mysql = ["refinery-core/mysql"]
 sqlite = ["refinery-core/rusqlite"]
 sqlite-bundled = ["sqlite", "refinery-core/rusqlite-bundled"]
-mssql = ["refinery-core/tiberius-config", "tokio"]
+mssql = ["refinery-core/mssql-config", "tokio"]
 int8-versions = ["refinery-core/int8-versions"]
 
 [dependencies]

refinery_cli/src/migrate.rs

@@ -62,7 +62,7 @@ fn run_migrations(
     match config.db_type() {
         ConfigDbType::Mssql => {
             cfg_if::cfg_if! {
-                // tiberius is an async driver so we spawn tokio runtime and run the migrations
+                // mssql is an async driver so we spawn tokio runtime and run the migrations
                 if #[cfg(feature = "mssql")] {
                     use tokio::runtime::Builder;
 

refinery_core/Cargo.toml

@@ -17,8 +17,8 @@ postgres-tls = ["postgres", "dep:postgres-native-tls", "tls", "config"]
 rusqlite = ["dep:rusqlite", "config"]
 rusqlite-bundled = ["rusqlite", "rusqlite/bundled", "config"]
 serde = ["dep:serde", "time/serde"]
-tiberius = ["dep:tiberius", "dep:futures", "dep:tokio", "tokio/net"]
-tiberius-config = ["tiberius", "dep:tokio-util", "dep:serde", "config"]
+mssql = ["dep:mssql", "dep:futures", "dep:tokio", "tokio/net"]
+mssql-config = ["mssql", "dep:tokio-util", "dep:serde", "config"]
 tls = ["dep:native-tls"]
 tokio-postgres = ["dep:tokio-postgres", "dep:tokio", "tokio/rt"]
 tokio-postgres-tls = ["tokio-postgres", "postgres-tls", "config"]
@@ -44,7 +44,7 @@ postgres-native-tls = { version = "0.5", optional = true }
 tokio-postgres = { version = ">= 0.5, <= 0.7", optional = true }
 mysql = { version = ">= 21.0.0, <= 28", optional = true, default-features = false, features = ["minimal"] }
 mysql_async = { version = ">= 0.28, <= 0.37", optional = true, default-features = false, features = ["minimal"] }
-tiberius = { version = ">= 0.7, <= 0.12", optional = true, default-features = false }
+mssql = { version = ">= 1.0, < 2.0", optional = true, default-features = false }
 tokio = { version = "1.0", optional = true }
 futures = { version = "0.3.16", optional = true, features = ["async-await"] }
 tokio-util = { version = "0.7.7", features = ["compat"], optional = true }