Minor code cleanup

Author: weiznich

src/mysql/mod.rs

@@ -45,6 +45,14 @@ impl<'conn, 'query> AsyncConnectionGatWorkaround<'conn, 'query, Mysql> for Async
     type Row = MysqlRow;
 }
 
+const CONNECTION_SETUP_QUERIES: &'static [&'static str] = &[
+    "SET sql_mode=(SELECT CONCAT(@@sql_mode, ',PIPES_AS_CONCAT'))",
+    "SET time_zone = '+00:00';",
+    "SET character_set_client = 'utf8mb4'",
+    "SET character_set_connection = 'utf8mb4'",
+    "SET character_set_results = 'utf8mb4'",
+];
+
 #[async_trait::async_trait]
 impl AsyncConnection for AsyncMysqlConnection {
     type Backend = Mysql;
@@ -55,13 +63,7 @@ impl AsyncConnection for AsyncMysqlConnection {
         let opts = Opts::from_url(database_url)
             .map_err(|e| diesel::result::ConnectionError::InvalidConnectionUrl(e.to_string()))?;
         let builder = OptsBuilder::from_opts(opts)
-            .init(vec![
-                "SET sql_mode=(SELECT CONCAT(@@sql_mode, ',PIPES_AS_CONCAT'))",
-                "SET time_zone = '+00:00';",
-                "SET character_set_client = 'utf8mb4'",
-                "SET character_set_connection = 'utf8mb4'",
-                "SET character_set_results = 'utf8mb4'",
-            ])
+            .init(CONNECTION_SETUP_QUERIES.to_vec())
             .stmt_cache_size(0); // We have our own cache
 
         let conn = mysql_async::Conn::new(builder).await.map_err(ErrorHelper)?;
@@ -86,7 +88,7 @@ impl AsyncConnection for AsyncMysqlConnection {
             + 'query,
     {
         self.with_prepared_statement(source.as_query(), |conn, stmt, binds| async move {
-            let res = conn.exec_iter(&*stmt, binds).await.map_err(ErrorHelper)?;
+            let res = conn.exec_iter(stmt, binds).await.map_err(ErrorHelper)?;
 
             let stream = res
                 .stream_and_drop::<MysqlRow>()
@@ -116,7 +118,7 @@ impl AsyncConnection for AsyncMysqlConnection {
             + 'query,
     {
         self.with_prepared_statement(source, |conn, stmt, binds| async move {
-            conn.exec_drop(&*stmt, binds).await.map_err(ErrorHelper)?;
+            conn.exec_drop(stmt, binds).await.map_err(ErrorHelper)?;
             Ok(conn.affected_rows() as usize)
         })
     }
@@ -169,16 +171,9 @@ impl AsyncMysqlConnection {
             transaction_manager: AnsiTransactionManager::default(),
             last_stmt: None,
         };
-        let setup_statements = vec![
-            "SET sql_mode=(SELECT CONCAT(@@sql_mode, ',PIPES_AS_CONCAT'))",
-            "SET time_zone = '+00:00';",
-            "SET character_set_client = 'utf8mb4'",
-            "SET character_set_connection = 'utf8mb4'",
-            "SET character_set_results = 'utf8mb4'",
-        ];
-
-        for stmt in setup_statements {
-            diesel::sql_query(stmt)
+
+        for stmt in CONNECTION_SETUP_QUERIES {
+            diesel::sql_query(*stmt)
                 .execute(&mut conn)
                 .await
                 .map_err(ConnectionError::CouldntSetupConfiguration)?;

src/mysql/row.rs

@@ -135,7 +135,7 @@ impl<'a> diesel::row::Field<'a, Mysql> for MysqlField<'_> {
     fn value(&self) -> Option<diesel::backend::RawValue<Mysql>> {
         self.value.as_ref().map(|v| {
             MysqlValue::new(
-                &*v,
+                v,
                 convert_type(self.column.column_type(), self.column.flags()),
             )
         })

src/pg/mod.rs

@@ -128,16 +128,7 @@ impl AsyncConnection for AsyncPgConnection {
                 eprintln!("connection error: {}", e);
             }
         });
-        let mut conn = AsyncPgConnection {
-            conn: Arc::new(client),
-            stmt_cache: Arc::new(Mutex::new(StmtCache::new())),
-            transaction_state: AnsiTransactionManager::default(),
-            metadata_cache: Arc::new(Mutex::new(Some(PgMetadataCache::new()))),
-        };
-        conn.set_config_options()
-            .await
-            .map_err(ConnectionError::CouldntSetupConfiguration)?;
-        Ok(conn)
+        Self::try_from(client).await
     }
 
     fn load<'conn, 'query, T>(