Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src-tauri/src/drivers/postgres/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1412,13 +1412,23 @@ impl DatabaseDriver for PostgresDriver {
use urlencoding::encode;
let user = encode(params.username.as_deref().unwrap_or_default());
let pass = encode(params.password.as_deref().unwrap_or_default());
let sslmode = match params.ssl_mode.as_deref() {
Some("disable") => "disable",
Some("allow") => "allow",
Some("prefer") => "prefer",
Some("require") => "require",
Some("verify-ca") => "verify-ca",
Some("verify-full") => "verify-full",
_ => "prefer",
};
Ok(format!(
"postgres://{}:{}@{}:{}/{}",
"postgres://{}:{}@{}:{}/{}?sslmode={}",
user,
pass,
params.host.as_deref().unwrap_or("localhost"),
params.port.unwrap_or(5432),
params.database
params.database,
sslmode
))
}

Expand Down
37 changes: 37 additions & 0 deletions src-tauri/src/drivers/postgres/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -536,3 +536,40 @@ mod build_pk_predicate_tests {
assert!(build_pk_predicate("id", serde_json::json!(true), 1).is_err());
}
}

mod build_connection_url_tests {
use super::super::PostgresDriver;
use crate::drivers::driver_trait::DatabaseDriver;
use crate::models::{ConnectionParams, DatabaseSelection};

fn params_with_ssl_mode(ssl_mode: Option<&str>) -> ConnectionParams {
ConnectionParams {
driver: "postgres".to_string(),
host: Some("127.0.0.1".to_string()),
port: Some(5432),
username: Some("postgres".to_string()),
password: Some("secret".to_string()),
database: DatabaseSelection::Single("app".to_string()),
ssl_mode: ssl_mode.map(|s| s.to_string()),
..Default::default()
}
}

#[test]
fn includes_disabled_ssl_mode() {
let driver = PostgresDriver::new();
let url = driver
.build_connection_url(&params_with_ssl_mode(Some("disable")))
.unwrap();
assert!(url.contains("sslmode=disable"), "url was: {url}");
}

#[test]
fn defaults_to_prefer_when_unset() {
let driver = PostgresDriver::new();
let url = driver
.build_connection_url(&params_with_ssl_mode(None))
.unwrap();
assert!(url.contains("sslmode=prefer"), "url was: {url}");
}
}