Skip to content

Commit c8ae9c8

Browse files
joeydewaaljoeydewaal
committed
update unit tests
1 parent 6669bd3 commit c8ae9c8

File tree

3 files changed

+34
-140
lines changed

3 files changed

+34
-140
lines changed

‎tests/mysql/types.rs

Lines changed: 12 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use sqlx::types::Text;
1515
use sqlx::mysql::types::MySqlTime;
1616
use sqlx_mysql::types::MySqlTimeSign;
1717

18-
use sqlx_test::{new, test_type};
18+
use sqlx_test::{new, test_prepared_type, test_type};
1919

2020
test_type!(bool(MySql, "false" == false, "true" == true));
2121

@@ -303,6 +303,17 @@ mod json_tests {
303303
));
304304
}
305305

306+
test_type!(test_arc<Arc<i32>>(MySql, "1" == Arc::new(1i32)));
307+
test_type!(test_cow<Cow<'_, i32>>(MySql, "1" == Cow::<i32>::Owned(1i32)));
308+
test_type!(test_box<Box<i32>>(MySql, "1" == Box::new(1i32)));
309+
test_type!(test_rc<Rc<i32>>(MySql, "1" == Rc::new(1i32)));
310+
311+
test_type!(test_box_str<Box<str>>(MySql, "'John'" == Box::<str>::from("John")));
312+
test_type!(test_cow_str<Cow<'_, str>>(MySql, "'Phil'" == Cow::<'static, str>::from("Phil")));
313+
314+
test_prepared_type!(test_box_slice<Box<[u8]>>(MySql, "X'01020304'" == Box::<[u8]>::from([1,2,3,4])));
315+
test_prepared_type!(test_cow_slice<Cow<'_, [u8]>>(MySql, "X'01020304'" == Cow::<'static, [u8]>::from(&[1,2,3,4])));
316+
306317
#[sqlx_macros::test]
307318
async fn test_bits() -> anyhow::Result<()> {
308319
let mut conn = new::<MySql>().await?;
@@ -387,49 +398,3 @@ CREATE TEMPORARY TABLE user_login (
387398

388399
Ok(())
389400
}
390-
391-
#[sqlx_macros::test]
392-
async fn test_smartpointers() -> anyhow::Result<()> {
393-
let mut conn = new::<MySql>().await?;
394-
395-
let user_age: (Arc<i32>, Cow<'static, i32>, Box<i32>, i32) =
396-
sqlx::query_as("SELECT ?, ?, ?, ?")
397-
.bind(Arc::new(1i32))
398-
.bind(Cow::<'_, i32>::Borrowed(&2i32))
399-
.bind(Box::new(3i32))
400-
.bind(Rc::new(4i32))
401-
.fetch_one(&mut conn)
402-
.await?;
403-
404-
assert!(user_age.0.as_ref() == &1);
405-
assert!(user_age.1.as_ref() == &2);
406-
assert!(user_age.2.as_ref() == &3);
407-
assert!(user_age.3 == 4);
408-
Ok(())
409-
}
410-
411-
#[sqlx_macros::test]
412-
async fn test_str_slice() -> anyhow::Result<()> {
413-
let mut conn = new::<MySql>().await?;
414-
415-
let box_str: Box<str> = "John".into();
416-
let box_slice: Box<[u8]> = [1, 2, 3, 4].into();
417-
let cow_str: Cow<'static, str> = "Phil".into();
418-
let cow_slice: Cow<'static, [u8]> = Cow::Borrowed(&[1, 2, 3, 4]);
419-
420-
let row = sqlx::query("SELECT ?, ?, ?, ?")
421-
.bind(&box_str)
422-
.bind(&box_slice)
423-
.bind(&cow_str)
424-
.bind(&cow_slice)
425-
.fetch_one(&mut conn)
426-
.await?;
427-
428-
let data: (Box<str>, Box<[u8]>, Cow<'_, str>, Cow<'_, [u8]>) = FromRow::from_row(&row)?;
429-
430-
assert!(data.0 == box_str);
431-
assert!(data.1 == box_slice);
432-
assert!(data.2 == cow_str);
433-
assert!(data.3 == cow_slice);
434-
Ok(())
435-
}

‎tests/postgres/types.rs

Lines changed: 11 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ use std::sync::Arc;
99

1010
use sqlx::postgres::types::{Oid, PgCiText, PgInterval, PgMoney, PgRange};
1111
use sqlx::postgres::Postgres;
12-
use sqlx::FromRow;
1312
use sqlx_test::{new, test_decode_type, test_prepared_type, test_type};
1413

1514
use sqlx_core::executor::Executor;
@@ -698,6 +697,17 @@ test_type!(ltree_vec<Vec<sqlx::postgres::types::PgLTree>>(Postgres,
698697
]
699698
));
700699

700+
test_type!(test_arc<Arc<i32>>(Postgres, "1::INT4" == Arc::new(1i32)));
701+
test_type!(test_cow<Cow<'_, i32>>(Postgres, "1::INT4" == Cow::<i32>::Owned(1i32)));
702+
test_type!(test_box<Box<i32>>(Postgres, "1::INT4" == Box::new(1i32)));
703+
test_type!(test_rc<Rc<i32>>(Postgres, "1::INT4" == Rc::new(1i32)));
704+
705+
test_type!(test_box_str<Box<str>>(Postgres, "'John'::TEXT" == Box::<str>::from("John")));
706+
test_type!(test_cow_str<Cow<'_, str>>(Postgres, "'Phil'::TEXT" == Cow::<'static, str>::from("Phil")));
707+
708+
test_prepared_type!(test_box_slice<Box<[u8]>>(Postgres, "'\\x01020304'::BYTEA" == Box::<[u8]>::from([1,2,3,4])));
709+
test_prepared_type!(test_cow_slice<Cow<'_, [u8]>>(Postgres, "'\\x01020304'::BYTEA" == Cow::<'static, [u8]>::from(&[1,2,3,4])));
710+
701711
#[sqlx_macros::test]
702712
async fn test_text_adapter() -> anyhow::Result<()> {
703713
#[derive(sqlx::FromRow, Debug, PartialEq, Eq)]
@@ -740,49 +750,3 @@ CREATE TEMPORARY TABLE user_login (
740750

741751
Ok(())
742752
}
743-
744-
#[sqlx_macros::test]
745-
async fn test_smartpointers() -> anyhow::Result<()> {
746-
let mut conn = new::<Postgres>().await?;
747-
748-
let user_age: (Arc<i32>, Cow<'static, i32>, Box<i32>, i32) =
749-
sqlx::query_as("SELECT $1, $2, $3, $4")
750-
.bind(Arc::new(1i32))
751-
.bind(Cow::<'_, i32>::Borrowed(&2i32))
752-
.bind(Box::new(3i32))
753-
.bind(Rc::new(4i32))
754-
.fetch_one(&mut conn)
755-
.await?;
756-
757-
assert!(user_age.0.as_ref() == &1);
758-
assert!(user_age.1.as_ref() == &2);
759-
assert!(user_age.2.as_ref() == &3);
760-
assert!(user_age.3 == 4);
761-
Ok(())
762-
}
763-
764-
#[sqlx_macros::test]
765-
async fn test_str_slice() -> anyhow::Result<()> {
766-
let mut conn = new::<Postgres>().await?;
767-
768-
let box_str: Box<str> = "John".into();
769-
let box_slice: Box<[u8]> = [1, 2, 3, 4].into();
770-
let cow_str: Cow<'static, str> = "Phil".into();
771-
let cow_slice: Cow<'static, [u8]> = Cow::Borrowed(&[1, 2, 3, 4]);
772-
773-
let row = sqlx::query("SELECT $1, $2, $3, $4")
774-
.bind(&box_str)
775-
.bind(&box_slice)
776-
.bind(&cow_str)
777-
.bind(&cow_slice)
778-
.fetch_one(&mut conn)
779-
.await?;
780-
781-
let data: (Box<str>, Box<[u8]>, Cow<'_, str>, Cow<'_, [u8]>) = FromRow::from_row(&row)?;
782-
783-
assert!(data.0 == box_str);
784-
assert!(data.1 == box_slice);
785-
assert!(data.2 == cow_str);
786-
assert!(data.3 == cow_slice);
787-
Ok(())
788-
}

‎tests/sqlite/types.rs

Lines changed: 11 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,17 @@ test_type!(uuid_simple<sqlx::types::uuid::fmt::Simple>(Sqlite,
212212
== sqlx::types::Uuid::parse_str("00000000000000000000000000000000").unwrap().simple()
213213
));
214214

215+
test_type!(test_arc<Arc<i32>>(Sqlite, "1" == Arc::new(1i32)));
216+
test_type!(test_cow<Cow<'_, i32>>(Sqlite, "1" == Cow::<i32>::Owned(1i32)));
217+
test_type!(test_box<Box<i32>>(Sqlite, "1" == Box::new(1i32)));
218+
test_type!(test_rc<Rc<i32>>(Sqlite, "1" == Rc::new(1i32)));
219+
220+
test_type!(test_box_str<Box<str>>(Sqlite, "'John'" == Box::<str>::from("John")));
221+
test_type!(test_cow_str<Cow<'_, str>>(Sqlite, "'Phil'" == Cow::<'static, str>::from("Phil")));
222+
223+
test_type!(test_box_slice<Box<[u8]>>(Sqlite, "X'01020304'" == Box::<[u8]>::from([1,2,3,4])));
224+
test_type!(test_cow_slice<Cow<'_, [u8]>>(Sqlite, "X'01020304'" == Cow::<'static, [u8]>::from(&[1,2,3,4])));
225+
215226
#[sqlx_macros::test]
216227
async fn test_text_adapter() -> anyhow::Result<()> {
217228
#[derive(sqlx::FromRow, Debug, PartialEq, Eq)]
@@ -254,49 +265,3 @@ CREATE TEMPORARY TABLE user_login (
254265

255266
Ok(())
256267
}
257-
258-
#[sqlx_macros::test]
259-
async fn test_smartpointers() -> anyhow::Result<()> {
260-
let mut conn = new::<Sqlite>().await?;
261-
262-
let user_age: (Arc<i32>, Cow<'static, i32>, Box<i32>, i32) =
263-
sqlx::query_as("SELECT $1, $2, $3, $4")
264-
.bind(Arc::new(1i32))
265-
.bind(Cow::<'_, i32>::Borrowed(&2i32))
266-
.bind(Box::new(3i32))
267-
.bind(Rc::new(4i32))
268-
.fetch_one(&mut conn)
269-
.await?;
270-
271-
assert!(user_age.0.as_ref() == &1);
272-
assert!(user_age.1.as_ref() == &2);
273-
assert!(user_age.2.as_ref() == &3);
274-
assert!(user_age.3 == 4);
275-
Ok(())
276-
}
277-
278-
#[sqlx_macros::test]
279-
async fn test_str_slice() -> anyhow::Result<()> {
280-
let mut conn = new::<Sqlite>().await?;
281-
282-
let box_str: Box<str> = "John".into();
283-
let box_slice: Box<[u8]> = [1, 2, 3, 4].into();
284-
let cow_str: Cow<'static, str> = "Phil".into();
285-
let cow_slice: Cow<'static, [u8]> = Cow::Borrowed(&[1, 2, 3, 4]);
286-
287-
let row = sqlx::query("SELECT $1, $2, $3, $4")
288-
.bind(&box_str)
289-
.bind(&box_slice)
290-
.bind(&cow_str)
291-
.bind(&cow_slice)
292-
.fetch_one(&mut conn)
293-
.await?;
294-
295-
let data: (Box<str>, Box<[u8]>, Cow<'_, str>, Cow<'_, [u8]>) = FromRow::from_row(&row)?;
296-
297-
assert!(data.0 == box_str);
298-
assert!(data.1 == box_slice);
299-
assert!(data.2 == cow_str);
300-
assert!(data.3 == cow_slice);
301-
Ok(())
302-
}

0 commit comments

Comments
 (0)