Skip to content
Closed
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
97 changes: 12 additions & 85 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sqlx-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ console = "0.15.0"
dialoguer = { version = "0.11", default-features = false }
serde_json = "1.0.73"
glob = "0.3.0"
openssl = { version = "0.10.38", optional = true }
openssl = { version = "0.10.69", optional = true }
cargo_metadata = "0.18.1"
filetime = "0.2"

Expand Down
2 changes: 1 addition & 1 deletion sqlx-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ smol = { workspace = true, optional = true }
tokio = { workspace = true, optional = true }

# TLS
native-tls = { version = "0.2.10", optional = true }
native-tls = { version = "0.2.13", optional = true }

rustls = { version = "0.23.24", default-features = false, features = ["std", "tls12"], optional = true }
webpki-roots = { version = "1", optional = true }
Expand Down
45 changes: 43 additions & 2 deletions sqlx-postgres/src/options/parse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ impl PgConnectOptions {

"application_name" => options = options.application_name(&value),

"extra_float_digits" => {
options =
options.extra_float_digits(value.parse::<i8>().map_err(Error::config)?);
}

"options" => {
if let Some(options) = options.options.as_mut() {
options.push(' ');
Expand Down Expand Up @@ -166,6 +171,11 @@ impl PgConnectOptions {
&self.statement_cache_capacity.to_string(),
);

if let Some(ref extra_float_digits) = self.extra_float_digits {
url.query_pairs_mut()
.append_pair("extra_float_digits", extra_float_digits);
}

url
}
}
Expand Down Expand Up @@ -250,6 +260,37 @@ fn it_parses_application_name_correctly_from_parameter() {
assert_eq!(Some("some_name"), opts.application_name.as_deref());
}

#[test]
fn it_parses_extra_float_digits_correctly_from_parameter() {
let url = "postgres:///?extra_float_digits=2";
let opts = PgConnectOptions::from_str(url).unwrap();

assert_eq!(Some("2"), opts.extra_float_digits.as_deref());
}

#[test]
fn it_parses_extra_float_digits_negative_value() {
let url = "postgres:///?extra_float_digits=-1";
let opts = PgConnectOptions::from_str(url).unwrap();

assert_eq!(Some("-1"), opts.extra_float_digits.as_deref());
}

#[test]
fn it_parses_multiple_query_parameters() {
let url = "postgres://user:password@localhost:5432/mydb?sslmode=require&application_name=myapp&extra_float_digits=3";
let opts = PgConnectOptions::from_str(url).unwrap();

assert_eq!("user", opts.username);
assert_eq!(Some("password"), opts.password.as_deref());
assert_eq!("localhost", &opts.host);
assert_eq!(5432, opts.port);
assert_eq!(Some("mydb"), opts.database.as_deref());
assert!(matches!(opts.ssl_mode, PgSslMode::Require));
assert_eq!(Some("myapp"), opts.application_name.as_deref());
assert_eq!(Some("3"), opts.extra_float_digits.as_deref());
}

#[test]
fn it_parses_username_with_at_sign_correctly() {
let url = "postgres://user@hostname:password@hostname:5432/database";
Expand Down Expand Up @@ -310,7 +351,7 @@ fn it_returns_the_parsed_url_when_socket() {

let mut expected_url = Url::parse(url).unwrap();
// PgConnectOptions defaults
let query_string = "sslmode=prefer&statement-cache-capacity=100";
let query_string = "sslmode=prefer&statement-cache-capacity=100&extra_float_digits=2";
let port = 5432;
expected_url.set_query(Some(query_string));
let _ = expected_url.set_port(Some(port));
Expand All @@ -325,7 +366,7 @@ fn it_returns_the_parsed_url_when_host() {

let mut expected_url = Url::parse(url).unwrap();
// PgConnectOptions defaults
let query_string = "sslmode=prefer&statement-cache-capacity=100";
let query_string = "sslmode=prefer&statement-cache-capacity=100&extra_float_digits=2";
expected_url.set_query(Some(query_string));

assert_eq!(expected_url, opts.build_url());
Expand Down