fix: pgsql connection string

Author: dancixx

src-tauri/src/drivers/pgsql.rs

@@ -13,7 +13,7 @@ use crate::{utils::reflective_get, AppState};
 #[tauri::command(rename_all = "snake_case")]
 pub async fn pgsql_connector(
   project_id: &str,
-  key: Option<[&str; 4]>,
+  key: Option<[&str; 5]>,
   app: AppHandle,
 ) -> Result<ProjectConnectionStatus> {
   let app_state = app.state::<AppState>();
@@ -27,8 +27,8 @@ pub async fn pgsql_connector(
 
   let key = match key {
     Some(key) => format!(
-      "user={} password={} host={} port={}",
-      key[0], key[1], key[2], key[3]
+      "postgresql://{}:{}@{}:{}/{}",
+      key[0], key[1], key[3], key[4], key[2]
     ),
     None => {
       let projects_db = app_state.project_db.lock().await;
@@ -39,8 +39,12 @@ pub async fn pgsql_connector(
         _ => Vec::new(),
       };
       let project_details = format!(
-        "user={} password={} host={} port={}",
-        project_details[1], project_details[2], project_details[3], project_details[4]
+        "postgresql://{}:{}@{}:{}/{}",
+        project_details[1],
+        project_details[2],
+        project_details[4],
+        project_details[5],
+        project_details[3],
       );
       project_details
     }

src/dashboard/query_editor.rs

@@ -26,6 +26,7 @@ pub fn QueryEditor(index: usize) -> impl IntoView {
   let active_project = move || tabs_store.selected_projects.get().get(index).cloned();
   let projects_store = expect_context::<ProjectsStore>();
   let project_driver = projects_store.select_driver_by_project(active_project().as_deref());
+  let project_database = projects_store.select_database_by_project(active_project().as_deref());
   let tabs_store_rc = Rc::new(RefCell::new(tabs_store));
   let show = create_rw_signal(false);
   let _ = use_event_listener(use_document(), ev::keydown, move |event| {
@@ -92,6 +93,7 @@ pub fn QueryEditor(index: usize) -> impl IntoView {
                       show=show
                       project_id=active_project().unwrap()
                       driver=project_driver
+                      database=project_database.to_owned()
                   />
                   <div class="appearance-auto py-1 px-2 border-1 border-neutral-200 bg-white hover:bg-neutral-200 rounded-md">
                       {active_project}

src/databases/pgsql/driver.rs

@@ -26,6 +26,7 @@ pub struct Pgsql<'a> {
   pub project_id: RwSignal<String>,
   user: Option<&'a str>,
   password: Option<&'a str>,
+  database: Option<&'a str>,
   host: Option<&'a str>,
   port: Option<&'a str>,
   pub status: RwSignal<ProjectConnectionStatus>,
@@ -42,6 +43,7 @@ impl<'a> Pgsql<'a> {
       tables: RwSignal::default(),
       user: None,
       password: None,
+      database: None,
       host: None,
       port: None,
     }
@@ -58,6 +60,7 @@ impl<'a> Pgsql<'a> {
         key: Some([
           self.user.unwrap(),
           self.password.unwrap(),
+          self.database.unwrap(),
           self.host.unwrap(),
           self.port.unwrap(),
         ]),
@@ -156,11 +159,13 @@ impl<'a> Pgsql<'a> {
     &mut self,
     user: &'a str,
     password: &'a str,
+    database: &'a str,
     host: &'a str,
     port: &'a str,
   ) {
     self.user = Some(user);
     self.password = Some(password);
+    self.database = Some(database);
     self.host = Some(host);
     self.port = Some(port);
   }
@@ -171,6 +176,7 @@ impl<'a> Pgsql<'a> {
       prev.project_id = self.project_id.get().clone();
       prev.user = self.user.unwrap().to_string();
       prev.password = self.password.unwrap().to_string();
+      prev.database = self.database.unwrap().to_string();
       prev.host = self.host.unwrap().to_string();
       prev.port = self.port.unwrap().to_string();
     });

src/databases/pgsql/index.rs

@@ -26,6 +26,7 @@ pub fn Pgsql(project_id: String) -> impl IntoView {
       &project_details[2],
       &project_details[3],
       &project_details[4],
+      &project_details[5],
     );
   }
   let show = create_rw_signal(false);

src/invoke.rs

@@ -62,7 +62,7 @@ impl AsRef<str> for Invoke {
 #[derive(Serialize, Deserialize)]
 pub struct InvokePgsqlConnectorArgs<'a> {
   pub project_id: &'a str,
-  pub key: Option<[&'a str; 4]>,
+  pub key: Option<[&'a str; 5]>,
 }
 
 #[derive(Serialize, Deserialize)]

src/modals/add_custom_query.rs

@@ -7,20 +7,32 @@ use thaw::{Modal, ModalFooter};
 use crate::store::queries::QueriesStore;
 
 #[component]
-pub fn AddCustomQuery(show: RwSignal<bool>, project_id: String, driver: Drivers) -> impl IntoView {
+pub fn AddCustomQuery(
+  show: RwSignal<bool>,
+  project_id: String,
+  driver: Drivers,
+  database: String,
+) -> impl IntoView {
   let project_id = Rc::new(project_id);
   let project_id_clone = project_id.clone();
   let query_store = expect_context::<QueriesStore>();
   let (title, set_title) = create_signal(String::new());
   let insert_query = create_action(
-    move |(query_db, project_id, title, driver): &(QueriesStore, String, String, Drivers)| {
+    move |(query_db, project_id, title, driver, database): &(
+      QueriesStore,
+      String,
+      String,
+      Drivers,
+      String,
+    )| {
       let query_db_clone = *query_db;
       let project_id = project_id.clone();
       let title = title.clone();
       let driver = *driver;
+      let database = database.clone();
       async move {
         query_db_clone
-          .insert_query(&project_id, &title, &driver)
+          .insert_query(&project_id, &title, &driver, &database)
           .await;
       }
     },
@@ -45,9 +57,16 @@ pub fn AddCustomQuery(show: RwSignal<bool>, project_id: String, driver: Drivers)
                       class="px-4 py-2 border-1 border-neutral-200 hover:bg-neutral-200 rounded-md"
                       on:click={
                           let project_id = project_id.clone();
+                          let database = database.clone();
                           move |_| {
                               insert_query
-                                  .dispatch((query_store, project_id.to_string(), title(), driver));
+                                  .dispatch((
+                                      query_store,
+                                      project_id.to_string(),
+                                      title(),
+                                      driver,
+                                      database.to_string(),
+                                  ));
                               show.set(false);
                           }
                       }

src/modals/add_pgsql_connection.rs

@@ -49,6 +49,14 @@ pub fn AddPgsqlConnection(show: RwSignal<bool>) -> impl IntoView {
                   on:input=move |e| params.update(|p| p.password = event_target_value(&e))
               />
 
+              <input
+                  class="border-1 border-neutral-200 p-1 rounded-md"
+                  type="text"
+                  value=params.get().database
+                  placeholder="database"
+                  on:input=move |e| params.update(|p| p.database = event_target_value(&e))
+              />
+
               <input
                   class="border-1 border-neutral-200 p-1 rounded-md"
                   type="text"
@@ -79,6 +87,7 @@ pub fn AddPgsqlConnection(show: RwSignal<bool>) -> impl IntoView {
                                       params.get().driver.to_string(),
                                       params.get().user,
                                       params.get().password,
+                                      params.get().database,
                                       params.get().host,
                                       params.get().port,
                                   ],

src/store/atoms.rs

@@ -39,6 +39,7 @@ pub struct PgsqlConnectionDetailsAtom {
   pub driver: Drivers,
   pub user: String,
   pub password: String,
+  pub database: String,
   pub host: String,
   pub port: String,
 }
@@ -50,6 +51,7 @@ impl Default for PgsqlConnectionDetailsAtom {
       driver: Drivers::PGSQL,
       user: String::new(),
       password: String::new(),
+      database: String::new(),
       host: String::new(),
       port: String::new(),
     }

src/store/projects.rs

@@ -50,6 +50,15 @@ impl ProjectsStore {
     }
   }
 
+  pub fn select_database_by_project(&self, project_id: Option<&str>) -> String {
+    if project_id.is_none() {
+      return String::new();
+    }
+
+    let project = self.select_project_by_name(project_id.unwrap()).unwrap();
+    project.get(3).unwrap().clone()
+  }
+
   pub async fn load_projects(&self) {
     let projects =
       invoke::<_, BTreeMap<String, Vec<String>>>(Invoke::ProjectDbSelect.as_ref(), &())

src/store/queries.rs

@@ -14,7 +14,6 @@ use super::tabs::TabsStore;
 #[derive(Clone, Copy, Debug)]
 pub struct QueriesStore(pub RwSignal<BTreeStore>);
 
-
 impl Deref for QueriesStore {
   type Target = RwSignal<BTreeStore>;
 
@@ -44,13 +43,19 @@ impl QueriesStore {
     });
   }
 
-  pub async fn insert_query(&self, project_id: &str, title: &str, driver: &Drivers) {
+  pub async fn insert_query(
+    &self,
+    project_id: &str,
+    title: &str,
+    driver: &Drivers,
+    database: &str,
+  ) {
     let tabs_store = expect_context::<TabsStore>();
     let sql = tabs_store.select_active_editor_value();
     let _ = invoke::<_, ()>(
       Invoke::QueryDbInsert.as_ref(),
       &InvokeQueryDbInsertArgs {
-        query_id: &format!("{}:{}:{}", project_id, driver, title),
+        query_id: &format!("{}:{}:{}:{}", project_id, database, driver, title),
         sql: &sql,
       },
     )