fix: slight refactor

Author: ollz272

src/url.rs

@@ -373,15 +373,27 @@ impl PyMultiHostUrl {
         password: Option<&str>,
         port: Option<&str>,
     ) -> PyResult<&'a PyAny> {
-        let mut url = if hosts.is_some() && host.is_some() {
+        // todo better error message
+        let mut url = if hosts.is_some() && (host.is_some() || user.is_some() || password.is_some() || port.is_some()) {
             return Err(PyValueError::new_err("Only one of `host` or `hosts` may be set"));
-        }
-        else if hosts.is_some() {
+        } else if hosts.is_some() {
             // check all of host / user / password / port empty
             // build multi-host url
+            for single_host in hosts.as_deref().unwrap_or_default() {
+                let mut multi_url = format!("{scheme}://");
+                if single_host.username.is_some()
+                    && single_host.host.is_some()
+                    && single_host.password.is_some()
+                    && single_host.port.is_some()
+                {
+                    todo!()
+                }
+                else {
+                    return Err(PyValueError::new_err("Incomplete object."));
+                };
+            }
             todo!()
-        }
-        else if let Some(host) = host {
+        } else if let Some(host) = host {
             let user_password = match (user, password) {
                 (Some(user), None) => format!("{user}@"),
                 (None, Some(password)) => format!(":{password}@"),

tests/validators/test_url.py

@@ -1233,33 +1233,27 @@ def test_multi_url_build() -> None:
     assert str(url) == 'postgresql://testuser:[email protected]:5432/database?sslmode=require#test'
 
 
-def test_multi_url_build_host_and_hosts_set() -> None:
+@pytest.mark.parametrize('field', ['host', 'password', 'user', 'port'])
+def test_multi_url_build_hosts_set_with_single_value(field) -> None:
+    """Hosts can't be provided with any single url values."""
     hosts = [
-        {
-            'host': '127.0.0.1:5432',
-            'password': 'testpassword',
-            'username': 'testuser',
-            'port': '5432'
-        },
-        {
-            'host': '127.0.0.1:5432',
-            'password': 'testpassword',
-            'username': 'testuser',
-            'port': '5432'
-        },
+        {'host': '127.0.0.1:5432', 'password': 'testpassword', 'username': 'testuser', 'port': '5432'},
+        {'host': '127.0.0.1:5432', 'password': 'testpassword', 'username': 'testuser', 'port': '5432'},
     ]
+    kwargs = dict(scheme='postgresql', hosts=hosts, path='database', query='sslmode=require', fragment='test')
+    kwargs[field] = 'test'
     with pytest.raises(ValueError):
-        MultiHostUrl.build(
-            scheme='postgresql',
-            user='testuser',
-            password='testpassword',
-            host='127.0.0.1',
-            hosts=hosts,
-            port='5432',
-            path='database',
-            query='sslmode=require',
-            fragment='test',
-        )
+        MultiHostUrl.build(**kwargs)
+
+
+@pytest.mark.parametrize('field', ['host', 'password', 'username', 'port'])
+def test_multi_url_build_hosts_invalid_host(field) -> None:
+    """Hosts can't be provided with any single url values."""
+    host = {'host': '127.0.0.1:5432', 'password': 'testpassword', 'username': 'testuser', 'port': '5432'}
+    del host[field]
+    with pytest.raises(ValueError):
+        MultiHostUrl.build(scheme='postgresql', hosts=[host], path='database', query='sslmode=require', fragment='test')
+
 
 def test_multi_url_build_neither_host_and_hosts_set() -> None:
     with pytest.raises(ValueError):
@@ -1273,6 +1267,7 @@ def test_multi_url_build_neither_host_and_hosts_set() -> None:
             fragment='test',
         )
 
+
 def test_url_build() -> None:
     url = Url.build(
         scheme='postgresql',