|
1 | 1 | #![allow(clippy::approx_constant)] |
2 | 2 | use sqlx_oldapi::odbc::Odbc; |
3 | | -use sqlx_test::{test_decode_type, test_type}; |
| 3 | +use sqlx_test::test_type; |
4 | 4 |
|
5 | 5 | // Basic null test |
6 | 6 | test_type!(null<Option<i32>>(Odbc, |
@@ -98,16 +98,19 @@ test_type!(string<String>(Odbc, |
98 | 98 |
|
99 | 99 | // Feature-gated types |
100 | 100 | #[cfg(feature = "uuid")] |
101 | | -test_type!(uuid<sqlx_oldapi::types::Uuid>(Odbc, |
| 101 | +mod uuid_tests { |
| 102 | + use super::*; |
| 103 | + use sqlx_test::test_decode_type; |
| 104 | + |
| 105 | + test_type!(uuid<sqlx_oldapi::types::Uuid>(Odbc, |
102 | 106 | "'550e8400-e29b-41d4-a716-446655440000'" == sqlx_oldapi::types::Uuid::parse_str("550e8400-e29b-41d4-a716-446655440000").unwrap(), |
103 | | - "'00000000-0000-0000-0000-000000000000'" == sqlx_oldapi::types::Uuid::nil() |
104 | | -)); |
| 107 | + "'00000000-0000-0000-0000-000000000000'" == sqlx_oldapi::types::Uuid::nil() |
| 108 | + )); |
105 | 109 |
|
106 | | -// Extra UUID decoding edge cases (ODBC may return padded strings) |
107 | | -#[cfg(feature = "uuid")] |
108 | | -test_decode_type!(uuid_padded<sqlx_oldapi::types::Uuid>(Odbc, |
109 | | - "'550e8400-e29b-41d4-a716-446655440000 '" == sqlx_oldapi::types::Uuid::parse_str("550e8400-e29b-41d4-a716-446655440000").unwrap() |
110 | | -)); |
| 110 | + test_decode_type!(uuid_padded<sqlx_oldapi::types::Uuid>(Odbc, |
| 111 | + "'550e8400-e29b-41d4-a716-446655440000 '" == sqlx_oldapi::types::Uuid::parse_str("550e8400-e29b-41d4-a716-446655440000").unwrap() |
| 112 | + )); |
| 113 | +} |
111 | 114 |
|
112 | 115 | #[cfg(feature = "json")] |
113 | 116 | mod json_tests { |
@@ -144,6 +147,7 @@ mod chrono_tests { |
144 | 147 | use sqlx_oldapi::types::chrono::{ |
145 | 148 | DateTime, FixedOffset, NaiveDate, NaiveDateTime, NaiveTime, Utc, |
146 | 149 | }; |
| 150 | + use sqlx_test::test_decode_type; |
147 | 151 |
|
148 | 152 | test_type!(chrono_date<NaiveDate>(Odbc, |
149 | 153 | "'2023-12-25'" == NaiveDate::from_ymd_opt(2023, 12, 25).unwrap(), |
|
0 commit comments