progress

Author: psteinroe

crates/pgls_configuration/src/database.rs

@@ -100,118 +100,3 @@ impl PartialDatabaseConfiguration {
         })
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::sync::Mutex;
-
-    static ENV_MUTEX: Mutex<()> = Mutex::new(());
-
-    const ALL_VARS: &[&str] = &[
-        "DATABASE_URL",
-        "PGHOST",
-        "PGPORT",
-        "PGUSER",
-        "PGPASSWORD",
-        "PGDATABASE",
-    ];
-
-    fn clear_env_vars() {
-        for var in ALL_VARS {
-            unsafe {
-                std::env::remove_var(var);
-            }
-        }
-    }
-
-    #[test]
-    fn from_env_none_when_no_vars_set() {
-        let _lock = ENV_MUTEX.lock().unwrap();
-        clear_env_vars();
-
-        assert!(PartialDatabaseConfiguration::from_env().is_none());
-    }
-
-    #[test]
-    fn from_env_all_vars_set() {
-        let _lock = ENV_MUTEX.lock().unwrap();
-        clear_env_vars();
-
-        unsafe {
-            std::env::set_var("DATABASE_URL", "postgres://u:p@h:1234/d");
-            std::env::set_var("PGHOST", "myhost");
-            std::env::set_var("PGPORT", "5433");
-            std::env::set_var("PGUSER", "myuser");
-            std::env::set_var("PGPASSWORD", "mypass");
-            std::env::set_var("PGDATABASE", "mydb");
-        }
-
-        let config = PartialDatabaseConfiguration::from_env().unwrap();
-        assert_eq!(
-            config.connection_string,
-            Some("postgres://u:p@h:1234/d".to_string())
-        );
-        assert_eq!(config.host, Some("myhost".to_string()));
-        assert_eq!(config.port, Some(5433));
-        assert_eq!(config.username, Some("myuser".to_string()));
-        assert_eq!(config.password, Some("mypass".to_string()));
-        assert_eq!(config.database, Some("mydb".to_string()));
-
-        clear_env_vars();
-    }
-
-    #[test]
-    fn from_env_partial_vars() {
-        let _lock = ENV_MUTEX.lock().unwrap();
-        clear_env_vars();
-
-        unsafe {
-            std::env::set_var("PGHOST", "remotehost");
-            std::env::set_var("PGDATABASE", "appdb");
-        }
-
-        let config = PartialDatabaseConfiguration::from_env().unwrap();
-        assert_eq!(config.connection_string, None);
-        assert_eq!(config.host, Some("remotehost".to_string()));
-        assert_eq!(config.port, None);
-        assert_eq!(config.username, None);
-        assert_eq!(config.password, None);
-        assert_eq!(config.database, Some("appdb".to_string()));
-
-        clear_env_vars();
-    }
-
-    #[test]
-    fn from_env_invalid_pgport_ignored() {
-        let _lock = ENV_MUTEX.lock().unwrap();
-        clear_env_vars();
-
-        unsafe {
-            std::env::set_var("PGHOST", "localhost");
-            std::env::set_var("PGPORT", "not_a_number");
-        }
-
-        let config = PartialDatabaseConfiguration::from_env().unwrap();
-        assert_eq!(config.host, Some("localhost".to_string()));
-        assert_eq!(config.port, None);
-
-        clear_env_vars();
-    }
-
-    #[test]
-    fn from_env_only_invalid_pgport_returns_none() {
-        let _lock = ENV_MUTEX.lock().unwrap();
-        clear_env_vars();
-
-        unsafe {
-            std::env::set_var("PGPORT", "not_a_number");
-        }
-
-        // PGPORT is set but invalid — parse fails so it becomes None.
-        // No other vars are set, so has_any is false.
-        assert!(PartialDatabaseConfiguration::from_env().is_none());
-
-        clear_env_vars();
-    }
-}