diff --git a/diesel/Cargo.toml b/diesel/Cargo.toml index 0af700b21133..3f2d231db9f3 100644 --- a/diesel/Cargo.toml +++ b/diesel/Cargo.toml @@ -39,7 +39,7 @@ path = "../diesel_derives" [dev-dependencies] cfg-if = "1" -dotenv = "0.15" +dotenvy = "0.15" ipnetwork = ">=0.12.2, <0.19.0" quickcheck = "1.0.3" diff --git a/diesel/src/doctest_setup.rs b/diesel/src/doctest_setup.rs index a4b96562661d..5eeee426360e 100644 --- a/diesel/src/doctest_setup.rs +++ b/diesel/src/doctest_setup.rs @@ -1,5 +1,5 @@ use diesel::prelude::*; -use dotenv::dotenv; +use dotenvy::dotenv; cfg_if::cfg_if! { if #[cfg(feature = "postgres")] { diff --git a/diesel/src/mysql/connection/mod.rs b/diesel/src/mysql/connection/mod.rs index 2e56f054e216..be5903f49349 100644 --- a/diesel/src/mysql/connection/mod.rs +++ b/diesel/src/mysql/connection/mod.rs @@ -164,13 +164,13 @@ impl MysqlConnection { #[cfg(test)] mod tests { - extern crate dotenv; + extern crate dotenvy; use super::*; use std::env; fn connection() -> MysqlConnection { - dotenv::dotenv().ok(); + dotenvy::dotenv().ok(); let database_url = env::var("MYSQL_UNIT_TEST_DATABASE_URL") .or_else(|_| env::var("MYSQL_DATABASE_URL")) .or_else(|_| env::var("DATABASE_URL")) diff --git a/diesel/src/mysql/types/date_and_time.rs b/diesel/src/mysql/types/date_and_time.rs index eefbb9947767..4b43d9323505 100644 --- a/diesel/src/mysql/types/date_and_time.rs +++ b/diesel/src/mysql/types/date_and_time.rs @@ -259,7 +259,7 @@ impl FromSql for NaiveDate { #[cfg(all(test, feature = "chrono"))] mod tests { extern crate chrono; - extern crate dotenv; + extern crate dotenvy; use self::chrono::{Duration, NaiveDate, NaiveTime, Utc}; diff --git a/diesel/src/pg/connection/mod.rs b/diesel/src/pg/connection/mod.rs index 222aec225235..98f9bd386afb 100644 --- a/diesel/src/pg/connection/mod.rs +++ b/diesel/src/pg/connection/mod.rs @@ -255,7 +255,7 @@ extern "C" fn noop_notice_processor(_: *mut libc::c_void, _message: *const libc: #[cfg(test)] mod tests { - extern crate dotenv; + extern crate dotenvy; use super::*; use crate::dsl::sql; diff --git a/diesel/src/pg/expression/extensions/interval_dsl.rs b/diesel/src/pg/expression/extensions/interval_dsl.rs index 873e7637037c..3d2c0d52c06f 100644 --- a/diesel/src/pg/expression/extensions/interval_dsl.rs +++ b/diesel/src/pg/expression/extensions/interval_dsl.rs @@ -243,7 +243,7 @@ impl IntervalDsl for f64 { #[cfg(test)] mod tests { - extern crate dotenv; + extern crate dotenvy; extern crate quickcheck; use self::quickcheck::quickcheck; diff --git a/diesel/src/pg/transaction.rs b/diesel/src/pg/transaction.rs index 089dba0777a6..41110cd4b8a8 100644 --- a/diesel/src/pg/transaction.rs +++ b/diesel/src/pg/transaction.rs @@ -377,7 +377,7 @@ impl QueryFragment for Deferrable { #[test] fn test_transaction_builder_generates_correct_sql() { - extern crate dotenv; + extern crate dotenvy; macro_rules! assert_sql { ($query:expr, $sql:expr) => { @@ -388,8 +388,8 @@ fn test_transaction_builder_generates_correct_sql() { }; } - let database_url = dotenv::var("PG_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + let database_url = dotenvy::var("PG_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests"); let mut conn = PgConnection::establish(&database_url).unwrap(); diff --git a/diesel/src/pg/types/date_and_time/chrono.rs b/diesel/src/pg/types/date_and_time/chrono.rs index fae197de8d5b..59d6e7afe79d 100644 --- a/diesel/src/pg/types/date_and_time/chrono.rs +++ b/diesel/src/pg/types/date_and_time/chrono.rs @@ -125,7 +125,7 @@ impl FromSql for NaiveDate { #[cfg(test)] mod tests { extern crate chrono; - extern crate dotenv; + extern crate dotenvy; use self::chrono::naive::MAX_DATE; use self::chrono::{Duration, FixedOffset, NaiveDate, NaiveTime, TimeZone, Utc}; diff --git a/diesel/src/pg/types/date_and_time/std_time.rs b/diesel/src/pg/types/date_and_time/std_time.rs index 9edcbae2878d..f1725ff3373a 100644 --- a/diesel/src/pg/types/date_and_time/std_time.rs +++ b/diesel/src/pg/types/date_and_time/std_time.rs @@ -58,7 +58,7 @@ fn duration_to_usecs(duration: Duration) -> u64 { #[cfg(test)] mod tests { - extern crate dotenv; + extern crate dotenvy; use std::time::{Duration, SystemTime, UNIX_EPOCH}; diff --git a/diesel/src/sqlite/types/date_and_time/chrono.rs b/diesel/src/sqlite/types/date_and_time/chrono.rs index 00c7c25baa29..f257c6e4f04f 100644 --- a/diesel/src/sqlite/types/date_and_time/chrono.rs +++ b/diesel/src/sqlite/types/date_and_time/chrono.rs @@ -101,7 +101,7 @@ impl ToSql for NaiveDateTime { #[cfg(test)] mod tests { extern crate chrono; - extern crate dotenv; + extern crate dotenvy; use self::chrono::{Duration, NaiveDate, NaiveDateTime, NaiveTime, Timelike, Utc}; diff --git a/diesel/src/test_helpers.rs b/diesel/src/test_helpers.rs index 6629cd29b8e1..2bc0572b31c3 100644 --- a/diesel/src/test_helpers.rs +++ b/diesel/src/test_helpers.rs @@ -1,4 +1,4 @@ -extern crate dotenv; +extern crate dotenvy; use crate::prelude::*; @@ -37,8 +37,8 @@ cfg_if! { } pub fn database_url() -> String { - dotenv::var("MYSQL_UNIT_TEST_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + dotenvy::var("MYSQL_UNIT_TEST_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests") } } else { @@ -65,7 +65,7 @@ pub fn pg_connection_no_transaction() -> PgConnection { #[cfg(feature = "postgres")] pub fn pg_database_url() -> String { - dotenv::var("PG_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + dotenvy::var("PG_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests") } diff --git a/diesel_bench/Cargo.toml b/diesel_bench/Cargo.toml index e1245a615960..daffa0f69f87 100644 --- a/diesel_bench/Cargo.toml +++ b/diesel_bench/Cargo.toml @@ -10,7 +10,7 @@ autobenches = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -dotenv = "0.15" +dotenvy = "0.15" criterion = "0.3.2" sqlx = {version = "0.5.0", features = ["runtime-tokio-rustls"], optional = true} tokio = {version = "1", optional = true} @@ -34,7 +34,7 @@ features = [] [build-dependencies] diesel = { path = "../diesel", default-features = false } diesel_migrations = { path = "../diesel_migrations" } -dotenv = "0.15" +dotenvy = "0.15" [[bench]] diff --git a/diesel_bench/benches/diesel_async_benches.rs b/diesel_bench/benches/diesel_async_benches.rs index 7e1c533fd63c..b03c8755534d 100644 --- a/diesel_bench/benches/diesel_async_benches.rs +++ b/diesel_bench/benches/diesel_async_benches.rs @@ -116,9 +116,9 @@ pub struct NewComment<'a>( #[cfg(feature = "mysql")] async fn connection() -> TestConnection { - dotenv::dotenv().ok(); - let connection_url = dotenv::var("MYSQL_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + dotenvy::dotenv().ok(); + let connection_url = dotenvy::var("MYSQL_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests"); let mut conn = diesel_async::AsyncMysqlConnection::establish(&connection_url) .await @@ -143,9 +143,9 @@ async fn connection() -> TestConnection { #[cfg(feature = "postgres")] async fn connection() -> TestConnection { - dotenv::dotenv().ok(); - let connection_url = dotenv::var("PG_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + dotenvy::dotenv().ok(); + let connection_url = dotenvy::var("PG_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests"); let mut conn = diesel_async::AsyncPgConnection::establish(&connection_url) .await diff --git a/diesel_bench/benches/diesel_benches.rs b/diesel_bench/benches/diesel_benches.rs index a431bae83660..3f91a7543b21 100644 --- a/diesel_bench/benches/diesel_benches.rs +++ b/diesel_bench/benches/diesel_benches.rs @@ -111,9 +111,9 @@ pub struct NewComment<'a>( #[cfg(feature = "mysql")] fn connection() -> TestConnection { - dotenv::dotenv().ok(); - let connection_url = dotenv::var("MYSQL_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + dotenvy::dotenv().ok(); + let connection_url = dotenvy::var("MYSQL_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests"); let mut conn = MysqlConnection::establish(&connection_url).unwrap(); diesel::sql_query("SET FOREIGN_KEY_CHECKS = 0") @@ -136,9 +136,9 @@ fn connection() -> TestConnection { #[cfg(feature = "postgres")] fn connection() -> TestConnection { - dotenv::dotenv().ok(); - let connection_url = dotenv::var("PG_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + dotenvy::dotenv().ok(); + let connection_url = dotenvy::var("PG_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests"); let mut conn = PgConnection::establish(&connection_url).unwrap(); diesel::sql_query("TRUNCATE TABLE comments CASCADE") @@ -155,7 +155,7 @@ fn connection() -> TestConnection { #[cfg(feature = "sqlite")] fn connection() -> TestConnection { - dotenv::dotenv().ok(); + dotenvy::dotenv().ok(); let mut conn = diesel::SqliteConnection::establish(":memory:").unwrap(); for migration in super::SQLITE_MIGRATION_SQL { diesel::sql_query(*migration).execute(&mut conn).unwrap(); diff --git a/diesel_bench/benches/mysql_benches.rs b/diesel_bench/benches/mysql_benches.rs index fddc289d3e0d..bde65f79cdc0 100644 --- a/diesel_bench/benches/mysql_benches.rs +++ b/diesel_bench/benches/mysql_benches.rs @@ -24,9 +24,9 @@ pub struct Comment { } fn connection() -> Conn { - dotenv::dotenv().ok(); - let connection_url = dotenv::var("MYSQL_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + dotenvy::dotenv().ok(); + let connection_url = dotenvy::var("MYSQL_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests"); let opts = Opts::from_url(&connection_url).unwrap(); let mut conn = Conn::new(opts).unwrap(); diff --git a/diesel_bench/benches/postgres_benches.rs b/diesel_bench/benches/postgres_benches.rs index 81ede9175684..5847a2f2b499 100644 --- a/diesel_bench/benches/postgres_benches.rs +++ b/diesel_bench/benches/postgres_benches.rs @@ -26,9 +26,9 @@ pub struct Comment { } fn connection() -> Client { - dotenv::dotenv().ok(); - let connection_url = dotenv::var("POSTGRES_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + dotenvy::dotenv().ok(); + let connection_url = dotenvy::var("POSTGRES_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests"); let mut client = Client::connect(&connection_url, NoTls).unwrap(); diff --git a/diesel_bench/benches/quaint_benches.rs b/diesel_bench/benches/quaint_benches.rs index 0c3c876cf563..d378411107f7 100644 --- a/diesel_bench/benches/quaint_benches.rs +++ b/diesel_bench/benches/quaint_benches.rs @@ -39,18 +39,18 @@ pub struct UserWithPost { } fn connect(rt: &mut Runtime) -> Quaint { - dotenv::dotenv().ok(); + dotenvy::dotenv().ok(); let db_url = if cfg!(feature = "sqlite") { - dotenv::var("SQLITE_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + dotenvy::var("SQLITE_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests") } else if cfg!(feature = "postgres") { - dotenv::var("POSTGRES_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + dotenvy::var("POSTGRES_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests") } else if cfg!(feature = "mysql") { - dotenv::var("MYSQL_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + dotenvy::var("MYSQL_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests") } else { unimplemented!() diff --git a/diesel_bench/benches/rust_orm_benches.rs b/diesel_bench/benches/rust_orm_benches.rs index b9258488a36f..7a2639cc7d6d 100644 --- a/diesel_bench/benches/rust_orm_benches.rs +++ b/diesel_bench/benches/rust_orm_benches.rs @@ -79,21 +79,21 @@ mod for_load { fn connect() -> EntityManager { let mut pool = Pool::new(); - dotenv::dotenv().ok(); + dotenvy::dotenv().ok(); let db_url = if cfg!(feature = "sqlite") { - let url = dotenv::var("SQLITE_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + let url = dotenvy::var("SQLITE_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests"); url.replace("sqlite:", "sqlite://") } else if cfg!(feature = "postgres") { - dotenv::var("POSTGRES_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + dotenvy::var("POSTGRES_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests") } else if cfg!(feature = "mysql") { - dotenv::var("MYSQL_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + dotenvy::var("MYSQL_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests") } else { unimplemented!() diff --git a/diesel_bench/benches/sea_orm_benches/mod.rs b/diesel_bench/benches/sea_orm_benches/mod.rs index aea6d6de17bf..14591c3373be 100644 --- a/diesel_bench/benches/sea_orm_benches/mod.rs +++ b/diesel_bench/benches/sea_orm_benches/mod.rs @@ -18,9 +18,9 @@ fn connection() -> (sqlx::PgPool, DatabaseConnection, Runtime) { let rt = Runtime::new().expect("Failed to start runtime"); - dotenv::dotenv().ok(); - let connection_url = dotenv::var("PG_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + dotenvy::dotenv().ok(); + let connection_url = dotenvy::var("PG_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests"); let (pool, db) = rt.block_on(async { use sqlx::Executor; @@ -45,9 +45,9 @@ fn connection() -> (sqlx::MySqlPool, DatabaseConnection, Runtime) { let rt = Runtime::new().expect("Failed to start runtime"); - dotenv::dotenv().ok(); - let connection_url = dotenv::var("MYSQL_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + dotenvy::dotenv().ok(); + let connection_url = dotenvy::var("MYSQL_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests"); let (pool, db) = rt.block_on(async { use sqlx::Executor; @@ -74,7 +74,7 @@ fn connection() -> (sqlx::SqlitePool, DatabaseConnection, Runtime) { use sea_orm::SqlxSqliteConnector; let rt = Runtime::new().expect("Failed to start runtime"); - dotenv::dotenv().ok(); + dotenvy::dotenv().ok(); let (pool, db) = rt.block_on(async { use sqlx::Executor; diff --git a/diesel_bench/benches/sqlx_benches.rs b/diesel_bench/benches/sqlx_benches.rs index 03005ceef699..e12ff78980d9 100644 --- a/diesel_bench/benches/sqlx_benches.rs +++ b/diesel_bench/benches/sqlx_benches.rs @@ -72,9 +72,9 @@ fn connection() -> (Runtime, Connection) { let runtime = Runtime::new().expect("Failed to create runtime"); - dotenv::dotenv().ok(); - let connection_url = dotenv::var("POSTGRES_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + dotenvy::dotenv().ok(); + let connection_url = dotenvy::var("POSTGRES_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests"); let conn = runtime.block_on(async { @@ -103,9 +103,9 @@ fn connection() -> (Runtime, Connection) { let runtime = Runtime::new().expect("Failed to create runtime"); - dotenv::dotenv().ok(); - let connection_url = dotenv::var("MYSQL_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + dotenvy::dotenv().ok(); + let connection_url = dotenvy::var("MYSQL_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests"); let conn = runtime.block_on(async { diff --git a/diesel_bench/build.rs b/diesel_bench/build.rs index c977cd22733c..961d2fca679c 100644 --- a/diesel_bench/build.rs +++ b/diesel_bench/build.rs @@ -1,8 +1,8 @@ extern crate diesel; extern crate diesel_migrations as migrations; -extern crate dotenv; +extern crate dotenvy; use self::diesel::*; -use self::dotenv::dotenv; +use self::dotenvy::dotenv; use std::env; #[cfg(not(any(feature = "mysql", feature = "sqlite", feature = "postgres")))] diff --git a/diesel_cli/Cargo.toml b/diesel_cli/Cargo.toml index 2734b4769d1e..61e8a800addc 100644 --- a/diesel_cli/Cargo.toml +++ b/diesel_cli/Cargo.toml @@ -22,7 +22,7 @@ doc = false chrono = { version = "0.4.19", default-features = false, features = ["clock", "std"] } clap = "3.1" clap_complete = "3.1" -dotenv = "0.15" +dotenvy = "0.15" heck = "0.3.1" serde = { version = "1.0.0", features = ["derive"] } toml = "0.5" diff --git a/diesel_cli/src/infer_schema_internals/information_schema.rs b/diesel_cli/src/infer_schema_internals/information_schema.rs index e958522f057c..cf4b2ef22503 100644 --- a/diesel_cli/src/infer_schema_internals/information_schema.rs +++ b/diesel_cli/src/infer_schema_internals/information_schema.rs @@ -383,9 +383,9 @@ pub fn load_foreign_key_constraints( #[cfg(all(test, feature = "postgres"))] mod tests { - extern crate dotenv; + extern crate dotenvy; - use self::dotenv::dotenv; + use self::dotenvy::dotenv; use super::*; use std::env; diff --git a/diesel_cli/src/main.rs b/diesel_cli/src/main.rs index 118243f32160..e029a0a80a86 100644 --- a/diesel_cli/src/main.rs +++ b/diesel_cli/src/main.rs @@ -46,7 +46,7 @@ use self::database_error::{DatabaseError, DatabaseResult}; pub static TIMESTAMP_FORMAT: &str = "%Y-%m-%d-%H%M%S"; fn main() { - use dotenv::dotenv; + use dotenvy::dotenv; dotenv().ok(); let matches = cli::build_cli().get_matches(); diff --git a/diesel_cli/tests/support/project_builder.rs b/diesel_cli/tests/support/project_builder.rs index 01429504518f..b502d482f5cb 100644 --- a/diesel_cli/tests/support/project_builder.rs +++ b/diesel_cli/tests/support/project_builder.rs @@ -1,5 +1,5 @@ #[cfg(not(feature = "sqlite"))] -extern crate dotenv; +extern crate dotenvy; #[cfg(not(feature = "sqlite"))] extern crate url; @@ -96,7 +96,7 @@ impl Project { #[cfg(any(feature = "postgres", feature = "mysql"))] fn database_url_from_env(&self, var: &str) -> url::Url { - use self::dotenv::dotenv; + use self::dotenvy::dotenv; use std::env; dotenv().ok(); diff --git a/diesel_derives/Cargo.toml b/diesel_derives/Cargo.toml index b06cc40b8209..980ce2402290 100644 --- a/diesel_derives/Cargo.toml +++ b/diesel_derives/Cargo.toml @@ -18,7 +18,7 @@ proc-macro-error = "1.0.4" [dev-dependencies] cfg-if = "1" -dotenv = "0.15" +dotenvy = "0.15" [dev-dependencies.diesel] version = "~2.0.0" diff --git a/diesel_derives/src/lib.rs b/diesel_derives/src/lib.rs index 61d809b65ff5..0fd38b2dd0b7 100644 --- a/diesel_derives/src/lib.rs +++ b/diesel_derives/src/lib.rs @@ -323,7 +323,7 @@ pub fn derive_identifiable(input: TokenStream) -> TokenStream { /// /// ```rust /// # extern crate diesel; -/// # extern crate dotenv; +/// # extern crate dotenvy; /// # include!("../../diesel/src/doctest_setup.rs"); /// # use diesel::{prelude::*, serialize::{ToSql, Output, self}, deserialize::{FromSqlRow}, expression::AsExpression, sql_types, backend::Backend}; /// # use schema::users; @@ -472,7 +472,7 @@ pub fn derive_query_id(input: TokenStream) -> TokenStream { /// /// ```rust /// # extern crate diesel; -/// # extern crate dotenv; +/// # extern crate dotenvy; /// # include!("../../diesel/src/doctest_setup.rs"); /// # /// #[derive(Queryable, PartialEq, Debug)] @@ -500,7 +500,7 @@ pub fn derive_query_id(input: TokenStream) -> TokenStream { /// /// ```rust /// # extern crate diesel; -/// # extern crate dotenv; +/// # extern crate dotenvy; /// # include!("../../diesel/src/doctest_setup.rs"); /// # /// # use schema::users; @@ -554,7 +554,7 @@ pub fn derive_query_id(input: TokenStream) -> TokenStream { /// /// ```rust /// # extern crate diesel; -/// # extern crate dotenv; +/// # extern crate dotenvy; /// # include!("../../diesel/src/doctest_setup.rs"); /// # /// use schema::users; @@ -666,7 +666,7 @@ pub fn derive_queryable(input: TokenStream) -> TokenStream { /// /// ```rust /// # extern crate diesel; -/// # extern crate dotenv; +/// # extern crate dotenvy; /// # include!("../../diesel/src/doctest_setup.rs"); /// # use schema::users; /// # use diesel::sql_query; @@ -697,7 +697,7 @@ pub fn derive_queryable(input: TokenStream) -> TokenStream { /// /// ```rust /// # extern crate diesel; -/// # extern crate dotenv; +/// # extern crate dotenvy; /// # include!("../../diesel/src/doctest_setup.rs"); /// # use diesel::sql_query; /// # use schema::users; @@ -749,7 +749,7 @@ pub fn derive_queryable(input: TokenStream) -> TokenStream { /// /// ```rust /// # extern crate diesel; -/// # extern crate dotenv; +/// # extern crate dotenvy; /// # include!("../../diesel/src/doctest_setup.rs"); /// # use schema::users; /// # use diesel::sql_query; diff --git a/diesel_derives/tests/helpers.rs b/diesel_derives/tests/helpers.rs index e92dacaabc8c..9a21d3509f51 100644 --- a/diesel_derives/tests/helpers.rs +++ b/diesel_derives/tests/helpers.rs @@ -16,13 +16,13 @@ cfg_if! { conn } } else if #[cfg(feature = "postgres")] { - extern crate dotenv; + extern crate dotenvy; pub type TestConnection = PgConnection; pub fn connection() -> TestConnection { - let database_url = dotenv::var("PG_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + let database_url = dotenvy::var("PG_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests"); let mut conn = PgConnection::establish(&database_url).unwrap(); conn.begin_test_transaction().unwrap(); @@ -36,13 +36,13 @@ cfg_if! { conn } } else if #[cfg(feature = "mysql")] { - extern crate dotenv; + extern crate dotenvy; pub type TestConnection = MysqlConnection; pub fn connection() -> TestConnection { - let database_url = dotenv::var("MYSQL_UNIT_TEST_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + let database_url = dotenvy::var("MYSQL_UNIT_TEST_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests"); let mut conn = MysqlConnection::establish(&database_url).unwrap(); sql_query("DROP TABLE IF EXISTS users CASCADE").execute(&mut conn).unwrap(); diff --git a/diesel_dynamic_schema/Cargo.toml b/diesel_dynamic_schema/Cargo.toml index 3d797bf2a1cd..133667ffd6b0 100644 --- a/diesel_dynamic_schema/Cargo.toml +++ b/diesel_dynamic_schema/Cargo.toml @@ -13,7 +13,7 @@ path = "../diesel/" default-features = false [dev-dependencies] -dotenv = "0.15" +dotenvy = "0.15" [[example]] name = "querying_basic_schemas" diff --git a/diesel_dynamic_schema/tests/connection_setup.rs b/diesel_dynamic_schema/tests/connection_setup.rs index 1c9a48acc989..3ef821b0e799 100644 --- a/diesel_dynamic_schema/tests/connection_setup.rs +++ b/diesel_dynamic_schema/tests/connection_setup.rs @@ -40,8 +40,8 @@ pub fn establish_connection() -> diesel::PgConnection { use diesel::*; let mut conn = PgConnection::establish( - &dotenv::var("DATABASE_URL") - .or_else(|_| dotenv::var("PG_DATABASE_URL")) + &dotenvy::var("DATABASE_URL") + .or_else(|_| dotenvy::var("PG_DATABASE_URL")) .expect("Set either `DATABASE_URL` or `PG_DATABASE_URL`"), ) .unwrap(); @@ -55,8 +55,8 @@ pub fn establish_connection() -> diesel::MysqlConnection { use diesel::*; let mut conn = MysqlConnection::establish( - &dotenv::var("DATABASE_URL") - .or_else(|_| dotenv::var("MYSQL_DATABASE_URL")) + &dotenvy::var("DATABASE_URL") + .or_else(|_| dotenvy::var("MYSQL_DATABASE_URL")) .expect("Set either `DATABASE_URL` or `MYSQL_DATABASE_URL`"), ) .unwrap(); diff --git a/diesel_migrations/Cargo.toml b/diesel_migrations/Cargo.toml index 31d9beabb54e..9beaa46b144e 100644 --- a/diesel_migrations/Cargo.toml +++ b/diesel_migrations/Cargo.toml @@ -17,7 +17,7 @@ version = "~2.0.0" path = "migrations_macros" [dev-dependencies] -dotenv = "0.15" +dotenvy = "0.15" cfg-if = "1.0.0" tempfile = "3.2" diff --git a/diesel_migrations/migrations_macros/Cargo.toml b/diesel_migrations/migrations_macros/Cargo.toml index b2680e7a019c..7abdb7e53cdd 100644 --- a/diesel_migrations/migrations_macros/Cargo.toml +++ b/diesel_migrations/migrations_macros/Cargo.toml @@ -17,7 +17,7 @@ path = "../migrations_internals" [dev-dependencies] tempfile = "3.1.0" -dotenv = "0.15" +dotenvy = "0.15" cfg-if = "1.0.0" [dev-dependencies.diesel] diff --git a/diesel_tests/Cargo.toml b/diesel_tests/Cargo.toml index 07c202093118..7a190bbfd280 100644 --- a/diesel_tests/Cargo.toml +++ b/diesel_tests/Cargo.toml @@ -12,7 +12,7 @@ assert_matches = "1.0.1" chrono = { version = "0.4.19", default-features = false, features = ["clock", "std"] } diesel = { path = "../diesel", default-features = false, features = ["quickcheck", "chrono", "uuid", "serde_json", "network-address", "numeric", "with-deprecated"] } diesel_migrations = { path = "../diesel_migrations" } -dotenv = "0.15" +dotenvy = "0.15" quickcheck = "1.0.3" uuid = { version = ">=0.7.0, <0.9.0" } serde_json = { version=">=0.9, <2.0" } diff --git a/diesel_tests/tests/lib.rs b/diesel_tests/tests/lib.rs index dc2681193448..2e8c53de1399 100644 --- a/diesel_tests/tests/lib.rs +++ b/diesel_tests/tests/lib.rs @@ -8,7 +8,7 @@ extern crate chrono; extern crate diesel; #[cfg(feature = "sqlite")] extern crate diesel_migrations; -extern crate dotenv; +extern crate dotenvy; extern crate quickcheck; mod alias; diff --git a/diesel_tests/tests/schema/mod.rs b/diesel_tests/tests/schema/mod.rs index 3a66295857a7..954f71e565ce 100644 --- a/diesel_tests/tests/schema/mod.rs +++ b/diesel_tests/tests/schema/mod.rs @@ -251,8 +251,8 @@ pub fn connection_without_transaction() -> TestConnection { #[cfg(feature = "postgres")] pub fn backend_specific_connection() -> TestConnection { - let connection_url = dotenv::var("PG_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + let connection_url = dotenvy::var("PG_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests"); let mut conn = PgConnection::establish(&connection_url).unwrap(); @@ -276,8 +276,8 @@ pub fn backend_specific_connection() -> TestConnection { #[cfg(feature = "mysql")] pub fn backend_specific_connection() -> TestConnection { - let connection_url = dotenv::var("MYSQL_DATABASE_URL") - .or_else(|_| dotenv::var("DATABASE_URL")) + let connection_url = dotenvy::var("MYSQL_DATABASE_URL") + .or_else(|_| dotenvy::var("DATABASE_URL")) .expect("DATABASE_URL must be set in order to run tests"); MysqlConnection::establish(&connection_url).unwrap() } diff --git a/examples/mysql/getting_started_step_1/Cargo.toml b/examples/mysql/getting_started_step_1/Cargo.toml index 20a981822aa5..c31f209edcde 100644 --- a/examples/mysql/getting_started_step_1/Cargo.toml +++ b/examples/mysql/getting_started_step_1/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] diesel = { version = "2.0.0", path = "../../../diesel", features = ["mysql"] } -dotenv = "0.15" +dotenvy = "0.15" [[bin]] name = "show_posts" diff --git a/examples/mysql/getting_started_step_1/src/lib.rs b/examples/mysql/getting_started_step_1/src/lib.rs index 19471c574669..bb9f3007448d 100644 --- a/examples/mysql/getting_started_step_1/src/lib.rs +++ b/examples/mysql/getting_started_step_1/src/lib.rs @@ -2,7 +2,7 @@ pub mod models; pub mod schema; use diesel::prelude::*; -use dotenv::dotenv; +use dotenvy::dotenv; use std::env; pub fn establish_connection() -> MysqlConnection { diff --git a/examples/mysql/getting_started_step_2/Cargo.toml b/examples/mysql/getting_started_step_2/Cargo.toml index 001764782020..4d58b7b39955 100644 --- a/examples/mysql/getting_started_step_2/Cargo.toml +++ b/examples/mysql/getting_started_step_2/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] diesel = { version = "2.0.0", path = "../../../diesel", features = ["mysql"] } -dotenv = "0.15" +dotenvy = "0.15" [[bin]] name = "show_posts" diff --git a/examples/mysql/getting_started_step_2/src/lib.rs b/examples/mysql/getting_started_step_2/src/lib.rs index 4241b0f9c5ea..50cb18b7b4fb 100644 --- a/examples/mysql/getting_started_step_2/src/lib.rs +++ b/examples/mysql/getting_started_step_2/src/lib.rs @@ -2,7 +2,7 @@ pub mod models; pub mod schema; use diesel::prelude::*; -use dotenv::dotenv; +use dotenvy::dotenv; use std::env; use self::models::{NewPost, Post}; diff --git a/examples/mysql/getting_started_step_3/Cargo.toml b/examples/mysql/getting_started_step_3/Cargo.toml index 725251dd5ad8..a9a783925b4d 100644 --- a/examples/mysql/getting_started_step_3/Cargo.toml +++ b/examples/mysql/getting_started_step_3/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] diesel = { version = "2.0.0", path = "../../../diesel", features = ["mysql"] } -dotenv = "0.15" +dotenvy = "0.15" [[bin]] name = "show_posts" diff --git a/examples/mysql/getting_started_step_3/src/lib.rs b/examples/mysql/getting_started_step_3/src/lib.rs index ad07b757bf78..4845b075d290 100644 --- a/examples/mysql/getting_started_step_3/src/lib.rs +++ b/examples/mysql/getting_started_step_3/src/lib.rs @@ -2,7 +2,7 @@ pub mod models; pub mod schema; use diesel::prelude::*; -use dotenv::dotenv; +use dotenvy::dotenv; use std::env; use self::models::{NewPost, Post}; diff --git a/examples/postgres/advanced-blog-cli/Cargo.toml b/examples/postgres/advanced-blog-cli/Cargo.toml index c56748af2616..9bdc3f57a37a 100644 --- a/examples/postgres/advanced-blog-cli/Cargo.toml +++ b/examples/postgres/advanced-blog-cli/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" bcrypt = "0.10.1" chrono = { version = "0.4.19", default-features = false, features = ["clock", "std"] } diesel = { version = "2.0.0", path = "../../../diesel", features = ["postgres", "chrono"] } -dotenv = "0.15" +dotenvy = "0.15" structopt = "0.3" tempfile = "3.1.0" diff --git a/examples/postgres/advanced-blog-cli/src/auth.rs b/examples/postgres/advanced-blog-cli/src/auth.rs index b4b073f52dd1..f31656778674 100644 --- a/examples/postgres/advanced-blog-cli/src/auth.rs +++ b/examples/postgres/advanced-blog-cli/src/auth.rs @@ -9,7 +9,7 @@ pub enum AuthenticationError { IncorrectPassword, NoUsernameSet, NoPasswordSet, - EnvironmentError(dotenv::Error), + EnvironmentError(dotenvy::Error), BcryptError(BcryptError), DatabaseError(diesel::result::Error), } @@ -86,21 +86,21 @@ fn register_user( } fn get_username() -> Result { - if_not_present(dotenv::var("BLOG_USERNAME"), NoUsernameSet) + if_not_present(dotenvy::var("BLOG_USERNAME"), NoUsernameSet) } fn get_password() -> Result { - if_not_present(dotenv::var("BLOG_PASSWORD"), NoPasswordSet) + if_not_present(dotenvy::var("BLOG_PASSWORD"), NoPasswordSet) } fn if_not_present( - res: Result, + res: Result, on_not_present: AuthenticationError, ) -> Result { use std::env::VarError::NotPresent; res.map_err(|e| match e { - dotenv::Error::EnvVar(NotPresent) => on_not_present, + dotenvy::Error::EnvVar(NotPresent) => on_not_present, e => AuthenticationError::EnvironmentError(e), }) } diff --git a/examples/postgres/advanced-blog-cli/src/main.rs b/examples/postgres/advanced-blog-cli/src/main.rs index c15073d84451..e8ab345af9b2 100644 --- a/examples/postgres/advanced-blog-cli/src/main.rs +++ b/examples/postgres/advanced-blog-cli/src/main.rs @@ -24,7 +24,7 @@ use self::schema::*; fn main() { let matches = Cli::from_args(); - let database_url = dotenv::var("DATABASE_URL").expect("DATABASE_URL must be set"); + let database_url = dotenvy::var("DATABASE_URL").expect("DATABASE_URL must be set"); handle_error(run_cli(&database_url, matches)); } diff --git a/examples/postgres/advanced-blog-cli/src/test_helpers.rs b/examples/postgres/advanced-blog-cli/src/test_helpers.rs index bf82c40ef23d..38c2b2eaafe1 100644 --- a/examples/postgres/advanced-blog-cli/src/test_helpers.rs +++ b/examples/postgres/advanced-blog-cli/src/test_helpers.rs @@ -4,7 +4,7 @@ use lazy_static::lazy_static; use std::sync::{Mutex, MutexGuard}; pub fn connection() -> PgConnection { - let url = dotenv::var("DATABASE_URL").expect("DATABASE_URL must be set"); + let url = dotenvy::var("DATABASE_URL").expect("DATABASE_URL must be set"); let mut conn = PgConnection::establish(&url).unwrap(); let migrations = FileBasedMigrations::find_migrations_directory().unwrap(); conn.run_pending_migrations(migrations).unwrap(); @@ -13,7 +13,7 @@ pub fn connection() -> PgConnection { } pub fn this_test_modifies_env() -> MutexGuard<'static, ()> { - let _ = dotenv::var("FORCING_DOTENV_LOAD"); + let _ = dotenvy::var("FORCING_DOTENV_LOAD"); lazy_static! { static ref ENV_LOCK: Mutex<()> = Mutex::new(()); } diff --git a/examples/postgres/getting_started_step_1/Cargo.toml b/examples/postgres/getting_started_step_1/Cargo.toml index ba6dd7024a61..5c8719286ccd 100644 --- a/examples/postgres/getting_started_step_1/Cargo.toml +++ b/examples/postgres/getting_started_step_1/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] diesel = { version = "2.0.0", path = "../../../diesel", features = ["postgres"] } -dotenv = "0.15" +dotenvy = "0.15" [[bin]] name = "show_posts" diff --git a/examples/postgres/getting_started_step_1/src/lib.rs b/examples/postgres/getting_started_step_1/src/lib.rs index 68941817fefc..32dc30e89614 100644 --- a/examples/postgres/getting_started_step_1/src/lib.rs +++ b/examples/postgres/getting_started_step_1/src/lib.rs @@ -3,7 +3,7 @@ pub mod schema; use diesel::pg::PgConnection; use diesel::prelude::*; -use dotenv::dotenv; +use dotenvy::dotenv; use std::env; pub fn establish_connection() -> PgConnection { diff --git a/examples/postgres/getting_started_step_2/Cargo.toml b/examples/postgres/getting_started_step_2/Cargo.toml index 7ebe43491cf3..07d3c42e1917 100644 --- a/examples/postgres/getting_started_step_2/Cargo.toml +++ b/examples/postgres/getting_started_step_2/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] diesel = { version = "2.0.0", path = "../../../diesel", features = ["postgres"] } -dotenv = "0.15" +dotenvy = "0.15" [[bin]] name = "show_posts" diff --git a/examples/postgres/getting_started_step_2/src/lib.rs b/examples/postgres/getting_started_step_2/src/lib.rs index 8cb1da04bc96..5964f346bc3c 100644 --- a/examples/postgres/getting_started_step_2/src/lib.rs +++ b/examples/postgres/getting_started_step_2/src/lib.rs @@ -2,7 +2,7 @@ pub mod models; pub mod schema; use diesel::prelude::*; -use dotenv::dotenv; +use dotenvy::dotenv; use std::env; use self::models::{NewPost, Post}; diff --git a/examples/postgres/getting_started_step_3/Cargo.toml b/examples/postgres/getting_started_step_3/Cargo.toml index 7056330c732f..c74414227535 100644 --- a/examples/postgres/getting_started_step_3/Cargo.toml +++ b/examples/postgres/getting_started_step_3/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] diesel = { version = "2.0.0", path = "../../../diesel", features = ["postgres"] } -dotenv = "0.15" +dotenvy = "0.15" [[bin]] name = "show_posts" diff --git a/examples/postgres/getting_started_step_3/src/lib.rs b/examples/postgres/getting_started_step_3/src/lib.rs index 8cb1da04bc96..5964f346bc3c 100644 --- a/examples/postgres/getting_started_step_3/src/lib.rs +++ b/examples/postgres/getting_started_step_3/src/lib.rs @@ -2,7 +2,7 @@ pub mod models; pub mod schema; use diesel::prelude::*; -use dotenv::dotenv; +use dotenvy::dotenv; use std::env; use self::models::{NewPost, Post}; diff --git a/examples/sqlite/getting_started_step_1/Cargo.toml b/examples/sqlite/getting_started_step_1/Cargo.toml index 7bbd3afcdcd0..57d5fc7fbca0 100644 --- a/examples/sqlite/getting_started_step_1/Cargo.toml +++ b/examples/sqlite/getting_started_step_1/Cargo.toml @@ -7,11 +7,11 @@ edition = "2018" [dependencies] diesel = { version = "2.0.0", path = "../../../diesel", features = ["sqlite"] } -dotenv = "0.15" +dotenvy = "0.15" [[bin]] name = "show_posts" doc = false [lib] -doc = false \ No newline at end of file +doc = false diff --git a/examples/sqlite/getting_started_step_1/src/lib.rs b/examples/sqlite/getting_started_step_1/src/lib.rs index 7ac85f18553b..eba84f740ff7 100644 --- a/examples/sqlite/getting_started_step_1/src/lib.rs +++ b/examples/sqlite/getting_started_step_1/src/lib.rs @@ -2,7 +2,7 @@ pub mod models; pub mod schema; use diesel::prelude::*; -use dotenv::dotenv; +use dotenvy::dotenv; use std::env; pub fn establish_connection() -> SqliteConnection { diff --git a/examples/sqlite/getting_started_step_2/Cargo.toml b/examples/sqlite/getting_started_step_2/Cargo.toml index a970aaa860ee..3d6ea0b49060 100644 --- a/examples/sqlite/getting_started_step_2/Cargo.toml +++ b/examples/sqlite/getting_started_step_2/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] diesel = { version = "2.0.0", path = "../../../diesel", features = ["sqlite"] } -dotenv = "0.15" +dotenvy = "0.15" [[bin]] name = "show_posts" @@ -18,4 +18,4 @@ name = "write_post" doc = false [lib] -doc = false \ No newline at end of file +doc = false diff --git a/examples/sqlite/getting_started_step_2/src/lib.rs b/examples/sqlite/getting_started_step_2/src/lib.rs index 87a1fddb22d3..040b5185bb6b 100644 --- a/examples/sqlite/getting_started_step_2/src/lib.rs +++ b/examples/sqlite/getting_started_step_2/src/lib.rs @@ -2,7 +2,7 @@ pub mod models; pub mod schema; use diesel::prelude::*; -use dotenv::dotenv; +use dotenvy::dotenv; use std::env; use self::models::NewPost; diff --git a/examples/sqlite/getting_started_step_3/Cargo.toml b/examples/sqlite/getting_started_step_3/Cargo.toml index df428c58f377..8808034ac3fc 100644 --- a/examples/sqlite/getting_started_step_3/Cargo.toml +++ b/examples/sqlite/getting_started_step_3/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] diesel = { version = "2.0.0", path = "../../../diesel", features = ["sqlite"] } -dotenv = "0.15" +dotenvy = "0.15" [[bin]] name = "show_posts" @@ -26,4 +26,4 @@ name = "publish_post" doc = false [lib] -doc = false \ No newline at end of file +doc = false diff --git a/examples/sqlite/getting_started_step_3/src/lib.rs b/examples/sqlite/getting_started_step_3/src/lib.rs index 97b44736ae06..1ff5398e22b3 100644 --- a/examples/sqlite/getting_started_step_3/src/lib.rs +++ b/examples/sqlite/getting_started_step_3/src/lib.rs @@ -2,7 +2,7 @@ pub mod models; pub mod schema; use diesel::prelude::*; -use dotenv::dotenv; +use dotenvy::dotenv; use std::env; use models::NewPost;