omedusyo/minisql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix formatting of validation errors

Browse source
This commit is contained in:
Yuriy Dupyn 2024-01-27 17:26:00 +01:00
parent f30d749962
commit 4e5959a53a
1 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

29
parser/src/validation.rs
View file

@ -11,29 +11,20 @@ pub enum ValidationError {
TableDoesNotExist(TableName),
#[error("table {0} already exists")]
TableAlreadyExists(TableName),
// TODO
// #[error("columns {0} do not exist")]
#[error("columns do not exist")]
#[error("columns {0:?} do not exist")]
ColumnsDoNotExist(Vec<ColumnName>),
#[error("duplicate column {0}")]
DuplicateColumn(ColumnName),
// TODO: You need to actually print the error message
#[error("type mismatch")]
TypeMismatch(TypeMismatch),
// TODO
// #[error("values for required columns {0} are missing")]
#[error("values for required columns are missing")]
#[error("type mismatch at column `{column_name:?}` (expected {expected_type:?}, found {received_type:?})")]
TypeMismatch {
column_name: ColumnName,
received_type: DbType,
expected_type: DbType,
},
#[error("values for required columns {0:?} are missing")]
RequiredColumnsAreMissing(Vec<ColumnName>)
}
// TODO: Add derive(Error)
#[derive(Debug)]
pub struct TypeMismatch {
pub column_name: ColumnName,
pub received_type: DbType,
pub expected_type: DbType,
}
pub type DbSchema<'a> = Vec<(TableName, &'a TableSchema)>;
/// Validates the operation based on db_metadata
@ -178,7 +169,7 @@ pub fn validate_insert(table_name: &TableName, insertion_values: &InsertionValue
let expected_type = schema.get_type_at(column_name).ok_or(ValidationError::ColumnsDoNotExist(vec![column_name.to_string()]))?; // By the previous validation steps this is never gonna trigger an error.
let value_type = value.to_type();
if value_type != expected_type {
return Err(ValidationError::TypeMismatch(TypeMismatch { column_name: column_name.to_string(), received_type: value_type, expected_type }));
return Err(ValidationError::TypeMismatch { column_name: column_name.to_string(), received_type: value_type, expected_type });
}
}
@ -199,7 +190,7 @@ fn validate_condition(condition: &Option<Condition>, schema: &TableSchema) -> Re
let expected_type: DbType = schema.get_type_at(column_name).ok_or(ValidationError::ColumnsDoNotExist(vec![column_name.to_string()]))?;
let value_type: DbType = value.to_type();
if !expected_type.eq(&value_type) {
return Err(ValidationError::TypeMismatch(TypeMismatch { column_name: column_name.to_string(), received_type: value_type, expected_type }));
return Err(ValidationError::TypeMismatch { column_name: column_name.to_string(), received_type: value_type, expected_type });
}
}
}