A skeleton for module 'Queries' was implemented

src/main.rs

@@ -27,6 +27,6 @@ use crate::main_module::model::data::data_object::DataObject;
 pub mod main_module;
 
 fn main() {
-    let new_obj = DataObject::new("name", "Oleg");
-    println!("{:?}", new_obj);
+	let new_obj = DataObject::new("name", "Oleg");
+	println!("{:?}", new_obj);
 }

src/main_module/controller/create_table_handler.rs

@@ -25,13 +25,13 @@
 use crate::main_module::model::data::data_handler::DataHandler;
 
 pub struct CreateTableHandler {
-    data_handler: DataHandler,
+	data_handler: DataHandler,
 }
 
 impl CreateTableHandler {
-    pub fn new() -> Self {
-        let data_handler = DataHandler::new();
+	pub fn new() -> Self {
+		let data_handler = DataHandler::new();
 
-        CreateTableHandler { data_handler }
-    }
+		CreateTableHandler { data_handler }
+	}
 }

src/main_module/model/data/data_handler.rs

@@ -22,26 +22,26 @@
  * SOFTWARE.
  */
 
-use std::collections::HashMap;
+use std::collections::{HashMap, HashSet};
 
 use crate::main_module::model::data::table::Table;
 
 pub struct DataHandler {
-    tables: HashMap<String, Table>,
+	tables: HashMap<String, Table>,
 }
 
 impl DataHandler {
-    pub fn new() -> Self {
-        DataHandler {
-            tables: HashMap::new(),
-        }
-    }
+	pub fn new() -> Self {
+		DataHandler {
+			tables: HashMap::new(),
+		}
+	}
 
-    pub fn create_new_table() {
-        todo!()
-    }
+	pub fn create_new_table(str: &str, set: HashSet<String>) {
+		todo!()
+	}
 
-    pub fn insert_into_table() {
-        todo!()
-    }
+	pub fn insert_into_table() {
+		todo!()
+	}
 }

src/main_module/model/data/data_object.rs

@@ -24,15 +24,15 @@
 
 #[derive(Debug)]
 pub struct DataObject {
-    field_name: String,
-    value: String,
+	field_name: String,
+	value: String,
 }
 
 impl DataObject {
-    pub fn new(field_name: &str, field_value: &str) -> Self {
-        DataObject {
-            field_name: String::from(field_name),
-            value: String::from(field_value),
-        }
-    }
+	pub fn new(field_name: &str, field_value: &str) -> Self {
+		DataObject {
+			field_name: String::from(field_name),
+			value: String::from(field_value),
+		}
+	}
 }

src/main_module/model/data/table.rs

@@ -27,74 +27,73 @@ use std::collections::{HashMap, HashSet};
 use crate::main_module::model::data::data_object::DataObject;
 
 pub struct Table {
-    error_id: String,
-    error_arg: String,
-    error_rws: String,
-    column_names: HashSet<String>,
-    rows: HashMap<String, Vec<DataObject>>,
+	error_id: String,
+	error_arg: String,
+	error_rws: String,
+	column_names: HashSet<String>,
+	rows: HashMap<String, Vec<DataObject>>,
 }
 
 impl Table {
-    pub fn new() -> Self {
-        Table {
-            error_id: String::from("[ERROR] [Incorrect ID]"),
-            error_arg: String::from("[ERROR] [Incorrect rows in insert data package"),
-            error_rws: String::from("[ERROR] [Trying to reach an empty row]"),
-            column_names: HashSet::new(),
-            rows: HashMap::new(),
-        }
-    }
-
-    //TODO: implement all these functions
-    fn generate_unique_id() {
-        todo!()
-    }
-
-    fn verify_id() {
-        todo!()
-    }
-
-    fn verify_field() {
-        todo!()
-    }
-
-    fn verify_rows() {
-        todo!()
-    }
-
-    fn verify_column_names_correct() {
-        todo!()
-    }
-
-    fn verify_id_and_field() {
-        todo!()
-    }
-
-    fn verify_id_and_columns() {
-        todo!()
-    }
-
-    pub fn row_is_empty() {
-        todo!()
-    }
-
-    pub fn get_field_value() {
-        todo!()
-    }
-
-    pub fn add_row() {
-        todo!()
-    }
-
-    pub fn return_row() {
-        todo!()
-    }
-
-    pub fn remove_row() {
-        todo!()
-    }
-
-    pub fn update_row_field_values() {
-        todo!()
-    }
+	pub fn new() -> Self {
+		Table {
+			error_id: String::from("[ERROR] [Incorrect ID]"),
+			error_arg: String::from("[ERROR] [Incorrect rows in insert data package"),
+			error_rws: String::from("[ERROR] [Trying to reach an empty row]"),
+			column_names: HashSet::new(),
+			rows: HashMap::new(),
+		}
+	}
+
+	fn generate_unique_id() {
+		todo!()
+	}
+
+	fn verify_id() {
+		todo!()
+	}
+
+	fn verify_field() {
+		todo!()
+	}
+
+	fn verify_rows() {
+		todo!()
+	}
+
+	fn verify_column_names_correct() {
+		todo!()
+	}
+
+	fn verify_id_and_field() {
+		todo!()
+	}
+
+	fn verify_id_and_columns() {
+		todo!()
+	}
+
+	pub fn row_is_empty() {
+		todo!()
+	}
+
+	pub fn get_field_value() {
+		todo!()
+	}
+
+	pub fn add_row() {
+		todo!()
+	}
+
+	pub fn return_row() {
+		todo!()
+	}
+
+	pub fn remove_row() {
+		todo!()
+	}
+
+	pub fn update_row_field_values() {
+		todo!()
+	}
 }

