Fix close

Author: zainkabani

src/client.rs

@@ -987,19 +987,6 @@ where
                     continue;
                 }
 
-                // Close (F)
-                'C' => {
-                    if self.prepared_statements_enabled {
-                        let close: Close = (&message).try_into()?;
-
-                        if close.is_prepared_statement() && !close.anonymous() {
-                            self.prepared_statements.remove(&close.name);
-                            write_all_flush(&mut self.write, &close_complete()).await?;
-                            continue;
-                        }
-                    }
-                }
-
                 _ => (),
             }
 
@@ -1444,11 +1431,18 @@ where
                     // Close the prepared statement.
                     'C' => {
                         if self.prepared_statements_enabled {
-                            let close: Close = (&message).try_into()?;
+                            let mut close: Close = (&message).try_into()?;
 
                             if close.is_prepared_statement() && !close.anonymous() {
-                                server.remove_prepared_statement_from_cache(&close.name);
-                                self.prepared_statements.remove(&close.name);
+                                if let Some((parse, _)) =
+                                    self.prepared_statements.remove(&close.name)
+                                {
+                                    // Tell server we're closing this statement
+                                    server.remove_prepared_statement_from_cache(&parse.name);
+
+                                    close.rename(&parse.name);
+                                    message = close.try_into()?
+                                }
                             }
                         }
 

src/messages.rs

@@ -858,8 +858,8 @@ impl Parse {
     /// Gets the name of the prepared statement from the buffer
     pub fn get_name(buf: &BytesMut) -> Result<String, Error> {
         let mut cursor = Cursor::new(buf);
-        cursor.get_u8();
-        cursor.get_i32();
+        // Skip the code and length
+        cursor.advance(mem::size_of::<u8>() + mem::size_of::<i32>());
         cursor.read_string()
     }
 
@@ -1031,8 +1031,8 @@ impl Bind {
     /// Gets the name of the prepared statement from the buffer
     pub fn get_name(buf: &BytesMut) -> Result<String, Error> {
         let mut cursor = Cursor::new(buf);
-        cursor.get_u8();
-        cursor.get_i32();
+        // Skip the code and length
+        cursor.advance(mem::size_of::<u8>() + mem::size_of::<i32>());
         cursor.read_string()?;
         cursor.read_string()
     }
@@ -1188,6 +1188,10 @@ impl Close {
         }
     }
 
+    pub fn rename(&mut self, name: &str) {
+        self.name = name.to_string();
+    }
+
     pub fn is_prepared_statement(&self) -> bool {
         self.close_type == 'S'
     }