mirror of
https://github.com/isar/rusqlite.git
synced 2025-08-20 21:09:31 +08:00
Add optional support for rust-url
This commit is contained in:
@@ -66,6 +66,8 @@ mod from_sql;
|
||||
mod serde_json;
|
||||
mod time;
|
||||
mod to_sql;
|
||||
#[cfg(feature = "url")]
|
||||
mod url;
|
||||
mod value;
|
||||
mod value_ref;
|
||||
|
||||
|
83
src/types/url.rs
Normal file
83
src/types/url.rs
Normal file
@@ -0,0 +1,83 @@
|
||||
//! `ToSql` and `FromSql` implementation for [`url::Url`].
|
||||
use url::Url;
|
||||
use crate::Result;
|
||||
use crate::types::{FromSql, FromSqlError, FromSqlResult, ToSql, ToSqlOutput, ValueRef};
|
||||
|
||||
/// Serialize `Url` to text.
|
||||
impl ToSql for Url {
|
||||
fn to_sql(&self) -> Result<ToSqlOutput<'_>> {
|
||||
Ok(ToSqlOutput::from(self.as_str()))
|
||||
}
|
||||
}
|
||||
|
||||
/// Deserialize text to `Url`.
|
||||
impl FromSql for Url {
|
||||
fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self> {
|
||||
match value {
|
||||
ValueRef::Text(s) => Url::parse(s),
|
||||
_ => return Err(FromSqlError::InvalidType),
|
||||
}
|
||||
.map_err(|err| FromSqlError::Other(Box::new(err)))
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use url::{Url, ParseError};
|
||||
use crate::{Connection, params, Error, Result};
|
||||
|
||||
fn checked_memory_handle() -> Connection {
|
||||
let db = Connection::open_in_memory().unwrap();
|
||||
db.execute_batch("CREATE TABLE urls (i INTEGER, v TEXT)")
|
||||
.unwrap();
|
||||
db
|
||||
}
|
||||
|
||||
fn get_url(db: &Connection, id: i64) -> Result<Url> {
|
||||
db.query_row(
|
||||
"SELECT v FROM urls WHERE i = ?",
|
||||
params![id],
|
||||
|r| r.get(0),
|
||||
)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_sql_url() {
|
||||
let db = &checked_memory_handle();
|
||||
|
||||
let url0 = Url::parse("http://www.example1.com").unwrap();
|
||||
let url1 = Url::parse("http://www.example1.com/👌").unwrap();
|
||||
let url2 = "http://www.example2.com/👌";
|
||||
|
||||
db.execute(
|
||||
"INSERT INTO urls (i, v) VALUES (0, ?), (1, ?), (2, ?), (3, ?)",
|
||||
// also insert a non-hex encoded url (which might be present if it was
|
||||
// inserted separately)
|
||||
params![url0, url1, url2, "illegal"],
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
assert_eq!(get_url(db, 0).unwrap(), url0);
|
||||
|
||||
assert_eq!(get_url(db, 1).unwrap(), url1);
|
||||
|
||||
// Should successfully read it, even though it wasn't inserted as an
|
||||
// escaped url.
|
||||
let out_url2: Url = get_url(db, 2).unwrap();
|
||||
assert_eq!(out_url2, Url::parse(url2).unwrap());
|
||||
|
||||
// Make sure the conversion error comes through correctly.
|
||||
let err = get_url(db, 3).unwrap_err();
|
||||
match err {
|
||||
Error::FromSqlConversionFailure(_, _, e) => {
|
||||
assert_eq!(
|
||||
*e.downcast::<ParseError>().unwrap(),
|
||||
ParseError::RelativeUrlWithoutBase,
|
||||
);
|
||||
}
|
||||
e => {
|
||||
panic!("Expected conversion failure, got {}", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user