From 0aa64f8ebbc3a404de766149f146027bab91d402 Mon Sep 17 00:00:00 2001 From: Daniel Akhterov Date: Tue, 20 Aug 2019 22:32:06 -0700 Subject: [PATCH] Test Compile --- src/mariadb/connection/establish.rs | 16 ++++++++-------- .../protocol/packets/binary/com_stmt_exec.rs | 2 +- .../packets/binary/com_stmt_prepare_ok.rs | 1 - .../packets/binary/com_stmt_prepare_resp.rs | 5 ++--- .../protocol/packets/binary/result_row.rs | 2 +- src/mariadb/protocol/packets/column.rs | 2 +- src/mariadb/protocol/packets/column_def.rs | 1 - src/mariadb/protocol/packets/eof.rs | 2 +- src/mariadb/protocol/packets/err.rs | 3 +-- src/mariadb/protocol/packets/initial.rs | 1 - src/mariadb/protocol/packets/ok.rs | 1 - src/mariadb/protocol/packets/result_set.rs | 4 ++-- src/mariadb/protocol/packets/text/result_row.rs | 1 - 13 files changed, 17 insertions(+), 24 deletions(-) diff --git a/src/mariadb/connection/establish.rs b/src/mariadb/connection/establish.rs index f52d5571..8c595e9d 100644 --- a/src/mariadb/connection/establish.rs +++ b/src/mariadb/connection/establish.rs @@ -53,7 +53,7 @@ mod test { use crate::mariadb::{ComStmtFetch, ComStmtPrepareResp, FieldType, ResultSet}; use failure::Error; - #[runtime::test] + #[tokio::test] async fn it_can_connect() -> Result<(), Error> { let mut conn = Connection::establish(&"mariadb://root@localhost:3306") .await?; @@ -61,7 +61,7 @@ mod test { Ok(()) } - #[runtime::test] + #[tokio::test] async fn it_can_ping() -> Result<(), Error> { let mut conn = Connection::establish(&"mariadb://root@localhost:3306") @@ -72,7 +72,7 @@ mod test { Ok(()) } - #[runtime::test] + #[tokio::test] async fn it_can_select_db() -> Result<(), Error> { let mut conn = Connection::establish(&"mariadb://root@localhost:3306") .await?; @@ -82,7 +82,7 @@ mod test { Ok(()) } - #[runtime::test] + #[tokio::test] async fn it_can_query() -> Result<(), Error> { let mut conn = Connection::establish(&"mariadb://root@localhost:3306") .await?; @@ -94,7 +94,7 @@ mod test { Ok(()) } - #[runtime::test] + #[tokio::test] async fn it_can_prepare() -> Result<(), Error> { let mut conn = Connection::establish(&"mariadb://root@localhost:3306") .await?; @@ -107,7 +107,7 @@ mod test { Ok(()) } - #[runtime::test] + #[tokio::test] async fn it_can_execute_prepared() -> Result<(), Error> { let mut conn = Connection::establish(&"mariadb://root@localhost:3306") .await?; @@ -120,7 +120,7 @@ mod test { let exec = ComStmtExec { stmt_id: prepared.ok.stmt_id, - flags: StmtExecFlag::NoCursor, + flags: StmtExecFlag::NO_CURSOR, params: Some(vec![Some(Bytes::from_static(b"josh"))]), param_defs: prepared.param_defs, }; @@ -150,7 +150,7 @@ mod test { Ok(()) } - #[runtime::test] + #[tokio::test] async fn it_does_not_connect() -> Result<(), Error> { match Connection::establish(&"mariadb//roote@localhost:3306") .await diff --git a/src/mariadb/protocol/packets/binary/com_stmt_exec.rs b/src/mariadb/protocol/packets/binary/com_stmt_exec.rs index 2f2385da..e2c09a4a 100644 --- a/src/mariadb/protocol/packets/binary/com_stmt_exec.rs +++ b/src/mariadb/protocol/packets/binary/com_stmt_exec.rs @@ -82,7 +82,7 @@ mod tests { ComStmtExec { stmt_id: 1, - flags: StmtExecFlag::NoCursor, + flags: StmtExecFlag::NO_CURSOR, params: Some(vec![Some(Bytes::from_static(b"\x06daniel"))]), param_defs: Some(vec![ColumnDefPacket { catalog: Bytes::from_static(b"def"), diff --git a/src/mariadb/protocol/packets/binary/com_stmt_prepare_ok.rs b/src/mariadb/protocol/packets/binary/com_stmt_prepare_ok.rs index 63b96fd6..1ef3709f 100644 --- a/src/mariadb/protocol/packets/binary/com_stmt_prepare_ok.rs +++ b/src/mariadb/protocol/packets/binary/com_stmt_prepare_ok.rs @@ -41,7 +41,6 @@ mod tests { use crate::{ __bytes_builder, mariadb::{ConnContext, DeContext, Decode}, - ConnectOptions, }; use bytes::Bytes; diff --git a/src/mariadb/protocol/packets/binary/com_stmt_prepare_resp.rs b/src/mariadb/protocol/packets/binary/com_stmt_prepare_resp.rs index ff335948..372a5d8c 100644 --- a/src/mariadb/protocol/packets/binary/com_stmt_prepare_resp.rs +++ b/src/mariadb/protocol/packets/binary/com_stmt_prepare_resp.rs @@ -73,10 +73,9 @@ mod test { use crate::{ __bytes_builder, mariadb::{ConnContext, DeContext, Decode}, - ConnectOptions, }; - #[runtime::test] + #[tokio::test] async fn it_decodes_com_stmt_prepare_resp_eof() -> Result<(), failure::Error> { #[rustfmt::skip] let buf = __bytes_builder!( @@ -182,7 +181,7 @@ mod test { Ok(()) } - #[runtime::test] + #[tokio::test] async fn it_decodes_com_stmt_prepare_resp() -> Result<(), failure::Error> { #[rustfmt::skip] let buf = __bytes_builder!( diff --git a/src/mariadb/protocol/packets/binary/result_row.rs b/src/mariadb/protocol/packets/binary/result_row.rs index a43add17..b54396e1 100644 --- a/src/mariadb/protocol/packets/binary/result_row.rs +++ b/src/mariadb/protocol/packets/binary/result_row.rs @@ -99,7 +99,7 @@ impl crate::mariadb::Decode for ResultRow { FieldType::MYSQL_TYPE_JSON => Some(decoder.decode_byte_lenenc()), FieldType::MYSQL_TYPE_ENUM => Some(decoder.decode_byte_lenenc()), FieldType::MYSQL_TYPE_SET => Some(decoder.decode_byte_lenenc()), - _ => panic!("Unrecognized FieldType received from MaraiDB"), + _ => panic!("Unrecognized FieldType received from MariaDB"), } } }) diff --git a/src/mariadb/protocol/packets/column.rs b/src/mariadb/protocol/packets/column.rs index 6c63e10d..c647ac56 100644 --- a/src/mariadb/protocol/packets/column.rs +++ b/src/mariadb/protocol/packets/column.rs @@ -40,7 +40,7 @@ mod test { use super::*; use crate::{ - ConnectOptions, __bytes_builder, + __bytes_builder, mariadb::{connection::ConnContext, protocol::decode::Decoder}, }; diff --git a/src/mariadb/protocol/packets/column_def.rs b/src/mariadb/protocol/packets/column_def.rs index 1c14e70f..1e991fa3 100644 --- a/src/mariadb/protocol/packets/column_def.rs +++ b/src/mariadb/protocol/packets/column_def.rs @@ -77,7 +77,6 @@ mod test { use crate::{ __bytes_builder, mariadb::{ConnContext, Decoder}, - ConnectOptions, }; use bytes::Bytes; diff --git a/src/mariadb/protocol/packets/eof.rs b/src/mariadb/protocol/packets/eof.rs index fd6b94b8..a142d95b 100644 --- a/src/mariadb/protocol/packets/eof.rs +++ b/src/mariadb/protocol/packets/eof.rs @@ -39,7 +39,7 @@ impl Decode for EofPacket { #[cfg(test)] mod test { use super::*; - use crate::{__bytes_builder, mariadb::ConnContext, ConnectOptions}; + use crate::{__bytes_builder, mariadb::ConnContext}; use bytes::Bytes; #[test] diff --git a/src/mariadb/protocol/packets/err.rs b/src/mariadb/protocol/packets/err.rs index c24ba27c..bbb2fbd6 100644 --- a/src/mariadb/protocol/packets/err.rs +++ b/src/mariadb/protocol/packets/err.rs @@ -91,8 +91,7 @@ mod test { use super::*; use crate::{ __bytes_builder, - mariadb::{ConnContext, Decoder}, - ConnectOptions, + mariadb::{ConnContext, Decoder} }; #[test] diff --git a/src/mariadb/protocol/packets/initial.rs b/src/mariadb/protocol/packets/initial.rs index ff91864e..afe1f6a5 100644 --- a/src/mariadb/protocol/packets/initial.rs +++ b/src/mariadb/protocol/packets/initial.rs @@ -103,7 +103,6 @@ mod test { use crate::{ __bytes_builder, mariadb::{ConnContext, Decoder}, - ConnectOptions, }; use bytes::BytesMut; diff --git a/src/mariadb/protocol/packets/ok.rs b/src/mariadb/protocol/packets/ok.rs index 48d2cb60..402b7599 100644 --- a/src/mariadb/protocol/packets/ok.rs +++ b/src/mariadb/protocol/packets/ok.rs @@ -64,7 +64,6 @@ mod test { use crate::{ __bytes_builder, mariadb::{ConnContext, Decoder}, - ConnectOptions, }; #[test] diff --git a/src/mariadb/protocol/packets/result_set.rs b/src/mariadb/protocol/packets/result_set.rs index 2aefbf53..0e69e8c2 100644 --- a/src/mariadb/protocol/packets/result_set.rs +++ b/src/mariadb/protocol/packets/result_set.rs @@ -124,7 +124,7 @@ mod test { }, }; - #[runtime::test] + #[tokio::test] async fn it_decodes_result_set_text_packet() -> Result<(), Error> { // TODO: Use byte string as input for test; this is a valid return from a mariadb. #[rustfmt::skip] @@ -344,7 +344,7 @@ mod test { Ok(()) } - #[runtime::test] + #[tokio::test] async fn it_decodes_result_set_binary_packet() -> Result<(), Error> { // TODO: Use byte string as input for test; this is a valid return from a mariadb. #[rustfmt::skip] diff --git a/src/mariadb/protocol/packets/text/result_row.rs b/src/mariadb/protocol/packets/text/result_row.rs index de38cfe8..3289fa82 100644 --- a/src/mariadb/protocol/packets/text/result_row.rs +++ b/src/mariadb/protocol/packets/text/result_row.rs @@ -39,7 +39,6 @@ mod test { use crate::{ __bytes_builder, mariadb::{ConnContext, Decoder}, - ConnectOptions, }; use bytes::Bytes;