src/main_module/model/mod.rs

@@ -21,5 +21,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 pub mod data;
-pub mod queries;
+pub mod queries;

src/main_module/model/queries/commands/create_table_command.rs

@@ -20,4 +20,27 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- */
+ */
+
+use std::collections::HashSet;
+
+use crate::main_module::model::data::data_handler::DataHandler;
+use crate::main_module::model::queries::commands::querry_command::QueryCommand;
+
+pub struct CreateTableCommand {}
+
+impl QueryCommand for CreateTableCommand {
+	fn execute_command(command_line: String) {
+		let binding = command_line.replace("\\);", "");
+		let binding = binding.split(" \\(");
+		let mut command_addr = binding;
+
+		let table_name = command_addr.next().unwrap();
+		let column_name = command_addr.next().unwrap();
+		let mut column_names: HashSet<String> = HashSet::new();
+		column_names.insert(column_name.to_string());
+		let temp: HashSet<String> = HashSet::new();
+
+		DataHandler::create_new_table(table_name, temp);
+	}
+}

src/main_module/model/queries/commands/insert_into_command.rs

@@ -20,4 +20,14 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- */
+ */
+
+use crate::main_module::model::queries::commands::querry_command::QueryCommand;
+
+pub struct InsertIntoCommand {}
+
+impl QueryCommand for InsertIntoCommand {
+	fn execute_command(command_line: String) {
+		todo!()
+	}
+}

src/main_module/model/queries/commands/mod.rs

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-pub mod abstract_command;
+
 pub mod create_table_command;
 pub mod insert_into_command;
-pub mod querry_command;
+pub mod querry_command;

src/main_module/model/queries/commands/querry_command.rs

@@ -20,4 +20,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- */
+ */
+
+pub trait QueryCommand {
+	fn execute_command(command_line: String);
+}

src/main_module/model/queries/query.rs

@@ -20,4 +20,10 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- */
+ */
+
+use crate::main_module::model::queries::query_element::QueryElement;
+
+pub struct Query {
+	query_elements: Vec<QueryElement>,
+}

src/main_module/model/queries/query_element.rs

@@ -20,4 +20,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- */
+ */
+
+pub struct QueryElement {
+	query_composition: Vec<QueryElement>,
+}

src/main_module/model/queries/query_entity.rs

@@ -20,4 +20,6 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- */
+ */
+
+pub struct QueryEntity {}

src/main_module/model/queries/query_keyword.rs

@@ -20,4 +20,12 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- */
+ */
+
+pub enum QueryKeyword {
+	CREATE_TABLE,
+	SELECT,
+	UPDATE,
+	DELETE,
+	INSERT_INTO,
+}