From 4042ee14e5d9b4ce2f92880237599dbbc1e62f95 Mon Sep 17 00:00:00 2001 From: Michael Vlach Date: Thu, 2 Jan 2025 00:02:41 +0100 Subject: [PATCH] remove unused code --- agdb_server/src/action/change_password.rs | 3 +- agdb_server/src/action/cluster_login.rs | 3 +- agdb_server/src/action/db_add.rs | 3 +- agdb_server/src/action/db_backup.rs | 3 +- agdb_server/src/action/db_clear.rs | 3 +- agdb_server/src/action/db_convert.rs | 3 +- agdb_server/src/action/db_copy.rs | 3 +- agdb_server/src/action/db_delete.rs | 3 +- agdb_server/src/action/db_exec.rs | 57 ----------------------- agdb_server/src/action/db_optimize.rs | 3 +- agdb_server/src/action/db_remove.rs | 3 +- agdb_server/src/action/db_rename.rs | 3 +- agdb_server/src/action/db_restore.rs | 3 +- agdb_server/src/action/db_user_add.rs | 3 +- agdb_server/src/action/db_user_remove.rs | 3 +- agdb_server/src/action/user_add.rs | 3 +- agdb_server/src/action/user_remove.rs | 3 +- 17 files changed, 16 insertions(+), 89 deletions(-) diff --git a/agdb_server/src/action/change_password.rs b/agdb_server/src/action/change_password.rs index 072783f7..5d405e05 100644 --- a/agdb_server/src/action/change_password.rs +++ b/agdb_server/src/action/change_password.rs @@ -4,11 +4,10 @@ use crate::action::Action; use crate::action::ClusterActionResult; use crate::server_error::ServerResult; use agdb::AgdbDeSerialize; -use agdb::UserValue; use serde::Deserialize; use serde::Serialize; -#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)] +#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)] pub(crate) struct ChangePassword { pub(crate) user: String, pub(crate) new_password: Vec, diff --git a/agdb_server/src/action/cluster_login.rs b/agdb_server/src/action/cluster_login.rs index f3bb7e42..ce775057 100644 --- a/agdb_server/src/action/cluster_login.rs +++ b/agdb_server/src/action/cluster_login.rs @@ -4,11 +4,10 @@ use crate::action::Action; use crate::action::ClusterActionResult; use crate::server_error::ServerResult; use agdb::AgdbDeSerialize; -use agdb::UserValue; use serde::Deserialize; use serde::Serialize; -#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)] +#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)] pub(crate) struct ClusterLogin { pub(crate) user: String, pub(crate) new_token: String, diff --git a/agdb_server/src/action/db_add.rs b/agdb_server/src/action/db_add.rs index 63a5a007..e9214712 100644 --- a/agdb_server/src/action/db_add.rs +++ b/agdb_server/src/action/db_add.rs @@ -5,12 +5,11 @@ use crate::action::ClusterActionResult; use crate::server_db::Database; use crate::server_error::ServerResult; use agdb::AgdbDeSerialize; -use agdb::UserValue; use agdb_api::DbType; use serde::Deserialize; use serde::Serialize; -#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)] +#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)] pub(crate) struct DbAdd { pub(crate) owner: String, pub(crate) db: String, diff --git a/agdb_server/src/action/db_backup.rs b/agdb_server/src/action/db_backup.rs index 1b302ddb..d531b563 100644 --- a/agdb_server/src/action/db_backup.rs +++ b/agdb_server/src/action/db_backup.rs @@ -4,11 +4,10 @@ use crate::action::Action; use crate::action::ClusterActionResult; use crate::server_error::ServerResult; use agdb::AgdbDeSerialize; -use agdb::UserValue; use serde::Deserialize; use serde::Serialize; -#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)] +#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)] pub(crate) struct DbBackup { pub(crate) owner: String, pub(crate) db: String, diff --git a/agdb_server/src/action/db_clear.rs b/agdb_server/src/action/db_clear.rs index 586a13ab..53f2f2ad 100644 --- a/agdb_server/src/action/db_clear.rs +++ b/agdb_server/src/action/db_clear.rs @@ -4,12 +4,11 @@ use crate::action::Action; use crate::action::ClusterActionResult; use crate::server_error::ServerResult; use agdb::AgdbDeSerialize; -use agdb::UserValue; use agdb_api::DbResource; use serde::Deserialize; use serde::Serialize; -#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)] +#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)] pub(crate) struct DbClear { pub(crate) owner: String, pub(crate) db: String, diff --git a/agdb_server/src/action/db_convert.rs b/agdb_server/src/action/db_convert.rs index 5d43991a..45e01ffe 100644 --- a/agdb_server/src/action/db_convert.rs +++ b/agdb_server/src/action/db_convert.rs @@ -4,12 +4,11 @@ use crate::action::Action; use crate::action::ClusterActionResult; use crate::server_error::ServerResult; use agdb::AgdbDeSerialize; -use agdb::UserValue; use agdb_api::DbType; use serde::Deserialize; use serde::Serialize; -#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)] +#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)] pub(crate) struct DbConvert { pub(crate) owner: String, pub(crate) db: String, diff --git a/agdb_server/src/action/db_copy.rs b/agdb_server/src/action/db_copy.rs index c1a98516..5a90fd9d 100644 --- a/agdb_server/src/action/db_copy.rs +++ b/agdb_server/src/action/db_copy.rs @@ -5,12 +5,11 @@ use crate::action::ClusterActionResult; use crate::server_db::Database; use crate::server_error::ServerResult; use agdb::AgdbDeSerialize; -use agdb::UserValue; use agdb_api::DbType; use serde::Deserialize; use serde::Serialize; -#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)] +#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)] pub(crate) struct DbCopy { pub(crate) owner: String, pub(crate) db: String, diff --git a/agdb_server/src/action/db_delete.rs b/agdb_server/src/action/db_delete.rs index c34cfdef..ce902824 100644 --- a/agdb_server/src/action/db_delete.rs +++ b/agdb_server/src/action/db_delete.rs @@ -4,11 +4,10 @@ use crate::action::Action; use crate::action::ClusterActionResult; use crate::server_error::ServerResult; use agdb::AgdbDeSerialize; -use agdb::UserValue; use serde::Deserialize; use serde::Serialize; -#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)] +#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)] pub(crate) struct DbDelete { pub(crate) owner: String, pub(crate) db: String, diff --git a/agdb_server/src/action/db_exec.rs b/agdb_server/src/action/db_exec.rs index 1206b935..96b78a7a 100644 --- a/agdb_server/src/action/db_exec.rs +++ b/agdb_server/src/action/db_exec.rs @@ -4,8 +4,6 @@ use crate::action::Action; use crate::action::ClusterActionResult; use crate::server_error::ServerResult; use agdb::AgdbDeSerialize; -use agdb::DbUserValue; -use agdb::QueryResult; use agdb_api::Queries; use serde::Deserialize; use serde::Serialize; @@ -27,58 +25,3 @@ impl Action for DbExec { )) } } - -impl DbUserValue for DbExec { - type ValueType = DbExec; - - fn db_id(&self) -> Option { - None - } - - fn db_keys() -> Vec { - vec!["user".into(), "owner".into(), "db".into(), "queries".into()] - } - - fn from_db_element(element: &agdb::DbElement) -> Result { - Ok(Self { - user: element.values[0].value.string()?.clone(), - owner: element.values[1].value.string()?.clone(), - db: element.values[2].value.string()?.clone(), - queries: serde_json::from_str(element.values[3].value.string()?) - .map_err(|e| agdb::DbError::from(e.to_string()))?, - }) - } - - fn to_db_values(&self) -> Vec { - let queries = serde_json::to_string(&self.queries).unwrap_or_default(); - - vec![ - ("user", &self.user).into(), - ("owner", &self.owner).into(), - ("db", &self.db).into(), - ("queries", queries).into(), - ] - } -} - -impl TryFrom<&agdb::DbElement> for DbExec { - type Error = agdb::DbError; - - #[track_caller] - fn try_from(value: &agdb::DbElement) -> std::result::Result { - DbExec::from_db_element(value) - } -} - -impl TryFrom for DbExec { - type Error = agdb::DbError; - - #[track_caller] - fn try_from(value: QueryResult) -> Result { - value - .elements - .first() - .ok_or(Self::Error::from("No element found"))? - .try_into() - } -} diff --git a/agdb_server/src/action/db_optimize.rs b/agdb_server/src/action/db_optimize.rs index 4b246c4c..3acda89c 100644 --- a/agdb_server/src/action/db_optimize.rs +++ b/agdb_server/src/action/db_optimize.rs @@ -4,11 +4,10 @@ use crate::action::Action; use crate::action::ClusterActionResult; use crate::server_error::ServerResult; use agdb::AgdbDeSerialize; -use agdb::UserValue; use serde::Deserialize; use serde::Serialize; -#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)] +#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)] pub(crate) struct DbOptimize { pub(crate) owner: String, pub(crate) db: String, diff --git a/agdb_server/src/action/db_remove.rs b/agdb_server/src/action/db_remove.rs index c3ea0154..1592a531 100644 --- a/agdb_server/src/action/db_remove.rs +++ b/agdb_server/src/action/db_remove.rs @@ -4,11 +4,10 @@ use crate::action::Action; use crate::action::ClusterActionResult; use crate::server_error::ServerResult; use agdb::AgdbDeSerialize; -use agdb::UserValue; use serde::Deserialize; use serde::Serialize; -#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)] +#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)] pub(crate) struct DbRemove { pub(crate) owner: String, pub(crate) db: String, diff --git a/agdb_server/src/action/db_rename.rs b/agdb_server/src/action/db_rename.rs index 863fe24d..2a1281b6 100644 --- a/agdb_server/src/action/db_rename.rs +++ b/agdb_server/src/action/db_rename.rs @@ -4,12 +4,11 @@ use crate::action::Action; use crate::action::ClusterActionResult; use crate::server_error::ServerResult; use agdb::AgdbDeSerialize; -use agdb::UserValue; use agdb_api::DbUserRole; use serde::Deserialize; use serde::Serialize; -#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)] +#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)] pub(crate) struct DbRename { pub(crate) owner: String, pub(crate) db: String, diff --git a/agdb_server/src/action/db_restore.rs b/agdb_server/src/action/db_restore.rs index 55705e36..f939bc35 100644 --- a/agdb_server/src/action/db_restore.rs +++ b/agdb_server/src/action/db_restore.rs @@ -4,11 +4,10 @@ use crate::action::Action; use crate::action::ClusterActionResult; use crate::server_error::ServerResult; use agdb::AgdbDeSerialize; -use agdb::UserValue; use serde::Deserialize; use serde::Serialize; -#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)] +#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)] pub(crate) struct DbRestore { pub(crate) owner: String, pub(crate) db: String, diff --git a/agdb_server/src/action/db_user_add.rs b/agdb_server/src/action/db_user_add.rs index 4aec1aa6..ca59eb4b 100644 --- a/agdb_server/src/action/db_user_add.rs +++ b/agdb_server/src/action/db_user_add.rs @@ -4,12 +4,11 @@ use crate::action::Action; use crate::action::ClusterActionResult; use crate::server_error::ServerResult; use agdb::AgdbDeSerialize; -use agdb::UserValue; use agdb_api::DbUserRole; use serde::Deserialize; use serde::Serialize; -#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)] +#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)] pub(crate) struct DbUserAdd { pub(crate) owner: String, pub(crate) db: String, diff --git a/agdb_server/src/action/db_user_remove.rs b/agdb_server/src/action/db_user_remove.rs index 633cfdab..54131e25 100644 --- a/agdb_server/src/action/db_user_remove.rs +++ b/agdb_server/src/action/db_user_remove.rs @@ -4,11 +4,10 @@ use crate::action::Action; use crate::action::ClusterActionResult; use crate::server_error::ServerResult; use agdb::AgdbDeSerialize; -use agdb::UserValue; use serde::Deserialize; use serde::Serialize; -#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)] +#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)] pub(crate) struct DbUserRemove { pub(crate) owner: String, pub(crate) db: String, diff --git a/agdb_server/src/action/user_add.rs b/agdb_server/src/action/user_add.rs index 05fcf670..1f3b40e3 100644 --- a/agdb_server/src/action/user_add.rs +++ b/agdb_server/src/action/user_add.rs @@ -5,11 +5,10 @@ use crate::action::ClusterActionResult; use crate::server_db::ServerUser; use crate::server_error::ServerResult; use agdb::AgdbDeSerialize; -use agdb::UserValue; use serde::Deserialize; use serde::Serialize; -#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)] +#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)] pub(crate) struct UserAdd { pub(crate) user: String, pub(crate) password: Vec, diff --git a/agdb_server/src/action/user_remove.rs b/agdb_server/src/action/user_remove.rs index f362d221..e5193e5e 100644 --- a/agdb_server/src/action/user_remove.rs +++ b/agdb_server/src/action/user_remove.rs @@ -4,11 +4,10 @@ use crate::action::Action; use crate::action::ClusterActionResult; use crate::server_error::ServerResult; use agdb::AgdbDeSerialize; -use agdb::UserValue; use serde::Deserialize; use serde::Serialize; -#[derive(Clone, Serialize, Deserialize, UserValue, AgdbDeSerialize)] +#[derive(Clone, Serialize, Deserialize, AgdbDeSerialize)] pub(crate) struct UserRemove { pub(crate) user: String, }