Merge pull request #6 from dancixx/feat/improve-error-handling

refactor: improve performance for beta

Author: dancixx

Cargo.toml

@@ -1,17 +1,17 @@
 [package]
-name = "rust-sql-gui-ui"
-version = "1.0.0-alpha.9"
+name = "rsql"
+version = "1.0.0-beta.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-leptos = { version = "0.6.8", features = ["csr", "nightly"] }
+leptos = { version = "0.6.11", features = ["csr", "nightly"] }
 leptos_devtools = { git = "https://github.com/luoxiaozero/leptos-devtools" }
 serde = { version = "1.0.192", features = ["derive"] }
 serde-wasm-bindgen = "0.6.3"
 wasm-bindgen = { version ="0.2.91", features = ["serde-serialize"] }
 js-sys = "0.3.68"
-leptos-use = { version = "0.10.9", features = ["serde", "serde_json"]}
+leptos-use = { version = "0.10.10", features = ["serde", "serde_json"]}
 leptos_icons = "0.3.0" # https://carlosted.github.io/icondata/
 serde_json = "1.0.113"
 wasm-bindgen-futures = "0.4.39"
@@ -22,6 +22,16 @@ common = { path = "common" }
 futures = "0.3.30"
 async-stream = "0.3.5"
 icondata = "0.3.0"
+ahash = { version = "0.8.11", features = ["serde"] }
+leptos_toaster = { version = "0.1.6", features = ["builtin_toast"] }
+proc-macro2 = "1.0.82"
+quote = "1.0.36"
+syn = { version = "2.0.64", features = ["full"] }
+chrono = "0.4.38"
+
 
 [workspace]
 members = ["src-tauri", "common"]
+
+[lib]
+proc-macro = true

common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "common"
-version = "1.0.0-alpha.9"
+version = "1.0.0-beta.0"
 edition = "2021"
 
 [dependencies]

common/src/drivers/mod.rs

@@ -2,29 +2,68 @@ use std::fmt::Display;
 
 use serde::{Deserialize, Serialize};
 
-use super::projects::postgresql::Postgresql;
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub enum Project {
-  POSTGRESQL(Postgresql),
-}
-
-#[derive(Clone, Serialize, Deserialize)]
+#[derive(Clone, Copy, Serialize, Deserialize, Default)]
 pub enum Drivers {
-  POSTGRESQL,
+  #[default]
+  PGSQL,
 }
 
 impl Display for Drivers {
   fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
     match self {
-      Drivers::POSTGRESQL => write!(f, "POSTGRESQL"),
+      Drivers::PGSQL => write!(f, "PGSQL"),
+    }
+  }
+}
+
+impl AsRef<str> for Drivers {
+  fn as_ref(&self) -> &str {
+    match self {
+      Drivers::PGSQL => "PGSQL",
     }
   }
 }
 
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub enum ProjectConnectionStatus {
   Connected,
+  Connecting,
   #[default]
   Disconnected,
+  Failed,
 }
+
+impl std::error::Error for ProjectConnectionStatus {}
+impl Display for ProjectConnectionStatus {
+  fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+    match self {
+      ProjectConnectionStatus::Connected => write!(f, "Connected"),
+      ProjectConnectionStatus::Connecting => write!(f, "Connecting"),
+      ProjectConnectionStatus::Disconnected => write!(f, "Disconnected"),
+      ProjectConnectionStatus::Failed => write!(f, "Failed"),
+    }
+  }
+}
+
+use std::fmt;
+
+#[derive(Debug, Serialize, Deserialize, Clone, Copy)]
+pub enum PostgresqlError {
+  ConnectionTimeout,
+  ConnectionError,
+  QueryTimeout,
+  QueryError,
+}
+
+impl std::error::Error for PostgresqlError {}
+impl fmt::Display for PostgresqlError {
+  fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+    match *self {
+      PostgresqlError::ConnectionTimeout => write!(f, "ConnectionTimeout"),
+      PostgresqlError::ConnectionError => write!(f, "ConnectionError"),
+      PostgresqlError::QueryTimeout => write!(f, "QueryTimeout"),
+      PostgresqlError::QueryError => write!(f, "QueryError"),
+    }
+  }
+}
+

common/src/drivers/postgresql.rs

@@ -1,3 +1,3 @@
-pub mod drivers;
 pub mod enums;
-pub mod projects;
+pub mod types;
+

common/src/enums.rs

@@ -0,0 +1,2 @@
+pub mod pgsql;
+

common/src/lib.rs

@@ -0,0 +1,4 @@
+pub type PgsqlLoadSchemas = Vec<String>;
+pub type PgsqlLoadTables = Vec<(String, String)>;
+pub type PgsqlRunQuery = (Vec<String>, Vec<Vec<String>>, f32);
+