diff --git a/minisql/src/internals/schema.rs b/minisql/src/internals/schema.rs index eb65451..afda2c3 100644 --- a/minisql/src/internals/schema.rs +++ b/minisql/src/internals/schema.rs @@ -1,5 +1,6 @@ use std::collections::HashMap; use bimap::BiMap; +use crate::result::DbResult; use crate::operation::{InsertionValues, ColumnSelection}; use crate::internals::row::{Row, ColumnPosition}; use crate::type_system::{DbType, Value, IndexableValue, UUID}; @@ -16,11 +17,8 @@ pub struct TableSchema { } pub type TableName = String; - pub type ColumnName = String; -pub type DbResult = Result; - impl TableSchema { fn get_column(&self, column_name: &ColumnName) -> DbResult<(DbType, ColumnPosition)> { match self.column_name_position_mapping.get_by_left(column_name) { diff --git a/minisql/src/internals/table.rs b/minisql/src/internals/table.rs index 33dc5cd..f2e4ab6 100644 --- a/minisql/src/internals/table.rs +++ b/minisql/src/internals/table.rs @@ -1,8 +1,9 @@ use std::collections::{BTreeMap, HashMap, HashSet}; +use crate::result::DbResult; use crate::type_system::{UUID, Value, IndexableValue}; use crate::error::Error; -use crate::internals::schema::{TableSchema, ColumnName, DbResult}; +use crate::internals::schema::{TableSchema, ColumnName}; use crate::internals::row::{Row, ColumnPosition}; use crate::internals::column_index::ColumnIndex; diff --git a/minisql/src/interpreter.rs b/minisql/src/interpreter.rs index 34d6b14..20d803c 100644 --- a/minisql/src/interpreter.rs +++ b/minisql/src/interpreter.rs @@ -1,6 +1,7 @@ use bimap::BiMap; +use crate::result::DbResult; use crate::type_system::{Value, DbType, IndexableValue}; -use crate::internals::schema::{TableName, TableSchema, ColumnName, DbResult}; +use crate::internals::schema::{TableName, TableSchema, ColumnName}; use crate::internals::table::Table; use crate::internals::row::{Row, ColumnPosition}; use crate::error::Error; diff --git a/minisql/src/main.rs b/minisql/src/main.rs index f3c39ae..ec3dd18 100644 --- a/minisql/src/main.rs +++ b/minisql/src/main.rs @@ -1,3 +1,4 @@ +mod result; mod internals; mod operation; mod interpreter; diff --git a/minisql/src/result.rs b/minisql/src/result.rs new file mode 100644 index 0000000..fcad8b5 --- /dev/null +++ b/minisql/src/result.rs @@ -0,0 +1,3 @@ +use crate::error::Error; + +pub type DbResult = Result;