From d71b1cdd4cb9d8e87a5e59e68e0e135e4fd35a9b Mon Sep 17 00:00:00 2001
From: Elias Renman <elias.renman00@gmail.com>
Date: Thu, 23 Nov 2023 22:11:20 +0100
Subject: [PATCH] chore: replaced HashMap with Map

---
 src/database/row.rs              |  5 ++---
 src/database/select_processor.rs | 16 ++++++++--------
 src/main.rs                      |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/database/row.rs b/src/database/row.rs
index 82ff2f4..47b2651 100644
--- a/src/database/row.rs
+++ b/src/database/row.rs
@@ -1,4 +1,3 @@
-use serde_json::Value;
-use std::collections::HashMap;
+use serde_json::{Map, Value};
 
-pub type Row = HashMap<String, Value>;
\ No newline at end of file
+pub type Row = Map<String, Value>;
diff --git a/src/database/select_processor.rs b/src/database/select_processor.rs
index 2910ce5..a31dc69 100644
--- a/src/database/select_processor.rs
+++ b/src/database/select_processor.rs
@@ -16,7 +16,7 @@ impl SelectProcessor {
         table_name: &String,
         row: &Row,
         select: Vec<&str>,
-    ) -> HashMap<String, Value> {
+    ) -> Map<String, Value> {
         let asd = SelectProcessor::parse_node(select);
         println!("Debugging parsed selector {asd}");
         SelectProcessor::recursive_traverse_resolver(database, table_name, row, &asd)
@@ -27,20 +27,20 @@ impl SelectProcessor {
         table_name: &String,
         row: &Row,
         selector: &Value,
-    ) -> HashMap<String, Value> {
+    ) -> Map<String, Value> {
         let object = selector.as_object().unwrap();
-        let mut output: HashMap<String, Value> = HashMap::new();
+        let mut output: Map<String, Value> = Map::new();
         for (key, value) in object.into_iter() {
             if value.is_object() {
                 let relation_rows: Value =
                     SelectProcessor::resolve_relation(database, table_name, row, key);
 
                 if relation_rows.is_array() {
-                  let mut row_vec: Vec<HashMap<String, Value>> = vec![];
-                  for row in relation_rows.as_array().unwrap() {
-                    let asd = Row::from(row.as_object().unwrap());
-                    let parsed_row = SelectProcessor::recursive_traverse_resolver(
-                      database, table_name, &(row.as_object().unwrap()), &value,
+                    let mut row_vec: Vec<Map<String, Value>> = vec![];
+                    for row in relation_rows.as_array().unwrap() {
+                        let asd = row.as_object().unwrap();
+                        let parsed_row = SelectProcessor::recursive_traverse_resolver(
+                            database, table_name, &asd, &value,
                         );
                         row_vec.push(parsed_row);
                     }
diff --git a/src/main.rs b/src/main.rs
index 23d0119..dce5875 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,6 +1,6 @@
 macro_rules! row {
     ($( $key: expr => $val: expr ),*) => {{
-         let mut map: crate::database::row::Row = ::std::collections::HashMap::new();
+      let mut map: crate::database::row::Row = serde_json::Map::new();
          $( map.insert($key.to_string(), serde_json::to_value($val).unwrap()); )*
          map
     }}