remove mssql completely, fix doc

rwf2 · Aug 14, 2023 · f96d120 · f96d120
1 parent 6909a2c
commit f96d120
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/contrib/db_pools/lib/src/config.rs b/contrib/db_pools/lib/src/config.rs
@@ -37,6 +37,9 @@ use std::path::PathBuf;
 ///             max_connections: 1024,
 ///             connect_timeout: 3,
 ///             idle_timeout: None,
+///             ssl_root_cert: None,
+///             ssl_client_cert: None,
+///             ssl_client_key: None
 ///         }));
 ///
 ///     rocket::custom(figment)

diff --git a/contrib/db_pools/lib/src/lib.rs b/contrib/db_pools/lib/src/lib.rs
@@ -113,14 +113,13 @@
 //! On shutdown, new connections are denied. Shutdown _does not_ wait for
 //! connections to be returned.
 //!
-//! ## `sqlx` (v0.6)
+//! ## `sqlx` (v0.7)
 //!
 //! | Database | Feature         | [`Pool`] Type        | [`Connection`] Deref                     |
 //! |----------|-----------------|----------------------|------------------------------------------|
 //! | Postgres | `sqlx_postgres` | [`sqlx::PgPool`]     | [`sqlx::pool::PoolConnection<Postgres>`] |
 //! | MySQL    | `sqlx_mysql`    | [`sqlx::MySqlPool`]  | [`sqlx::pool::PoolConnection<MySql>`]    |
 //! | SQLite   | `sqlx_sqlite`   | [`sqlx::SqlitePool`] | [`sqlx::pool::PoolConnection<Sqlite>`]   |
-//! | MSSQL    | `sqlx_mssql`    | [`sqlx::MssqlPool`]  | [`sqlx::pool::PoolConnection<Mssql>`]    |
 //!
 //! [`sqlx::PgPool`]: https://docs.rs/sqlx/0.6/sqlx/type.PgPool.html
 //! [`sqlx::MySqlPool`]: https://docs.rs/sqlx/0.6/sqlx/type.MySqlPool.html
@@ -234,7 +233,6 @@
 #![doc(html_root_url = "https://api.rocket.rs/master/rocket_db_pools")]
 #![doc(html_favicon_url = "https://rocket.rs/images/favicon.ico")]
 #![doc(html_logo_url = "https://rocket.rs/images/logo-boxed.png")]
-
 #![deny(missing_docs)]
 
 pub use rocket;
@@ -243,20 +241,25 @@ pub use rocket;
 #[doc(inline)]
 pub use rocket::figment;
 
-#[cfg(any(feature = "diesel_postgres", feature = "diesel_mysql"))] pub mod diesel;
-#[cfg(feature = "deadpool_postgres")] pub use deadpool_postgres;
-#[cfg(feature = "deadpool_redis")] pub use deadpool_redis;
-#[cfg(feature = "mongodb")] pub use mongodb;
-#[cfg(feature = "sqlx")] pub use sqlx;
+#[cfg(any(feature = "diesel_postgres", feature = "diesel_mysql"))]
+pub mod diesel;
+#[cfg(feature = "deadpool_postgres")]
+pub use deadpool_postgres;
+#[cfg(feature = "deadpool_redis")]
+pub use deadpool_redis;
+#[cfg(feature = "mongodb")]
+pub use mongodb;
+#[cfg(feature = "sqlx")]
+pub use sqlx;
 
+mod config;
 mod database;
 mod error;
 mod pool;
-mod config;
 
+pub use self::config::Config;
 pub use self::database::{Connection, Database, Initializer};
 pub use self::error::Error;
 pub use self::pool::Pool;
-pub use self::config::Config;
 
 pub use rocket_db_pools_codegen::*;
diff --git a/scripts/test.sh b/scripts/test.sh
@@ -80,7 +80,6 @@ function test_contrib() {
     sqlx_mysql
     sqlx_postgres
     sqlx_sqlite
-    sqlx_mssql
     mongodb
     diesel_mysql
     diesel_postgres