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

Rename validate_create ~> validate_create_table, and expose only what is necessary

Browse source
This commit is contained in:
Yuriy Dupyn 2024-01-28 15:32:12 +01:00
parent 12c91ce70e
commit 4a099468b2
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
parser/src/validation.rs
View file

@ -39,7 +39,7 @@ pub fn validate_operation(syntax: RawQuerySyntax, db_schema: &DbSchema) -> Resul
validate_delete(table_name, condition, db_schema) validate_delete(table_name, condition, db_schema)
}, },
RawQuerySyntax::CreateTable(table_name, schema) => { RawQuerySyntax::CreateTable(table_name, schema) => {
validate_create(table_name, schema, db_schema) validate_create_table(table_name, schema, db_schema)
}, },
RawQuerySyntax::CreateIndex(table_name, column_name) => { RawQuerySyntax::CreateIndex(table_name, column_name) => {
validate_create_index(table_name, column_name, db_schema) validate_create_index(table_name, column_name, db_schema)
@ -53,7 +53,7 @@ fn validate_table_exists<'a>(db_schema: &DbSchema<'a>, table_name: &'a TableName
.map(|(_, table_position, table_schema)| (*table_position, *table_schema)) .map(|(_, table_position, table_schema)| (*table_position, *table_schema))
} }
pub fn validate_create(table_name: TableName, table_schema: TableSchema, db_schema: &DbSchema) -> Result<Operation, ValidationError> { fn validate_create_table(table_name: TableName, table_schema: TableSchema, db_schema: &DbSchema) -> Result<Operation, ValidationError> {
if let Some(_) = get_table_schema(db_schema, &table_name) { if let Some(_) = get_table_schema(db_schema, &table_name) {
return Err(ValidationError::TableAlreadyExists(table_name.to_string())); return Err(ValidationError::TableAlreadyExists(table_name.to_string()));
} }
@ -68,7 +68,7 @@ pub fn validate_create(table_name: TableName, table_schema: TableSchema, db_sche
Ok(Operation::CreateTable(table_name, table_schema)) Ok(Operation::CreateTable(table_name, table_schema))
} }
pub fn validate_select(table_name: TableName, column_selection: syntax::ColumnSelection, condition: Option<syntax::Condition>, db_schema: &DbSchema) -> Result<Operation, ValidationError> { fn validate_select(table_name: TableName, column_selection: syntax::ColumnSelection, condition: Option<syntax::Condition>, db_schema: &DbSchema) -> Result<Operation, ValidationError> {
let (table_position, schema) = validate_table_exists(db_schema, &table_name)?; let (table_position, schema) = validate_table_exists(db_schema, &table_name)?;
match column_selection { match column_selection {
syntax::ColumnSelection::Columns(columns) => { syntax::ColumnSelection::Columns(columns) => {
@ -95,7 +95,7 @@ pub fn validate_select(table_name: TableName, column_selection: syntax::ColumnSe
} }
} }
pub fn validate_insert(table_name: TableName, insertion_values: syntax::InsertionValues, db_schema: &DbSchema) -> Result<Operation, ValidationError> { fn validate_insert(table_name: TableName, insertion_values: syntax::InsertionValues, db_schema: &DbSchema) -> Result<Operation, ValidationError> {
let (table_position, schema) = validate_table_exists(db_schema, &table_name)?; let (table_position, schema) = validate_table_exists(db_schema, &table_name)?;
// Check for duplicate columns in insertion_values. // Check for duplicate columns in insertion_values.
@ -139,7 +139,7 @@ pub fn validate_insert(table_name: TableName, insertion_values: syntax::Insertio
Ok(Operation::Insert(table_position, values)) Ok(Operation::Insert(table_position, values))
} }
pub fn validate_delete(table_name: TableName, condition: Option<syntax::Condition>, db_schema: &DbSchema) -> Result<Operation, ValidationError> { fn validate_delete(table_name: TableName, condition: Option<syntax::Condition>, db_schema: &DbSchema) -> Result<Operation, ValidationError> {
let (table_position, schema) = validate_table_exists(db_schema, &table_name)?; let (table_position, schema) = validate_table_exists(db_schema, &table_name)?;
let validated_condition = validate_condition(condition, schema)?; let validated_condition = validate_condition(condition, schema)?;
Ok(Operation::Delete(table_position, validated_condition)) Ok(Operation::Delete(table_position, validated_condition))