make malformed_sql_query test fail when given other err msgs

henryboisdequin · henryboisdequin · commit 3d64e6cf3787 · 2021-02-24T13:43:06.000+05:30
diff --git a/diesel/src/doctest_setup.rs b/diesel/src/doctest_setup.rs
@@ -199,7 +199,7 @@ cfg_if::cfg_if! {
 fn database_url_from_env(backend_specific_env_var: &str) -> String {
     use std::env;
 
-    let _ = dotenv();
+    dotenv().ok();
 
     env::var(backend_specific_env_var)
         .or_else(|_| env::var("DATABASE_URL"))
diff --git a/diesel/src/mysql/connection/mod.rs b/diesel/src/mysql/connection/mod.rs
@@ -130,7 +130,7 @@ mod tests {
     use std::env;
 
     fn connection() -> MysqlConnection {
-        let _ = dotenv::dotenv();
+        dotenv::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
@@ -164,7 +164,7 @@ mod tests {
     use crate::sql_types::{Date, Datetime, Time, Timestamp};
 
     fn connection() -> MysqlConnection {
-        let _ = dotenv();
+        dotenv().ok();
 
         let connection_url = ::std::env::var("MYSQL_UNIT_TEST_DATABASE_URL")
             .or_else(|_| ::std::env::var("MYSQL_DATABASE_URL"))
diff --git a/diesel/src/pg/connection/mod.rs b/diesel/src/pg/connection/mod.rs
@@ -197,7 +197,11 @@ mod tests {
         if let Err(err) = query {
             if let DatabaseError(_, string) = err {
                 assert_eq!(Some(26), string.statement_position());
+            } else {
+                unreachable!();
             }
+        } else {
+            unreachable!();
         }
     }
 
@@ -263,7 +267,7 @@ mod tests {
     }
 
     fn connection() -> PgConnection {
-        let _ = dotenv();
+        dotenv().ok();
         let database_url = env::var("PG_DATABASE_URL")
             .or_else(|_| env::var("DATABASE_URL"))
             .expect("DATABASE_URL must be set in order to run tests");
diff --git a/diesel/src/pg/expression/extensions/interval_dsl.rs b/diesel/src/pg/expression/extensions/interval_dsl.rs
@@ -248,7 +248,7 @@ mod tests {
 
     thread_local! {
         static CONN: PgConnection = {
-            let _ = dotenv();
+            dotenv().ok();
 
             let connection_url = ::std::env::var("PG_DATABASE_URL")
                 .or_else(|_| ::std::env::var("DATABASE_URL"))
diff --git a/diesel/src/pg/types/date_and_time/chrono.rs b/diesel/src/pg/types/date_and_time/chrono.rs
@@ -138,7 +138,7 @@ mod tests {
     use crate::sql_types::{Date, Time, Timestamp, Timestamptz};
 
     fn connection() -> PgConnection {
-        let _ = dotenv();
+        dotenv().ok();
 
         let connection_url = ::std::env::var("PG_DATABASE_URL")
             .or_else(|_| ::std::env::var("DATABASE_URL"))
diff --git a/diesel/src/pg/types/date_and_time/std_time.rs b/diesel/src/pg/types/date_and_time/std_time.rs
@@ -70,7 +70,7 @@ mod tests {
     use crate::sql_types::Timestamp;
 
     fn connection() -> PgConnection {
-        let _ = dotenv();
+        dotenv().ok();
 
         let connection_url = ::std::env::var("PG_DATABASE_URL")
             .or_else(|_| ::std::env::var("DATABASE_URL"))
diff --git a/diesel/src/sqlite/types/date_and_time/chrono.rs b/diesel/src/sqlite/types/date_and_time/chrono.rs
@@ -121,7 +121,7 @@ mod tests {
     sql_function!(fn date(x: Text) -> Date);
 
     fn connection() -> SqliteConnection {
-        let _ = dotenv();
+        dotenv().ok();
 
         let connection_url = ::std::env::var("SQLITE_DATABASE_URL")
             .or_else(|_| ::std::env::var("DATABASE_URL"))
diff --git a/diesel_bench/benches/diesel_benches.rs b/diesel_bench/benches/diesel_benches.rs
@@ -110,7 +110,7 @@ pub struct NewComment<'a>(
 
 #[cfg(feature = "mysql")]
 fn connection() -> TestConnection {
-    let _ = dotenv::dotenv();
+    dotenv::dotenv().ok();
     let connection_url = dotenv::var("MYSQL_DATABASE_URL")
         .or_else(|_| dotenv::var("DATABASE_URL"))
         .expect("DATABASE_URL must be set in order to run tests");
@@ -125,7 +125,7 @@ fn connection() -> TestConnection {
 
 #[cfg(feature = "postgres")]
 fn connection() -> TestConnection {
-    let _ = dotenv::dotenv();
+    dotenv::dotenv().ok();
     let connection_url = dotenv::var("PG_DATABASE_URL")
         .or_else(|_| dotenv::var("DATABASE_URL"))
         .expect("DATABASE_URL must be set in order to run tests");
@@ -138,7 +138,7 @@ fn connection() -> TestConnection {
 
 #[cfg(feature = "sqlite")]
 fn connection() -> TestConnection {
-    let _ = dotenv::dotenv();
+    dotenv::dotenv().ok();
     let conn = diesel::SqliteConnection::establish(":memory:").unwrap();
     for migration in super::SQLITE_MIGRATION_SQL {
         conn.execute(migration).unwrap();
diff --git a/diesel_bench/benches/mysql_benches.rs b/diesel_bench/benches/mysql_benches.rs
@@ -24,7 +24,7 @@ pub struct Comment {
 }
 
 fn connection() -> Conn {
-    let _ = dotenv::dotenv();
+    dotenv::dotenv().ok();
     let connection_url = dotenv::var("MYSQL_DATABASE_URL")
         .or_else(|_| dotenv::var("DATABASE_URL"))
         .expect("DATABASE_URL must be set in order to run tests");
diff --git a/diesel_bench/benches/postgres_benches.rs b/diesel_bench/benches/postgres_benches.rs
@@ -24,7 +24,7 @@ pub struct Comment {
 }
 
 fn connection() -> Client {
-    let _ = dotenv::dotenv();
+    dotenv::dotenv().ok();
     let connection_url = dotenv::var("POSTGRES_DATABASE_URL")
         .or_else(|_| dotenv::var("DATABASE_URL"))
         .expect("DATABASE_URL must be set in order to run tests");
diff --git a/diesel_bench/benches/quaint_benches.rs b/diesel_bench/benches/quaint_benches.rs
@@ -39,7 +39,7 @@ pub struct UserWithPost {
 }
 
 fn connect(rt: &mut Runtime) -> Quaint {
-    let _ = dotenv::dotenv();
+    dotenv::dotenv().ok();
     let db_url = if cfg!(feature = "sqlite") {
         dotenv::var("SQLITE_DATABASE_URL")
             .or_else(|_| dotenv::var("DATABASE_URL"))
diff --git a/diesel_bench/benches/rust_orm_benches.rs b/diesel_bench/benches/rust_orm_benches.rs
@@ -79,7 +79,7 @@ mod for_load {
 
 fn connect() -> EntityManager {
     let mut pool = Pool::new();
-    let _ = dotenv::dotenv();
+    dotenv::dotenv().ok();
 
     let db_url = if cfg!(feature = "sqlite") {
         let url = dotenv::var("SQLITE_DATABASE_URL")
diff --git a/diesel_bench/benches/sqlx_benches.rs b/diesel_bench/benches/sqlx_benches.rs
@@ -69,7 +69,7 @@ type Connection = sqlx::PgConnection;
 fn connection() -> Connection {
     use sqlx::Connection;
 
-    let _ = dotenv::dotenv();
+    dotenv::dotenv().ok();
     let connection_url = dotenv::var("POSTGRES_DATABASE_URL")
         .or_else(|_| dotenv::var("DATABASE_URL"))
         .expect("DATABASE_URL must be set in order to run tests");
@@ -96,7 +96,7 @@ fn connection() -> Connection {
 fn connection() -> Connection {
     use sqlx::Connection;
 
-    let _ = dotenv::dotenv();
+    dotenv::dotenv().ok();
     let connection_url = dotenv::var("MYSQL_DATABASE_URL")
         .or_else(|_| dotenv::var("DATABASE_URL"))
         .expect("DATABASE_URL must be set in order to run tests");
diff --git a/diesel_bench/build.rs b/diesel_bench/build.rs
@@ -41,7 +41,7 @@ const MIGRATION_SUBDIR: &str = "sqlite";
 const MIGRATION_SUBDIR: &str = "mysql";
 
 fn database_url_from_env(backend_specific_env_var: &str) -> String {
-    let _ = dotenv();
+    dotenv().ok();
     match env::var(backend_specific_env_var) {
         Ok(val) => {
             println!(r#"cargo:rustc-cfg=feature="backend_specific_database_url""#);
diff --git a/diesel_cli/src/infer_schema_internals/information_schema.rs b/diesel_cli/src/infer_schema_internals/information_schema.rs
@@ -359,7 +359,7 @@ mod tests {
     use std::env;
 
     fn connection() -> PgConnection {
-        let _ = dotenv();
+        dotenv().ok();
 
         let connection_url = env::var("PG_DATABASE_URL")
             .or_else(|_| env::var("DATABASE_URL"))
diff --git a/diesel_cli/src/main.rs b/diesel_cli/src/main.rs
@@ -44,7 +44,7 @@ use migrations_internals::TIMESTAMP_FORMAT;
 
 fn main() {
     use dotenv::dotenv;
-    let _ = 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
@@ -98,7 +98,7 @@ impl Project {
     fn database_url_from_env(&self, var: &str) -> url::Url {
         use self::dotenv::dotenv;
         use std::env;
-        let _ = dotenv();
+        dotenv().ok();
 
         let mut db_url =
             url::Url::parse(&env::var_os(var).unwrap().into_string().unwrap()).unwrap();
diff --git a/diesel_tests/build.rs b/diesel_tests/build.rs
@@ -41,7 +41,7 @@ const MIGRATION_SUBDIR: &str = "sqlite";
 const MIGRATION_SUBDIR: &str = "mysql";
 
 fn database_url_from_env(backend_specific_env_var: &str) -> String {
-    let _ = dotenv();
+    dotenv().ok();
     match env::var(backend_specific_env_var) {
         Ok(val) => {
             println!(r#"cargo:rustc-cfg=feature="backend_specific_database_url""#);
diff --git a/examples/mysql/getting_started_step_1/src/lib.rs b/examples/mysql/getting_started_step_1/src/lib.rs
@@ -6,7 +6,7 @@ use dotenv::dotenv;
 use std::env;
 
 pub fn establish_connection() -> MysqlConnection {
-    let _ = dotenv();
+    dotenv().ok();
 
     let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
     MysqlConnection::establish(&database_url)
diff --git a/examples/mysql/getting_started_step_2/src/lib.rs b/examples/mysql/getting_started_step_2/src/lib.rs
@@ -8,7 +8,7 @@ use std::env;
 use self::models::{NewPost, Post};
 
 pub fn establish_connection() -> MysqlConnection {
-    let _ = dotenv();
+    dotenv().ok();
 
     let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
     MysqlConnection::establish(&database_url)
diff --git a/examples/mysql/getting_started_step_3/src/lib.rs b/examples/mysql/getting_started_step_3/src/lib.rs
@@ -8,7 +8,7 @@ use std::env;
 use self::models::{NewPost, Post};
 
 pub fn establish_connection() -> MysqlConnection {
-    let _ = dotenv();
+    dotenv().ok();
 
     let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
     MysqlConnection::establish(&database_url)
diff --git a/examples/postgres/getting_started_step_1/src/lib.rs b/examples/postgres/getting_started_step_1/src/lib.rs
@@ -7,7 +7,7 @@ use dotenv::dotenv;
 use std::env;
 
 pub fn establish_connection() -> PgConnection {
-    let _ = dotenv();
+    dotenv().ok();
 
     let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
     PgConnection::establish(&database_url)
diff --git a/examples/postgres/getting_started_step_2/src/lib.rs b/examples/postgres/getting_started_step_2/src/lib.rs
@@ -8,7 +8,7 @@ use std::env;
 use self::models::{NewPost, Post};
 
 pub fn establish_connection() -> PgConnection {
-    let _ = dotenv();
+    dotenv().ok();
 
     let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
     PgConnection::establish(&database_url)
diff --git a/examples/postgres/getting_started_step_3/src/lib.rs b/examples/postgres/getting_started_step_3/src/lib.rs
@@ -8,7 +8,7 @@ use std::env;
 use self::models::{NewPost, Post};
 
 pub fn establish_connection() -> PgConnection {
-    let _ = dotenv();
+    dotenv().ok();
 
     let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
     PgConnection::establish(&database_url)
diff --git a/examples/sqlite/getting_started_step_1/src/lib.rs b/examples/sqlite/getting_started_step_1/src/lib.rs
@@ -6,7 +6,7 @@ use dotenv::dotenv;
 use std::env;
 
 pub fn establish_connection() -> SqliteConnection {
-    let _ = dotenv();
+    dotenv().ok();
 
     let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
     SqliteConnection::establish(&database_url)
diff --git a/examples/sqlite/getting_started_step_2/src/lib.rs b/examples/sqlite/getting_started_step_2/src/lib.rs
@@ -8,7 +8,7 @@ use std::env;
 use self::models::NewPost;
 
 pub fn establish_connection() -> SqliteConnection {
-    let _ = dotenv();
+    dotenv().ok();
 
     let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
     SqliteConnection::establish(&database_url)
diff --git a/examples/sqlite/getting_started_step_3/src/lib.rs b/examples/sqlite/getting_started_step_3/src/lib.rs
@@ -8,7 +8,7 @@ use std::env;
 use models::NewPost;
 
 pub fn establish_connection() -> SqliteConnection {
-    let _ = dotenv();
+    dotenv().ok();
 
     let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
     SqliteConnection::establish(&database_url)

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,11 @@ mod tests {`
`197`	`197`	`if let Err(err) = query {`
`198`	`198`	`if let DatabaseError(_, string) = err {`
`199`	`199`	`assert_eq!(Some(26), string.statement_position());`
	`200`	`+ } else {`
	`201`	`+ unreachable!();`
`200`	`202`	`}`
	`203`	`+ } else {`
	`204`	`+ unreachable!();`
`201`	`205`	`}`
`202`	`206`	`}`
`203`	`207`
`@@ -263,7 +267,7 @@ mod tests {`
`263`	`267`	`}`
`264`	`268`
`265`	`269`	`fn connection() -> PgConnection {`
`266`		`- let _ = dotenv();`
	`270`	`+ dotenv().ok();`
`267`	`271`	`let database_url = env::var("PG_DATABASE_URL")`
`268`	`272`	`.or_else(\|_\| env::var("DATABASE_URL"))`
`269`	`273`	`.expect("DATABASE_URL must be set in order to run tests");`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ pub struct Comment {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`fn connection() -> Conn {`
`27`		`- let _ = dotenv::dotenv();`
	`27`	`+ dotenv::dotenv().ok();`
`28`	`28`	`let connection_url = dotenv::var("MYSQL_DATABASE_URL")`
`29`	`29`	`.or_else(\|_\| dotenv::var("DATABASE_URL"))`
`30`	`30`	`.expect("DATABASE_URL must be set in order to run tests");`