From 91193cf03efd60ed2926b20ce8b1fd6c10856030 Mon Sep 17 00:00:00 2001
From: Nicholas Orlowsky <nickorlow@nickorlow.com>
Date: Tue, 8 Aug 2023 15:36:44 -0500
Subject: [PATCH] some fixes

---
 squirrel-server/Cargo.lock         | 14 +++----
 squirrel-server/src/main.rs        | 59 +++++++++++-------------------
 squirrel-server/src/table/table.rs |  2 +-
 3 files changed, 29 insertions(+), 46 deletions(-)

diff --git a/squirrel-server/Cargo.lock b/squirrel-server/Cargo.lock
index 22b3244..68ad5ce 100644
--- a/squirrel-server/Cargo.lock
+++ b/squirrel-server/Cargo.lock
@@ -2,15 +2,15 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "SQUIRREL"
-version = "0.1.0"
-dependencies = [
- "anyhow",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
+
+[[package]]
+name = "squirrel-server"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+]
diff --git a/squirrel-server/src/main.rs b/squirrel-server/src/main.rs
index 64140ed..6adaf7b 100644
--- a/squirrel-server/src/main.rs
+++ b/squirrel-server/src/main.rs
@@ -1,3 +1,4 @@
+use anyhow::anyhow;
 use std::fs;
 use std::io::{BufRead, BufReader, Read, Write};
 use std::net::{Shutdown, TcpListener, TcpStream};
@@ -29,7 +30,7 @@ fn handle_create(command: CreateCommand) -> ::anyhow::Result<TableDefinition> {
         file.write_all(line.as_bytes()).unwrap();
     }
 
-    return Ok(command.table_definition);
+    Ok(command.table_definition)
 }
 
 fn read_tabledef(table_name: String) -> ::anyhow::Result<TableDefinition> {
@@ -39,7 +40,7 @@ fn read_tabledef(table_name: String) -> ::anyhow::Result<TableDefinition> {
 
     for line in BufReader::new(file).lines() {
         let line_str = line?;
-        let parts: Vec<&str> = line_str.split(" ").collect();
+        let parts: Vec<&str> = line_str.split(' ').collect();
         let col_def = ColumnDefinition {
             name: parts[0].to_string(),
             data_type: Datatype::from_str(parts[1]).unwrap(),
@@ -48,10 +49,10 @@ fn read_tabledef(table_name: String) -> ::anyhow::Result<TableDefinition> {
         column_defs.push(col_def);
     }
 
-    return Ok(TableDefinition {
+    Ok(TableDefinition {
         name: table_name,
         column_defs,
-    });
+    })
 }
 
 fn handle_insert(command: InsertCommand) -> ::anyhow::Result<()> {
@@ -83,7 +84,7 @@ fn handle_insert(command: InsertCommand) -> ::anyhow::Result<()> {
         }
     }
 
-    return Ok(());
+    Ok(())
 }
 
 fn handle_select(command: SelectCommand) -> ::anyhow::Result<String> {
@@ -114,47 +115,29 @@ fn handle_select(command: SelectCommand) -> ::anyhow::Result<String> {
         response += "\n";
     }
 
-    return Ok(response);
+    Ok(response)
 }
 
-fn run_command(query: String) -> String {
-    let response: String;
+fn run_command(query: String) -> ::anyhow::Result<String> {
     if query.starts_with('\\') {
         // handle PSQL's slash commands e.g.: \dt \d
-        return String::from("Slash commands are not yet supported in SQUIRREL");
+        return Err(anyhow!("Slash commands are not yet supported in SQUIRREL"));
     }
 
-    let command_result: ::anyhow::Result<Command> = Command::from_string(query);
+    let command: Command = Command::from_string(query)?;
 
-    if command_result.is_ok() {
-        let command: Command = command_result.unwrap();
-        response = match command {
-            Command::Create(create_command) => {
-                let result_result = handle_create(create_command);
-                if result_result.is_err() {
-                    String::from("Error creating table.")
-                } else {
-                    String::from("Table created.")
-                }
-            }
-            Command::Insert(insert_command) => {
-                let result = handle_insert(insert_command);
-                if result.is_err() {
-                    result.err().unwrap().to_string()
-                } else {
-                    String::from("Data inserted.")
-                }
-            }
-            Command::Select(select_command) => {
-                return handle_select(select_command).unwrap();
-            }
-            _ => String::from("Invalid command"),
+    match command {
+        Command::Create(create_command) => {
+            handle_create(create_command)?;
+            Ok(String::from("Table Created"))
         }
-    } else {
-        response = command_result.err().unwrap().to_string();
+        Command::Insert(insert_command) => {
+            handle_insert(insert_command)?;
+            Ok(String::from("Row Inserted"))
+        }
+        Command::Select(select_command) => handle_select(select_command),
+        _ => Err(anyhow!("Invalid command")),
     }
-
-    return response;
 }
 
 fn handle_client(mut stream: TcpStream) {
@@ -163,7 +146,7 @@ fn handle_client(mut stream: TcpStream) {
     while match stream.read(&mut data) {
         Ok(_size) => {
             let query_string = String::from_utf8(data.to_vec()).expect("A UTF-8 string");
-            let response: String = run_command(query_string);
+            let response: String = run_command(query_string).unwrap();
 
             let response_data_size = response.len().to_le_bytes();
             stream.write_all(&response_data_size).unwrap(); // send length of message
diff --git a/squirrel-server/src/table/table.rs b/squirrel-server/src/table/table.rs
index 6786d17..463aa96 100644
--- a/squirrel-server/src/table/table.rs
+++ b/squirrel-server/src/table/table.rs
@@ -26,6 +26,6 @@ impl TableDefinition {
                 1
             };
         }
-        return sum;
+        sum
     }
 }