From 2925f6ee59ccc07115dd28ccb7ecec7d64d446bc Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Wed, 5 Jun 2024 05:20:13 +0100
Subject: [PATCH] update mysql dependency to 25

---
 .github/workflows/ci.yml | 2 +-
 CHANGELOG.md             | 3 ++-
 Cargo.toml               | 8 ++++----
 src/pool.rs              | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 29fe461..30b913f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - { name: msrv, version: 1.68.0 }
+          - { name: msrv, version: 1.70.0 }
           - { name: stable, version: stable }
           - { name: nightly, version: nightly }
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3edddb..9daa2c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,8 @@
 
 ## Unreleased
 
-- Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
+- Update `mysql` dependency to `25`.
+- Minimum supported Rust version (MSRV) is now 1.70 to align with `mysql` dependency.
 
 ## 24.0.0
 
diff --git a/Cargo.toml b/Cargo.toml
index e61c5a9..d8a70c0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "r2d2_mysql"
-version = "24.0.0"
+version = "25.0.0"
 authors = ["outersky <outersky@gmail.com>"]
 license = "MIT"
 description = "MySQL support for the r2d2 connection pool"
-repository = "https://github.com/outersky/r2d2-mysql.git"
+repository = "https://github.com/outersky/r2d2-mysql"
 keywords = ["mysql", "sql", "pool", "database", "r2d2"]
 edition = "2021"
-rust-version = "1.68"
+rust-version = "1.70"
 
 [dependencies]
 r2d2 = "0.8.9"
-mysql = "24"
+mysql = "25"
diff --git a/src/pool.rs b/src/pool.rs
index b875a17..961fe8d 100644
--- a/src/pool.rs
+++ b/src/pool.rs
@@ -2,7 +2,7 @@
 //!
 //! See [`MySqlConnectionManager`].
 
-use mysql::{error::Error, prelude::*, Conn, Opts, OptsBuilder};
+use mysql::{error::Error, Conn, Opts, OptsBuilder};
 
 /// An [`r2d2`] connection manager for [`mysql`] connections.
 #[derive(Clone, Debug)]
@@ -28,7 +28,7 @@ impl r2d2::ManageConnection for MySqlConnectionManager {
     }
 
     fn is_valid(&self, conn: &mut Conn) -> Result<(), Error> {
-        conn.query("SELECT version()").map(|_: Vec<String>| ())
+        conn.ping()
     }
 
     fn has_broken(&self, conn: &mut Conn) -> bool {