diff --git a/Cargo.lock b/Cargo.lock index d23b45c..e842d00 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7,7 +7,6 @@ name = "advanced-types" version = "0.1.0" dependencies = [ "bigdecimal", - "bit-vec", "chrono", "sqlx", "tokio", diff --git a/README.md b/README.md index 25c9539..5dfe17f 100644 --- a/README.md +++ b/README.md @@ -157,7 +157,7 @@ directly without re-collecting. | `tsrange` | `sqlx::postgres::types::PgRange` | | `tstzrange` | `sqlx::postgres::types::PgRange>` | | `daterange` | `sqlx::postgres::types::PgRange` | -| `bit` / `varbit` | `bit_vec::BitVec` | +| `bit` / `varbit` | `sqlx::types::BitVec` | | PostgreSQL ENUM | generated Rust enum | | PostgreSQL composite | generated Rust struct | diff --git a/examples/advanced-types/Cargo.toml b/examples/advanced-types/Cargo.toml index d1eef16..3a2cb5c 100644 --- a/examples/advanced-types/Cargo.toml +++ b/examples/advanced-types/Cargo.toml @@ -6,7 +6,6 @@ publish = false [dependencies] bigdecimal = "0.4" -bit-vec = "0.8" chrono = "0.4" sqlx = { workspace = true } tokio = { workspace = true } diff --git a/examples/advanced-types/src/main.rs b/examples/advanced-types/src/main.rs index 70470c4..d893f2a 100644 --- a/examples/advanced-types/src/main.rs +++ b/examples/advanced-types/src/main.rs @@ -23,7 +23,7 @@ async fn test_advanced_types_roundtrip() { .await .unwrap(); - let flags = bit_vec::BitVec::from_bytes(&[0b10101010]); + let flags = sqlx::types::BitVec::from_bytes(&[0b10101010]); let now = chrono::Utc::now(); let later = now + chrono::Duration::hours(1); let window = sqlx::postgres::types::PgRange::from(( diff --git a/examples/advanced-types/src/queries.rs b/examples/advanced-types/src/queries.rs index ea9bef8..3748ea0 100644 --- a/examples/advanced-types/src/queries.rs +++ b/examples/advanced-types/src/queries.rs @@ -44,7 +44,7 @@ const GET_EVENT: &str = "SELECT id, name, flags, event_window FROM events WHERE pub struct GetEventRow { pub id: i64, pub name: String, - pub flags: bit_vec::BitVec, + pub flags: sqlx::types::BitVec, pub event_window: sqlx::postgres::types::PgRange>, } pub async fn get_event(mut db: E, id: i64) -> Result { @@ -58,7 +58,7 @@ const LIST_EVENTS: &str = "SELECT id, name, flags, event_window FROM events"; pub struct ListEventsRow { pub id: i64, pub name: String, - pub flags: bit_vec::BitVec, + pub flags: sqlx::types::BitVec, pub event_window: sqlx::postgres::types::PgRange>, } pub async fn list_events(mut db: E) -> Result, sqlx::Error> { diff --git a/src/types.rs b/src/types.rs index 67d13f7..e9bc370 100644 --- a/src/types.rs +++ b/src/types.rs @@ -202,7 +202,7 @@ impl TypeMap { // Bit types for n in ["bit", "varbit", "pg_catalog.varbit"] { - defaults.insert(n, ("bit_vec::BitVec", false)); + defaults.insert(n, ("sqlx::types::BitVec", false)); } let mut type_overrides: HashMap = HashMap::new(); diff --git a/tests/codegen.rs b/tests/codegen.rs index bb7a2e9..30ae849 100644 --- a/tests/codegen.rs +++ b/tests/codegen.rs @@ -504,7 +504,10 @@ fn snapshot_range_types() { let code = String::from_utf8(resp.files[0].contents.clone()).unwrap(); assert_codegen_snapshot("range_types", &code); assert!(code.contains("PgRange"), "expected PgRange in:\n{code}"); - assert!(code.contains("BitVec"), "expected BitVec in:\n{code}"); + assert!( + code.contains("sqlx::types::BitVec"), + "expected SQLx BitVec in:\n{code}" + ); } #[test] diff --git a/tests/snapshots/codegen__range_types.snap b/tests/snapshots/codegen__range_types.snap index 51e2964..13ed403 100644 --- a/tests/snapshots/codegen__range_types.snap +++ b/tests/snapshots/codegen__range_types.snap @@ -48,7 +48,7 @@ pub const GET_EVENT_WINDOW: &str = "SELECT id, window, flags FROM events WHERE i pub struct GetEventWindowRow { pub id: i64, pub window: sqlx::postgres::types::PgRange>, - pub flags: bit_vec::BitVec, + pub flags: sqlx::types::BitVec, } pub async fn get_event_window( mut db: E,