From 982d03c374bf317a0c91278741477144c58bab7b Mon Sep 17 00:00:00 2001 From: Mostafa Date: Sun, 1 Sep 2024 15:41:33 -0500 Subject: [PATCH] fix syntax --- src/client.rs | 6 +++--- src/messages.rs | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/client.rs b/src/client.rs index a5d543a..7d56ca3 100644 --- a/src/client.rs +++ b/src/client.rs @@ -1730,7 +1730,7 @@ where fn buffer_parse(&mut self, message: BytesMut, pool: &ConnectionPool) -> Result<(), Error> { // Avoid parsing if prepared statements not enabled let client_given_name = Parse::get_name(&message)?; - if !self.prepared_statements_enabled || client_given_name.len() == 0 { + if !self.prepared_statements_enabled || client_given_name.is_empty() { debug!("Anonymous parse message"); self.extended_protocol_data_buffer .push_back(ExtendedProtocolData::create_new_parse(message, None)); @@ -1774,7 +1774,7 @@ where async fn buffer_bind(&mut self, message: BytesMut) -> Result<(), Error> { // Avoid parsing if prepared statements not enabled let client_given_name = Bind::get_name(&message)?; - if !self.prepared_statements_enabled || client_given_name.len() == 0 { + if !self.prepared_statements_enabled || client_given_name.is_empty() { debug!("Anonymous bind message"); self.extended_protocol_data_buffer .push_back(ExtendedProtocolData::create_new_bind(message, None)); @@ -1833,7 +1833,7 @@ where let describe: Describe = (&message).try_into()?; let client_given_name = describe.statement_name.clone(); - if describe.target == 'P' || client_given_name.len() == 0 { + if describe.target == 'P' || client_given_name.is_empty() { debug!("Portal describe message"); self.extended_protocol_data_buffer .push_back(ExtendedProtocolData::create_new_describe(message, None)); diff --git a/src/messages.rs b/src/messages.rs index 042df0e..24c29fe 100644 --- a/src/messages.rs +++ b/src/messages.rs @@ -952,7 +952,7 @@ pub struct Bind { num_param_values: u16, param_values: Vec<(i32, BytesMut)>, num_result_column_format_codes: u16, - result_columns_format_codes: Vec, + result_columns_format_codes: Vec, } impl TryFrom<&BytesMut> for Bind { @@ -968,14 +968,14 @@ impl TryFrom<&BytesMut> for Bind { let mut param_format_codes = Vec::new(); for _ in 0..num_param_format_codes { - param_format_codes.push(cursor.get_u16()); + param_format_codes.push(cursor.get_i16()); } let num_param_values = cursor.get_u16(); let mut param_values = Vec::new(); for _ in 0..num_param_values { - let param_len = cursor.get_u32(); + let param_len = cursor.get_i32(); // There is special occasion when the parameter is NULL // In that case, param length is defined as -1 // So if the passed parameter len is over 0 @@ -997,7 +997,7 @@ impl TryFrom<&BytesMut> for Bind { let mut result_columns_format_codes = Vec::new(); for _ in 0..num_result_column_format_codes { - result_columns_format_codes.push(cursor.get_u16()); + result_columns_format_codes.push(cursor.get_i16()); } Ok(Bind { @@ -1046,16 +1046,16 @@ impl TryFrom for BytesMut { bytes.put_slice(prepared_statement); bytes.put_u16(bind.num_param_format_codes); for param_format_code in bind.param_format_codes { - bytes.put_u16(param_format_code); + bytes.put_i16(param_format_code); } bytes.put_u16(bind.num_param_values); for (param_len, param) in bind.param_values { - bytes.put_u32(param_len); + bytes.put_i32(param_len); bytes.put_slice(¶m); } bytes.put_u16(bind.num_result_column_format_codes); for result_column_format_code in bind.result_columns_format_codes { - bytes.put_u16(result_column_format_code); + bytes.put_i16(result_column_format_code); } Ok(bytes)