Skip to content

Commit

Permalink
Merge pull request #11 from giuseppe-g-gelardi/list-tables
Browse files Browse the repository at this point in the history
add list tables method and rename table
  • Loading branch information
giuseppe-g-gelardi authored Dec 14, 2024
2 parents ec6c19b + fc960dc commit f8e13f6
Show file tree
Hide file tree
Showing 3 changed files with 139 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ cargobase.json
cargobase-async.json
cargobase-testing.json

main.rs
src/main.rs

.env

Expand Down
7 changes: 3 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ documentation = "TODO: https://docs.rs/cargobase"
readme = "README.md"
keywords = ["key-value", "store", "database", "in-memory", "file-based", "utility", "local", "rust"]
categories = ["data-management", "development-tools", "utilities", "database"]
edition = "2021"

[dependencies]
serde = { version = "1.0.215", features = ["derive"] }
Expand All @@ -30,6 +29,6 @@ tracing-test = "0.2.5"
[lib]
path = "src/lib.rs"

[[bin]]
name = "cargobase"
path = "main.rs"
# [[bin]]
# name = "cargobase"
# path = "main.rs"
137 changes: 135 additions & 2 deletions src/database.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ impl Database {
}

pub(crate) fn get_table_mut(&mut self, table_name: &str) -> Option<&mut Table> {
// self.tables.get_mut(table_name)
tracing::debug!("looking for table: {}", table_name);
let table = self.tables.get_mut(table_name);

Expand Down Expand Up @@ -176,14 +175,60 @@ impl Database {
let view = View::new(self);
view.single_table(table_name);
}

pub fn list_tables(&self) -> Vec<String> {
self.tables.keys().cloned().collect()
}

pub async fn rename_table(
&mut self,
old_name: &str,
new_name: &str,
) -> Result<(), DatabaseError> {
if old_name == new_name {
return Err(DatabaseError::InvalidData(
"old name and new name are the same".to_string(),
));
}

let table = self.tables.remove(old_name).ok_or_else(|| {
DatabaseError::TableNotFound(format!("Table {} not found", old_name.to_string()))
});

if self.tables.contains_key(new_name) {
return Err(DatabaseError::TableAlreadyExists(new_name.to_string()));
}

let mut table = table?;
table.name = new_name.to_string();
self.tables.insert(new_name.to_string(), table);

self.save_to_file()
.await
.map_err(DatabaseError::SaveError)?;

Ok(())
}

pub fn count_rows(&self, table_name: &str) -> Result<usize, DatabaseError> {
if let Some(table) = self.tables.get(table_name) {
Ok(table.rows.len())
} else {
Err(DatabaseError::TableNotFound(format!(
"Table {} not found",
table_name.to_string()
)))
}
}
}

#[cfg(test)]
mod tests {
use serde_json::json;
use tracing_test::traced_test;

use super::*;
use crate::{setup_temp_db, Columns, Table};
use crate::{setup_temp_db, Column, Columns, Table};

#[derive(Serialize, Deserialize, Debug, PartialEq, Clone, Default)]
struct TestData {
Expand Down Expand Up @@ -320,4 +365,92 @@ mod tests {

assert_eq!(db, loaded_db);
}

#[tokio::test]
async fn test_rename_table_success() {
let mut db = setup_temp_db().await;

db.rename_table("TestTable", "RenamedTable")
.await
.expect("Failed to rename table");

assert!(db.tables.contains_key("RenamedTable"));
assert!(!db.tables.contains_key("TestTable"));
}

#[tokio::test]
async fn test_rename_table_already_exists() {
let mut db = setup_temp_db().await;

let mut another_table = Table::new(
"AnotherTable".to_string(),
Columns::new(vec![Column::new("id", true)]),
);
db.add_table(&mut another_table).await.unwrap();

let result = db.rename_table("TestTable", "AnotherTable").await;

assert!(matches!(result, Err(DatabaseError::TableAlreadyExists(_))));
}

#[tokio::test]
async fn test_rename_table_not_found() {
let mut db = setup_temp_db().await;

let result = db.rename_table("NonExistentTable", "NewTable").await;

assert!(matches!(result, Err(DatabaseError::TableNotFound(_))));
}

#[tokio::test]
async fn test_count_rows() {
#[derive(Serialize, Deserialize, Debug, PartialEq, Clone, Default)]
pub struct User {
id: String,
name: String,
email: String,
}
let mut db = setup_temp_db().await;

let user_columns = Columns::from_struct::<User>(true);
//
let mut users_table = Table::new("users".to_string(), user_columns.clone());
db.add_table(&mut users_table)
.await
.expect("failed to add users table");

let user1 = json!({
"id": "1",
"name": "John Doe",
"email": "[email protected]"
});
let user2 = json!({
"id": "2",
"name": "Jane Smith",
"email": "[email protected]"
});
let user3 = json!({
"id": "3",
"name": "Alice Johnson",
"email": "[email protected]"
});

let users = vec![user1, user2, user3];

// add single rows
// users_table.add_row(&mut db, user1).await;
// users_table.add_row(&mut db, user2).await;
// users_table.add_row(&mut db, user3).await;

// add array of rows.... .into() converts Vec<serde_json::Value> to Vec<Row>???
users_table.add_row(&mut db, users.into()).await;

// Count rows in the table
let row_count = db.count_rows("users").unwrap();
assert_eq!(row_count, 3);

// Attempt to count rows for a non-existent table
let result = db.count_rows("NonExistentTable");
assert!(matches!(result, Err(DatabaseError::TableNotFound(_))));
}
}

0 comments on commit f8e13f6

Please sign in to comment.