Expose mysql test connection setup helper

Summary:
## This stack
This stack is working on T223577767, i.e. logging telemetry from SQL queries to the metadata XDB.

This and the next few diffs will be focused on testing.

## This diff
Extract the function that sets up a MySQL test connection to the tests_lib crate, so we can reuse it when we add the first functional unit tests in `mononoke_queries.rs` (D77935148).

Reviewed By: YousefSalama

Differential Revision: D77932383

fbshipit-source-id: 0f8660bc07b9506af037357f9ab7dfbe4f3b1cd2

Author: gustavoavena

shed/sql/src/lib.rs

@@ -58,7 +58,6 @@
 
 #[cfg(test)]
 mod tests;
-
 pub use anyhow;
 pub use cloned;
 pub use frunk::HList;

shed/sql/src/tests.rs

@@ -79,16 +79,10 @@ async fn test_visibility_modifiers_compile_with_sqlite() {
 #[cfg(fbcode_build)]
 #[cfg(test)]
 mod mysql {
-    use std::sync::Arc;
 
-    use anyhow::Error;
     use anyhow::Result;
     use fbinit::FacebookInit;
-    use mysql_client::ConnectionPool;
-    use mysql_client::ConnectionPoolOptionsBuilder;
-    use mysql_client::DbLocator;
-    use mysql_client::InstanceRequirement;
-    use mysql_client::MysqlCppClient;
+    use sql_tests_lib::mysql_test_lib::setup_mysql_test_connection;
     use sql_tests_lib::mysql_test_lib::test_basic_read_query_telemetry;
     use sql_tests_lib::mysql_test_lib::test_basic_write_query_telemetry;
     use sql_tests_lib::mysql_test_lib::test_transaction_read_query_telemetry;
@@ -97,35 +91,19 @@ mod mysql {
     use sql_tests_lib::test_basic_transaction;
 
     use super::*;
-    use crate::sql_common::mysql::Connection as MysqlConnection;
-    use crate::sql_common::mysql::ConnectionStats;
 
     async fn setup_connection(fb: FacebookInit) -> Result<Connection> {
-        let locator = DbLocator::new("xdb.dbclient_test.1", InstanceRequirement::Master)?;
-        let client = MysqlCppClient::new(fb)?;
-
-        client
-            .query_raw(
-                &locator,
-                "CREATE TABLE IF NOT EXISTS foo(
-                    x INT,
-                    y DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                    test CHAR(64),
-                    id INT AUTO_INCREMENT,
-                    PRIMARY KEY(id)
-                )",
-            )
-            .await?;
-
-        let pool_options = ConnectionPoolOptionsBuilder::default()
-            .pool_limit(1)
-            .build()
-            .map_err(Error::msg)?;
-        let pool = ConnectionPool::new(&client, &pool_options)?.bind(locator);
-
-        let stats = Arc::new(ConnectionStats::new("test".to_string()));
-        let conn = MysqlConnection::new(pool, stats);
-        Ok(Connection::from(conn))
+        setup_mysql_test_connection(
+            fb,
+            "CREATE TABLE IF NOT EXISTS foo(
+                x INT,
+                y DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                test CHAR(64),
+                id INT AUTO_INCREMENT,
+                PRIMARY KEY(id)
+            )",
+        )
+        .await
     }
 
     #[fbinit::test]

shed/sql/tests_lib/Cargo.toml

@@ -14,6 +14,8 @@ license = "MIT OR Apache-2.0"
 path = "lib.rs"
 
 [dependencies]
+anyhow = "1.0.98"
 chrono = { version = "0.4.41", features = ["clock", "serde", "std"], default-features = false }
+fbinit = { version = "0.2.0", path = "../../fbinit" }
 rand = { version = "0.8", features = ["small_rng"] }
 sql = { version = "0.1.0", path = ".." }

shed/sql/tests_lib/lib.rs

@@ -323,12 +323,24 @@ pub async fn test_query_visibility_modifiers_compile(conn: Connection) {
 
 #[cfg(fbcode_build)]
 pub mod mysql_test_lib {
+    use std::sync::Arc;
+
+    use anyhow::Error;
+    use fbinit::FacebookInit;
+    use mysql_client::ConnectionPool;
+    use mysql_client::ConnectionPoolOptionsBuilder;
+    use mysql_client::DbLocator;
+    use mysql_client::InstanceRequirement;
+    use mysql_client::MysqlCppClient;
     use sql::QueryTelemetry;
     use sql::anyhow::Result;
     use sql::anyhow::anyhow;
+    use sql::mysql::Connection as MysqlConnection;
     use sql::mysql::MysqlQueryTelemetry;
+    use sql::sql_common::mysql::ConnectionStats as MysqlConnectionStats;
 
     use super::*;
+    use crate::Connection;
 
     pub async fn test_basic_read_query_telemetry(conn: Connection) -> Result<(), Error> {
         let (_res, opt_tel) = TestQuery4::commented_query(&conn, "comment", &1, &3).await?;
@@ -414,4 +426,24 @@ pub mod mysql_test_lib {
         assert_eq!(tel.write_tables().iter().collect::<Vec<_>>(), write_tables);
         assert!(!tel.wait_stats().is_empty());
     }
+
+    pub async fn setup_mysql_test_connection(
+        fb: FacebookInit,
+        table_creation_query: &str,
+    ) -> Result<Connection> {
+        let locator = DbLocator::new("xdb.dbclient_test.1", InstanceRequirement::Master)?;
+        let client = MysqlCppClient::new(fb)?;
+
+        client.query_raw(&locator, table_creation_query).await?;
+
+        let pool_options = ConnectionPoolOptionsBuilder::default()
+            .pool_limit(1)
+            .build()
+            .map_err(Error::msg)?;
+        let pool = ConnectionPool::new(&client, &pool_options)?.bind(locator);
+
+        let stats = Arc::new(MysqlConnectionStats::new("test".to_string()));
+        let conn = MysqlConnection::new(pool, stats);
+        Ok(Connection::from(conn))
+    }
 }