minor refactor

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());
 

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};

v0.5/fastn-wasm/src/pg/connect.rs

@@ -16,7 +16,7 @@ impl<STORE: fastn_wasm::StoreExt> fastn_wasm::Store<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(),

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 {