feat: make queries more general

Author: dancixx

src/dashboard/query_editor.rs

@@ -12,7 +12,10 @@ use monaco::{
 };
 use wasm_bindgen::{closure::Closure, JsCast};
 
-use crate::{modals::add_custom_query::AddCustomQuery, store::tabs::TabsStore};
+use crate::{
+  modals::add_custom_query::AddCustomQuery,
+  store::{projects::ProjectsStore, tabs::TabsStore},
+};
 
 pub type ModelCell = Rc<RefCell<Option<CodeEditor>>>;
 pub const MODE_ID: &str = "pgsql";
@@ -24,6 +27,8 @@ pub fn QueryEditor(index: usize) -> impl IntoView {
     Some(project) => Some(project.clone()),
     _ => None,
   };
+  let projects_store = expect_context::<ProjectsStore>();
+  let project_driver = projects_store.select_driver_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| {
@@ -86,7 +91,11 @@ pub fn QueryEditor(index: usize) -> impl IntoView {
       <div _ref=node_ref class="border-b-1 border-neutral-200 h-72 sticky">
           <div class="absolute bottom-0 items-center text-xs flex justify-between px-4 left-0 w-full h-10 bg-gray-50">
               <Show when=move || active_project().is_some() fallback=|| view! { <div></div> }>
-                  <AddCustomQuery show=show project_id=active_project().unwrap()/>
+                  <AddCustomQuery
+                      show=show
+                      project_id=active_project().unwrap()
+                      driver=project_driver
+                  />
                   <div class="appearance-auto py-1 px-2 border-1 border-neutral-200 bg-white hover:bg-neutral-200 rounded-md">
                       {active_project}
                   </div>

src/modals/add_custom_query.rs

@@ -1,23 +1,27 @@
 use std::rc::Rc;
 
+use common::enums::Drivers;
 use leptos::*;
 use thaw::{Modal, ModalFooter};
 
 use crate::store::queries::QueriesStore;
 
 #[component]
-pub fn AddCustomQuery(show: RwSignal<bool>, project_id: String) -> impl IntoView {
+pub fn AddCustomQuery(show: RwSignal<bool>, project_id: String, driver: Drivers) -> 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): &(QueriesStore, String, String)| {
+    move |(query_db, project_id, title, driver): &(QueriesStore, String, String, Drivers)| {
       let query_db_clone = *query_db;
       let project_id = project_id.clone();
       let title = title.clone();
+      let driver = driver.clone();
       async move {
-        query_db_clone.insert_query(&project_id, &title).await;
+        query_db_clone
+          .insert_query(&project_id, &title, &driver)
+          .await;
       }
     },
   );
@@ -41,8 +45,10 @@ pub fn AddCustomQuery(show: RwSignal<bool>, project_id: String) -> impl IntoView
                       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 driver = driver.clone();
                           move |_| {
-                              insert_query.dispatch((query_store, project_id.to_string(), title()));
+                              insert_query
+                                  .dispatch((query_store, project_id.to_string(), title(), driver));
                               show.set(false);
                           }
                       }

src/store/projects.rs

@@ -1,5 +1,6 @@
 use std::collections::BTreeMap;
 
+use common::enums::Drivers;
 use leptos::{RwSignal, SignalGet, SignalSet};
 use tauri_sys::tauri::invoke;
 
@@ -24,6 +25,21 @@ impl ProjectsStore {
     self.0.get().get(project_id).cloned()
   }
 
+  pub fn select_driver_by_project(&self, project_id: Option<&str>) -> Drivers {
+    if project_id.is_none() {
+      return Drivers::PGSQL;
+    }
+
+    let project = self.select_project_by_name(project_id.unwrap()).unwrap();
+    let driver = project.split(':').next().unwrap();
+    let driver = driver.split('=').last();
+
+    match driver {
+      Some("PGSQL") => Drivers::PGSQL,
+      _ => unreachable!(),
+    }
+  }
+
   pub async fn load_projects(&self) {
     let projects = invoke::<_, BTreeMap<String, String>>(Invoke::ProjectDbSelect.as_ref(), &())
       .await

src/store/queries.rs

@@ -1,5 +1,6 @@
 use std::collections::BTreeMap;
 
+use common::enums::Drivers;
 use leptos::*;
 use tauri_sys::tauri::invoke;
 
@@ -31,13 +32,13 @@ impl QueriesStore {
     });
   }
 
-  pub async fn insert_query(&self, project_id: &str, title: &str) {
+  pub async fn insert_query(&self, project_id: &str, title: &str, driver: &Drivers) {
     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, title),
+        query_id: &format!("{}:{}:{}", project_id, driver, title),
         sql: &sql,
       },
     )