itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2026-03-23 10:38:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update uuid crate to v1 (#1821)

Browse Source
This commit is contained in:
Paolo Barbolini
2022-04-20 21:48:29 +02:00
committed by GitHub
parent b934f82440
commit ec15f6b30c
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@@ -2866,9 +2866,9 @@ checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
[[package]]
name = "uuid"
version = "0.8.2"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
checksum = "8cfcd319456c4d6ea10087ed423473267e1a071f3bc0aa89f80d60997843c6f0"
[[package]]
name = "value-bag"

2
sqlx-core/Cargo.toml
View File

@@ -173,7 +173,7 @@ time = { version = "0.3.2", features = ["macros", "formatting", "parsing"], opti
tokio-stream = { version = "0.1.8", features = ["fs"], optional = true }
smallvec = "1.7.0"
url = { version = "2.2.2", default-features = false }
uuid = { version = "0.8.2", default-features = false, optional = true, features = ["std"] }
uuid = { version = "1.0", default-features = false, optional = true, features = ["std"] }
webpki-roots = { version = "0.22.0", optional = true }
whoami = { version = "1.2.1", optional = true }
stringprep = "0.1.2"

2
sqlx-core/src/mysql/types/mod.rs
View File

@@ -62,7 +62,7 @@
//! | Rust type | MySQL type(s) |
//! |---------------------------------------|------------------------------------------------------|
//! | `uuid::Uuid` | BYTE(16), VARCHAR, CHAR, TEXT |
//! | `uuid::adapter::Hyphenated` | CHAR(36) |
//! | `uuid::fmt::Hyphenated` | CHAR(36) |
//!
//! ### [`json`](https://crates.io/crates/json)
//!

4
sqlx-core/src/mysql/types/uuid.rs
View File

@@ -1,4 +1,4 @@
use uuid::{adapter::Hyphenated, Uuid};
use uuid::{fmt::Hyphenated, Uuid};
use crate::decode::Decode;
use crate::encode::{Encode, IsNull};
@@ -61,6 +61,6 @@ impl Decode<'_, MySql> for Hyphenated {
// parse a UUID from the text
Uuid::parse_str(text)
.map_err(Into::into)
.map(|u| u.to_hyphenated())
.map(|u| u.hyphenated())
}
}

2
sqlx-core/src/sqlite/types/mod.rs
View File

@@ -35,7 +35,7 @@
//! | Rust type | Sqlite type(s) |
//! |---------------------------------------|------------------------------------------------------|
//! | `uuid::Uuid` | BLOB, TEXT |
//! | `uuid::adapter::Hyphenated` | TEXT |
//! | `uuid::fmt::Hyphenated` | TEXT |
//!
//! # Nullable
//!

4
sqlx-core/src/sqlite/types/uuid.rs
View File

@@ -5,7 +5,7 @@ use crate::sqlite::type_info::DataType;
use crate::sqlite::{Sqlite, SqliteArgumentValue, SqliteTypeInfo, SqliteValueRef};
use crate::types::Type;
use std::borrow::Cow;
use uuid::{adapter::Hyphenated, Uuid};
use uuid::{fmt::Hyphenated, Uuid};
impl Type<Sqlite> for Uuid {
fn type_info() -> SqliteTypeInfo {
@@ -53,6 +53,6 @@ impl Decode<'_, Sqlite> for Hyphenated {
let uuid: Result<Uuid, BoxDynError> =
Uuid::parse_str(&value.text().map(ToOwned::to_owned)?).map_err(Into::into);
Ok(uuid?.to_hyphenated())
Ok(uuid?.hyphenated())
}
}

6
tests/mysql/types.rs
View File

@@ -51,11 +51,11 @@ test_type!(uuid<sqlx::types::Uuid>(MySql,
));
#[cfg(feature = "uuid")]
test_type!(uuid_hyphenated<sqlx::types::uuid::adapter::Hyphenated>(MySql,
test_type!(uuid_hyphenated<sqlx::types::uuid::fmt::Hyphenated>(MySql,
"'b731678f-636f-4135-bc6f-19440c13bd19'"
== sqlx::types::Uuid::parse_str("b731678f-636f-4135-bc6f-19440c13bd19").unwrap().to_hyphenated(),
== sqlx::types::Uuid::parse_str("b731678f-636f-4135-bc6f-19440c13bd19").unwrap().hyphenated(),
"'00000000-0000-0000-0000-000000000000'"
== sqlx::types::Uuid::parse_str("00000000-0000-0000-0000-000000000000").unwrap().to_hyphenated()
== sqlx::types::Uuid::parse_str("00000000-0000-0000-0000-000000000000").unwrap().hyphenated()
));
#[cfg(feature = "chrono")]

6
tests/sqlite/types.rs
View File

@@ -140,9 +140,9 @@ test_type!(uuid<sqlx::types::Uuid>(Sqlite,
));
#[cfg(feature = "uuid")]
test_type!(uuid_hyphenated<sqlx::types::uuid::adapter::Hyphenated>(Sqlite,
test_type!(uuid_hyphenated<sqlx::types::uuid::fmt::Hyphenated>(Sqlite,
"'b731678f-636f-4135-bc6f-19440c13bd19'"
== sqlx::types::Uuid::parse_str("b731678f-636f-4135-bc6f-19440c13bd19").unwrap().to_hyphenated(),
== sqlx::types::Uuid::parse_str("b731678f-636f-4135-bc6f-19440c13bd19").unwrap().hyphenated(),
"'00000000-0000-0000-0000-000000000000'"
== sqlx::types::Uuid::parse_str("00000000-0000-0000-0000-000000000000").unwrap().to_hyphenated()
== sqlx::types::Uuid::parse_str("00000000-0000-0000-0000-000000000000").unwrap().hyphenated()
));