From 4a099468b28a2e15dbd6fafb47b5412242e29c86 Mon Sep 17 00:00:00 2001 From: Yuriy Dupyn <2153100+omedusyo@users.noreply.github.com> Date: Sun, 28 Jan 2024 15:32:12 +0100 Subject: [PATCH] Rename validate_create ~> validate_create_table, and expose only what is necessary --- parser/src/validation.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/parser/src/validation.rs b/parser/src/validation.rs index 7ab8021..b4dc383 100644 --- a/parser/src/validation.rs +++ b/parser/src/validation.rs @@ -39,7 +39,7 @@ pub fn validate_operation(syntax: RawQuerySyntax, db_schema: &DbSchema) -> Resul validate_delete(table_name, condition, db_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) => { 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)) } -pub fn validate_create(table_name: TableName, table_schema: TableSchema, db_schema: &DbSchema) -> Result { +fn validate_create_table(table_name: TableName, table_schema: TableSchema, db_schema: &DbSchema) -> Result { if let Some(_) = get_table_schema(db_schema, &table_name) { 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)) } -pub fn validate_select(table_name: TableName, column_selection: syntax::ColumnSelection, condition: Option, db_schema: &DbSchema) -> Result { +fn validate_select(table_name: TableName, column_selection: syntax::ColumnSelection, condition: Option, db_schema: &DbSchema) -> Result { let (table_position, schema) = validate_table_exists(db_schema, &table_name)?; match column_selection { 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 { +fn validate_insert(table_name: TableName, insertion_values: syntax::InsertionValues, db_schema: &DbSchema) -> Result { let (table_position, schema) = validate_table_exists(db_schema, &table_name)?; // 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)) } -pub fn validate_delete(table_name: TableName, condition: Option, db_schema: &DbSchema) -> Result { +fn validate_delete(table_name: TableName, condition: Option, db_schema: &DbSchema) -> Result { let (table_position, schema) = validate_table_exists(db_schema, &table_name)?; let validated_condition = validate_condition(condition, schema)?; Ok(Operation::Delete(table_position, validated_condition))