fix: uses correct Postgres connection URI

Author: fcoury

src/main.rs

@@ -74,7 +74,11 @@ fn main() {
 
     let cli = Cli::parse();
 
-    let log_level = if cli.debug { "oxide=debug" } else { "info" };
+    let log_level = if cli.debug {
+        "oxide=debug"
+    } else {
+        "oxide=info"
+    };
     env_logger::init_from_env(
         env_logger::Env::default().filter_or(env_logger::DEFAULT_FILTER_ENV, log_level),
     );

src/pg.rs

@@ -35,15 +35,15 @@ pub struct PgDb {
 
 impl PgDb {
     pub fn new() -> Self {
-        PgDb::new_with_uri(env::var("DATABASE_URL").unwrap())
+        PgDb::new_with_uri(&env::var("DATABASE_URL").unwrap())
     }
 
     pub fn new_from_pool(pool: r2d2::Pool<PostgresConnectionManager<NoTls>>) -> Self {
         let client = pool.get().unwrap();
         PgDb { client }
     }
 
-    pub fn new_with_uri(uri: String) -> Self {
+    pub fn new_with_uri(uri: &str) -> Self {
         let manager = PostgresConnectionManager::new(uri.parse().unwrap(), NoTls);
         let pool = r2d2::Pool::new(manager).unwrap();
         let client = pool.get().unwrap();

src/server.rs

@@ -36,7 +36,12 @@ impl Server {
     }
 
     pub fn start(&self) {
-        log::info!("Connecting to PostgreSQL database...");
+        let uri = &self.pg_url;
+        let sanitized_uri = format!(
+            "postgres://*****:*****@{}",
+            uri.split("@").collect::<Vec<_>>()[1]
+        );
+        log::info!("Connecting to {}...", sanitized_uri);
         let manager = PostgresConnectionManager::new(self.pg_url.parse().unwrap(), NoTls);
         if let Ok(pool) = r2d2::Pool::new(manager) {
             self.start_with_pool(pool);

src/ui.rs

@@ -26,6 +26,7 @@ pub fn start(listen_addr: &str, port: u16, postgres_url: Option<String>) {
                 For more information use --help.
             "});
     }
+    let pg_url = pg_url.unwrap();
 
     let index_html = Asset::get("index.html").unwrap();
     let index_data = std::str::from_utf8(index_html.data.as_ref());
@@ -59,13 +60,14 @@ pub fn start(listen_addr: &str, port: u16, postgres_url: Option<String>) {
         },
     );
 
+    let uri = pg_url.clone();
     server.post(
         "/api/run",
         middleware! { |req, _res|
             let req_json = req.json_as::<Value>().unwrap();
             let query = req_json["query"].as_str().unwrap();
             log::info!("POST /api/query\n{}", query);
-            let mut client = PgDb::new();
+            let mut client = PgDb::new_with_uri(&uri);
             let mut rows = vec![];
             let res = client.raw_query(query, &[]);
             if res.is_err() {
@@ -82,23 +84,25 @@ pub fn start(listen_addr: &str, port: u16, postgres_url: Option<String>) {
         },
     );
 
+    let uri = pg_url.clone();
     server.get(
         "/api/databases",
         middleware! { |_req, _res|
             log::info!("GET /api/databases");
-            let mut client = PgDb::new();
+            let mut client = PgDb::new_with_uri(&uri);
             let databases = client.get_schemas();
             json!({ "databases": databases })
 
         },
     );
 
+    let uri = pg_url.clone();
     server.get(
         "/api/databases/:database/collections",
         middleware! { |req, _res|
             let database = req.param("database").unwrap();
             log::info!("GET /api/collections\ndatabase = {}", database);
-            let mut client = PgDb::new();
+            let mut client = PgDb::new_with_uri(&uri);
             let collections = client.get_tables(database);
             json!({ "collections": collections })