formatter and added more logs

Sanctum-AI · Jun 18, 2024 · 3a54550 · 3a54550
1 parent c290da9
commit 3a54550
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/examples/example.rs b/examples/example.rs
@@ -6,7 +6,7 @@ use sqlx_tokio::postgres::PgPoolOptions;
 
 use pg_embed::pg_access::PgAccess;
 use pg_embed::pg_enums::PgAuthMethod;
-use pg_embed::pg_fetch::{PG_V16, PgFetchSettings};
+use pg_embed::pg_fetch::{PgFetchSettings, PG_V16};
 use pg_embed::postgres::{PgEmbed, PgSettings};
 
 #[tokio::main]
@@ -58,7 +58,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
         .connect(&pg.full_db_uri("database_name"))
         .await?;
 
-    let row: (i64, ) = sqlx_tokio::query_as("SELECT $1")
+    let row: (i64,) = sqlx_tokio::query_as("SELECT $1")
         .bind(150_i64)
         .fetch_one(&pool)
         .await?;

diff --git a/src/command_executor.rs b/src/command_executor.rs
@@ -64,7 +64,7 @@ where
     ///
     fn new<A, B>(executable_path: &OsStr, args: A, process_type: P) -> Result<Self, E>
     where
-        A: IntoIterator<Item = B>,
+        A: IntoIterator<Item=B>,
         B: AsRef<OsStr>;
     ///
     /// Execute command
@@ -113,11 +113,12 @@ where
     /// Generate a command
     fn generate_command<A, B>(executable_path: &OsStr, args: A) -> tokio::process::Command
     where
-        A: IntoIterator<Item = B>,
+        A: IntoIterator<Item=B>,
         B: AsRef<OsStr>,
     {
         let mut command = tokio::process::Command::new(executable_path);
         command.args(args);
+        log::info!("command: {:?}", command);
         #[cfg(target_os = "windows")]
         {
             const CREATE_NO_WINDOW: u32 = 0x08000000;
@@ -205,7 +206,7 @@ where
 {
     fn new<A, B>(executable_path: &OsStr, args: A, process_type: P) -> Result<Self, E>
     where
-        A: IntoIterator<Item = B>,
+        A: IntoIterator<Item=B>,
         B: AsRef<OsStr>,
     {
         let mut _command = Self::generate_command(executable_path, args);

diff --git a/src/pg_access.rs b/src/pg_access.rs
@@ -123,15 +123,12 @@ impl PgAccess {
                 format!("arch_{}", fetch_settings.operating_system)
             }
         };
-        let pg_path = format!(
-            "{}/{}/{}/{}",
-            PG_EMBED_CACHE_DIR_NAME,
-            os_string,
-            fetch_settings.architecture,
-            fetch_settings.version.0
-        );
-        let mut cache_pg_embed = cache_dir.clone();
-        cache_pg_embed.push(pg_path);
+        let cache_pg_embed = cache_dir
+            .clone()
+            .join(PG_EMBED_CACHE_DIR_NAME)
+            .join(os_string)
+            .join(fetch_settings.architecture.to_string())
+            .join(fetch_settings.version.0);
         std::fs::create_dir_all(&cache_pg_embed).map_err(|e| PgEmbedError::DirCreationError {
             dir: cache_pg_embed.clone(),
             e,

diff --git a/tests/common.rs b/tests/common.rs
@@ -5,7 +5,7 @@ use env_logger::Env;
 
 use pg_embed::pg_enums::PgAuthMethod;
 use pg_embed::pg_errors::PgEmbedError;
-use pg_embed::pg_fetch::{PG_V15, PgFetchSettings};
+use pg_embed::pg_fetch::{PgFetchSettings, PG_V15};
 use pg_embed::postgres::{PgEmbed, PgSettings};
 
 pub async fn setup(

diff --git a/tests/migration_tokio.rs b/tests/migration_tokio.rs
@@ -1,14 +1,14 @@
 use std::path::PathBuf;
 
 use serial_test::serial;
+#[cfg(feature = "sqlx_tokio")]
+use sqlx_tokio::{Connection, PgConnection};
 
 use pg_embed::pg_errors::PgEmbedError;
 #[cfg(feature = "sqlx_actix")]
 use sqlx_actix::{Connection, PgConnection};
 #[cfg(feature = "sqlx_async_std")]
 use sqlx_async_std::{Connection, PgConnection};
-#[cfg(feature = "sqlx_tokio")]
-use sqlx_tokio::{Connection, PgConnection};
 
 #[path = "common.rs"]
 mod common;
@@ -49,7 +49,7 @@ async fn db_migration() -> Result<(), PgEmbedError> {
         false,
         Some(PathBuf::from("migration_test")),
     )
-    .await?;
+        .await?;
     pg.start_db().await?;
     let db_name = "test";
     pg.create_database(&db_name).await?;