Skip to content
Open
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
35 changes: 34 additions & 1 deletion sqlx-sqlite/src/options/parse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,12 @@ impl SqliteConnectOptions {
.add(b'?')
.add(b'`')
.add(b'{')
.add(b'}');
.add(b'}')
// Not part of the WHATWG path-percent-encode-set, but a raw `:` right after
// `sqlite://` gets parsed as a host:port separator instead of part of the path,
// which breaks in-memory filenames like `:memory:` or `file:sqlx-in-memory-0`
// (see `from_db_and_params`) with `EmptyHost`/`InvalidPort` errors.
Comment on lines +130 to +133

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

imo these comments are redundant

.add(b':');

let filename_encoded = percent_encode(
self.filename.as_os_str().as_encoded_bytes(),
Expand Down Expand Up @@ -229,3 +234,31 @@ fn it_returns_the_parsed_url() -> Result<(), Error> {

Ok(())
}

// https://github.com/launchbadge/sqlx/issues/4327
#[test]
fn build_url_does_not_panic_for_in_memory_db() -> Result<(), Error> {
// filename is `file:sqlx-in-memory-{seqno}`, which used to make the `url` crate
// interpret everything up to the next `/` as a `host:port` authority and choke on
// `sqlx-in-memory-0` not being a valid port.
Comment on lines +241 to +243

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

let options: SqliteConnectOptions = "sqlite::memory:".parse()?;
let url = options.build_url();
assert_eq!(
url.query_pairs().find(|(k, _)| k == "mode").unwrap().1,
"memory"
);

// the plain `:memory:` filename used by `SqliteConnectOptions::default()` hit the same
// problem (the leading `:` was parsed as an empty host).
let default_url = SqliteConnectOptions::default().build_url();
assert_eq!(
default_url
.query_pairs()
.find(|(k, _)| k == "mode")
.unwrap()
.1,
"rw"
);

Ok(())
}
Loading