From 76e78b11f00be4429a6c36287b9d18592fc4c9c8 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Sun, 9 Jul 2023 00:51:22 +0100
Subject: [PATCH] feat!: ping and select_db return Result

---
 src/conn/mod.rs      | 30 +++++++++++++-----------------
 src/conn/pool/mod.rs |  2 +-
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/conn/mod.rs b/src/conn/mod.rs
index c009b53..37920f8 100644
--- a/src/conn/mod.rs
+++ b/src/conn/mod.rs
@@ -1084,22 +1084,18 @@ impl Conn {
         self.handle_result_set()
     }
 
-    /// Executes [`COM_PING`](http://dev.mysql.com/doc/internals/en/com-ping.html)
+    /// Executes [`COM_PING`](https://dev.mysql.com/doc/dev/mysql-server/latest/page_protocol_com_ping.html)
     /// on `Conn`. Return `true` on success or `false` on error.
-    pub fn ping(&mut self) -> bool {
-        match self.write_command(Command::COM_PING, &[]) {
-            Ok(_) => self.drop_packet().is_ok(),
-            _ => false,
-        }
+    pub fn ping(&mut self) -> Result<(), Error> {
+        self.write_command(Command::COM_PING, &[])?;
+        self.drop_packet()
     }
 
-    /// Executes [`COM_INIT_DB`](https://dev.mysql.com/doc/internals/en/com-init-db.html)
+    /// Executes [`COM_INIT_DB`](https://dev.mysql.com/doc/dev/mysql-server/latest/page_protocol_com_init_db.html)
     /// on `Conn`.
-    pub fn select_db(&mut self, schema: &str) -> bool {
-        match self.write_command(Command::COM_INIT_DB, schema.as_bytes()) {
-            Ok(_) => self.drop_packet().is_ok(),
-            _ => false,
-        }
+    pub fn select_db(&mut self, schema: &str) -> Result<(), Error> {
+        self.write_command(Command::COM_INIT_DB, schema.as_bytes())?;
+        self.drop_packet()
     }
 
     /// Starts new transaction with provided options.
@@ -1358,7 +1354,7 @@ mod test {
                 .unwrap()
                 .unwrap();
             assert!(mode.contains("TRADITIONAL"));
-            assert!(conn.ping());
+            assert!(conn.ping().is_ok());
 
             if crate::test_misc::test_compression() {
                 assert!(format!("{:?}", conn.0.stream).contains("Compression"));
@@ -1522,7 +1518,7 @@ mod test {
         fn should_connect_by_hostname() {
             let opts = OptsBuilder::from_opts(get_opts()).ip_or_hostname(Some("localhost"));
             let mut conn = Conn::new(opts).unwrap();
-            assert!(conn.ping());
+            assert!(conn.ping().is_ok());
         }
 
         #[test]
@@ -1532,7 +1528,7 @@ mod test {
             let mut conn = Conn::new(get_opts()).unwrap();
             conn.query_drop(format!("CREATE DATABASE IF NOT EXISTS {}", DB_NAME))
                 .unwrap();
-            assert!(conn.select_db(DB_NAME));
+            assert!(conn.select_db(DB_NAME).is_ok());
 
             let db_name: String = conn.query_first("SELECT DATABASE()").unwrap().unwrap();
             assert_eq!(db_name, DB_NAME);
@@ -2181,7 +2177,7 @@ mod test {
             let opts = OptsBuilder::from_opts(get_opts())
                 .prefer_socket(false)
                 .tcp_connect_timeout(Some(::std::time::Duration::from_millis(1000)));
-            assert!(Conn::new(opts).unwrap().ping());
+            assert!(Conn::new(opts).unwrap().ping().is_ok());
 
             let opts = OptsBuilder::from_opts(get_opts())
                 .prefer_socket(false)
@@ -2238,7 +2234,7 @@ mod test {
                 .bind_address(Some(([127, 0, 0, 1], port)))
                 .tcp_connect_timeout(Some(::std::time::Duration::from_millis(1000)));
             let mut conn = Conn::new(opts).unwrap();
-            assert!(conn.ping());
+            assert!(conn.ping().is_ok());
             let debug_format: String = format!("{:?}", conn);
             let expected_1 = format!("addr: V4(127.0.0.1:{})", port);
             let expected_2 = format!("addr: 127.0.0.1:{}", port);
diff --git a/src/conn/pool/mod.rs b/src/conn/pool/mod.rs
index 2000bd7..f6696aa 100644
--- a/src/conn/pool/mod.rs
+++ b/src/conn/pool/mod.rs
@@ -115,7 +115,7 @@ impl Pool {
             }
         };
 
-        if call_ping && self.inner.opts().check_health() && !conn.ping() {
+        if call_ping && self.inner.opts().check_health() && conn.ping().is_err() {
             // existing connection seem to be dead, retrying..
             self.inner.decrease();
             return self._get_conn(stmt, timeout, call_ping);