Refactor ConnectOptions to use FromStr and update auth plugin names

Co-authored-by: contact <[email protected]>

Author: cursoragent

sqlx-core/src/connection.rs

@@ -116,6 +116,7 @@ pub trait Connection: Send {
     fn connect(url: &str) -> BoxFuture<'static, Result<Self, Error>>
     where
         Self: Sized,
+        Self::Options: FromStr<Err = Error>,
     {
         let options = url.parse();
 
@@ -161,19 +162,28 @@ impl LogSettings {
 pub trait ConnectOptions: Sized + Send + Sync + 'static {
     type Connection: Connection;
 
-    fn from_url(url: &str) -> Result<Self, Error>;
+    fn from_url(url: &str) -> Result<Self, Error>
+    where
+        Self: std::str::FromStr<Err = Error>,
+    {
+        Self::from_str(url)
+    }
 
     fn connect(&self) -> BoxFuture<'_, Result<Self::Connection, Error>>;
 
-    fn connect_with(options: &Self) -> BoxFuture<'_, Result<Self::Connection, Error>>;
+    fn connect_with(options: &Self) -> BoxFuture<'_, Result<Self::Connection, Error>> {
+        options.connect()
+    }
 
-    fn from_env() -> Result<Self, Error> {
-        let options = Self::from_url(&std::env::var("DATABASE_URL")?)?;
-        Box::pin(async move { Self::connect_with(&options?).await })
+    fn from_env() -> Result<Self, Error>
+    where
+        Self: std::str::FromStr<Err = Error>,
+    {
+        let url = std::env::var("DATABASE_URL").map_err(Error::config)?;
+        Self::from_str(&url)
     }
 
-    fn create_pool(
-        &self,
-        options: crate::pool::PoolOptions<Self::Connection>,
-    ) -> Result<crate::pool::Pool<Self::Connection>, Error>;
+    fn log_statements(&mut self, level: LevelFilter) -> &mut Self;
+
+    fn log_slow_statements(&mut self, level: LevelFilter, duration: Duration) -> &mut Self;
 }

sqlx-core/src/mysql/protocol/connect/handshake.rs

@@ -133,10 +133,7 @@ fn test_decode_handshake_mysql_8_0_18() {
     assert_eq!(p.server_default_collation, 255);
     assert!(p.status.contains(Status::SERVER_STATUS_AUTOCOMMIT));
 
-    assert!(matches!(
-        p.auth_plugin,
-        Some(AuthPlugin::CachingSha2Password)
-    ));
+    assert!(matches!(p.auth_plugin, Some(AuthPlugin::CachingSha2)));
 
     assert_eq!(
         &*p.auth_plugin_data.into_iter().collect::<Vec<_>>(),
@@ -186,10 +183,7 @@ fn test_decode_handshake_mariadb_10_4_7() {
 
     assert_eq!(p.server_default_collation, 8);
     assert!(p.status.contains(Status::SERVER_STATUS_AUTOCOMMIT));
-    assert!(matches!(
-        p.auth_plugin,
-        Some(AuthPlugin::MySqlNativePassword)
-    ));
+    assert!(matches!(p.auth_plugin, Some(AuthPlugin::MySqlNative)));
 
     assert_eq!(
         &*p.auth_plugin_data.into_iter().collect::<Vec<_>>(),

sqlx-core/src/pool/mod.rs

@@ -265,7 +265,10 @@ impl<DB: Database> Pool<DB> {
     /// For production applications, you'll likely want to make at least few tweaks.
     ///
     /// See [`PoolOptions::new()`] for details.
-    pub async fn connect(url: &str) -> Result<Self, Error> {
+    pub async fn connect(url: &str) -> Result<Self, Error>
+    where
+        <DB::Connection as Connection>::Options: std::str::FromStr<Err = Error>,
+    {
         PoolOptions::<DB>::new().connect(url).await
     }
 
@@ -298,7 +301,10 @@ impl<DB: Database> Pool<DB> {
     /// For production applications, you'll likely want to make at least few tweaks.
     ///
     /// See [`PoolOptions::new()`] for details.
-    pub fn connect_lazy(url: &str) -> Result<Self, Error> {
+    pub fn connect_lazy(url: &str) -> Result<Self, Error>
+    where
+        <DB::Connection as Connection>::Options: std::str::FromStr<Err = Error>,
+    {
         PoolOptions::<DB>::new().connect_lazy(url)
     }
 

sqlx-core/src/pool/options.rs

@@ -428,7 +428,10 @@ impl<DB: Database> PoolOptions<DB> {
     /// * MySQL: [`MySqlConnectOptions`][crate::mysql::MySqlConnectOptions]
     /// * SQLite: [`SqliteConnectOptions`][crate::sqlite::SqliteConnectOptions]
     /// * MSSQL: [`MssqlConnectOptions`][crate::mssql::MssqlConnectOptions]
-    pub async fn connect(self, url: &str) -> Result<Pool<DB>, Error> {
+    pub async fn connect(self, url: &str) -> Result<Pool<DB>, Error>
+    where
+        <DB::Connection as Connection>::Options: std::str::FromStr<Err = Error>,
+    {
         self.connect_with(url.parse()?).await
     }
 
@@ -471,7 +474,10 @@ impl<DB: Database> PoolOptions<DB> {
     /// * MySQL: [`MySqlConnectOptions`][crate::mysql::MySqlConnectOptions]
     /// * SQLite: [`SqliteConnectOptions`][crate::sqlite::SqliteConnectOptions]
     /// * MSSQL: [`MssqlConnectOptions`][crate::mssql::MssqlConnectOptions]
-    pub fn connect_lazy(self, url: &str) -> Result<Pool<DB>, Error> {
+    pub fn connect_lazy(self, url: &str) -> Result<Pool<DB>, Error>
+    where
+        <DB::Connection as Connection>::Options: std::str::FromStr<Err = Error>,
+    {
         Ok(self.connect_lazy_with(url.parse()?))
     }