Merge pull request #38 from outersky/mysql-25

.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 }
 

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
 

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"

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 {