From 6c0afe8136afd7f0f08a837e228a7c36224b7040 Mon Sep 17 00:00:00 2001 From: Amit Upadhyay Date: Mon, 30 Dec 2024 14:20:49 +0530 Subject: [PATCH] minor refactor --- fastn-ds/src/lib.rs | 2 +- v0.5/fastn-wasm/src/lib.rs | 4 +--- v0.5/fastn-wasm/src/pg/connect.rs | 2 +- v0.5/fastn-wasm/src/{ => pg}/create_pool.rs | 0 v0.5/fastn-wasm/src/pg/mod.rs | 12 +++++++----- 5 files changed, 10 insertions(+), 10 deletions(-) rename v0.5/fastn-wasm/src/{ => pg}/create_pool.rs (100%) diff --git a/fastn-ds/src/lib.rs b/fastn-ds/src/lib.rs index ba9051b2f7..6a5f16e8f4 100644 --- a/fastn-ds/src/lib.rs +++ b/fastn-ds/src/lib.rs @@ -196,7 +196,7 @@ impl DocumentStore { return Ok(p.get().clone()); } - let pool = fastn_wasm::create_pool(db_path.as_str()).await?; + let pool = fastn_wasm::pg::create_pool(db_path.as_str()).await?; fastn_wasm::insert_or_update(&self.pg_pools, db_path.to_string(), pool.clone()); diff --git a/v0.5/fastn-wasm/src/lib.rs b/v0.5/fastn-wasm/src/lib.rs index e1d986323e..dcd79dccae 100644 --- a/v0.5/fastn-wasm/src/lib.rs +++ b/v0.5/fastn-wasm/src/lib.rs @@ -5,20 +5,18 @@ extern crate self as fastn_wasm; pub(crate) mod aws; -mod create_pool; pub(crate) mod crypto; pub(crate) mod ds; pub(crate) mod env; pub(crate) mod helpers; pub(crate) mod http; pub(crate) mod macros; -mod pg; +pub mod pg; mod process_http_request; pub(crate) mod register; mod sqlite; mod store; -pub use create_pool::create_pool; pub use process_http_request::process_http_request; pub(crate) use store::Conn; pub use store::{ConnectionExt, SQLError, Store, StoreExt, StoreImpl}; diff --git a/v0.5/fastn-wasm/src/pg/connect.rs b/v0.5/fastn-wasm/src/pg/connect.rs index 42088b938c..2a4d782cb5 100644 --- a/v0.5/fastn-wasm/src/pg/connect.rs +++ b/v0.5/fastn-wasm/src/pg/connect.rs @@ -16,7 +16,7 @@ impl fastn_wasm::Store { return match self.pg_pools.get(db_url.as_str()) { Some(pool) => get_client(pool.get(), &mut clients).await, None => { - let pool = fastn_wasm::create_pool(db_url.as_str()).await?; + let pool = fastn_wasm::pg::create_pool(db_url.as_str()).await?; fastn_wasm::insert_or_update(&self.pg_pools, db_url.to_string(), pool); get_client( self.pg_pools.get(db_url.as_str()).unwrap().get(), diff --git a/v0.5/fastn-wasm/src/create_pool.rs b/v0.5/fastn-wasm/src/pg/create_pool.rs similarity index 100% rename from v0.5/fastn-wasm/src/create_pool.rs rename to v0.5/fastn-wasm/src/pg/create_pool.rs diff --git a/v0.5/fastn-wasm/src/pg/mod.rs b/v0.5/fastn-wasm/src/pg/mod.rs index ebe7ffd417..aedd9dd1fd 100644 --- a/v0.5/fastn-wasm/src/pg/mod.rs +++ b/v0.5/fastn-wasm/src/pg/mod.rs @@ -1,14 +1,16 @@ mod batch_execute; mod connect; +mod create_pool; mod db_error; mod execute; mod query; -pub use batch_execute::batch_execute; -pub use connect::connect; -pub use db_error::pg_to_shared; -pub use execute::execute; -pub use query::query; +pub(crate) use batch_execute::batch_execute; +pub(crate) use connect::connect; +pub use create_pool::create_pool; +pub(crate) use db_error::pg_to_shared; +pub(crate) use execute::execute; +pub(crate) use query::query; #[derive(serde::Deserialize, Debug)] pub struct Query {