filipriec/komp_ac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing post table script

Browse Source
This commit is contained in:
filipriec
2025-07-20 11:46:00 +02:00
parent 7d1b130b68
commit bcb433d7b2
6 changed files with 155 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
server/src/table_script/handlers/post_table_script.rs
View File

@@ -220,6 +220,42 @@ impl MathValidator {
}
}
/// Valide script is not empty
fn validate_script_basic_syntax(script: &str) -> Result<(), Status> {
let trimmed = script.trim();
// Check for empty script
if trimmed.is_empty() {
return Err(Status::invalid_argument("Script cannot be empty"));
}
// Basic parentheses balance check
let mut paren_count = 0;
for ch in trimmed.chars() {
match ch {
'(' => paren_count += 1,
')' => {
paren_count -= 1;
if paren_count < 0 {
return Err(Status::invalid_argument("Unbalanced parentheses: closing ')' without matching opening '('"));
}
},
_ => {}
}
}
if paren_count != 0 {
return Err(Status::invalid_argument("Unbalanced parentheses: missing closing parentheses"));
}
// Check for basic S-expression structure
if !trimmed.starts_with('(') {
return Err(Status::invalid_argument("Script must start with an opening parenthesis '('"));
}
Ok(())
}
/// Parse Steel script and extract column references used in mathematical contexts
fn extract_math_column_references(script: &str) -> Result<Vec<(String, String)>, String> {
let mut parser = Parser::new(script);
@@ -554,6 +590,9 @@ pub async fn post_table_script(
db_pool: &PgPool,
request: PostTableScriptRequest,
) -> Result<TableScriptResponse, Status> {
// Basic script validation first
validate_script_basic_syntax(&request.script)?;
// Start a transaction for ALL operations - critical for atomicity
let mut tx = db_pool.begin().await
.map_err(|e| Status::internal(format!("Failed to start transaction: {}", e)))?;

38
server/tests/table_script/comprehensive_error_scenarios_tests.rs
View File

@@ -1,7 +1,7 @@
// tests/table_script/comprehensive_error_scenarios_tests.rs
use crate::common::setup_isolated_db;
use multieko2_server::table_script::handlers::post_table_script::post_table_script;
use server::table_script::handlers::post_table_script::post_table_script; // Fixed import
use common::proto::multieko2::table_script::PostTableScriptRequest;
use rstest::*;
use serde_json::json;
@@ -52,43 +52,43 @@ pub fn error_scenarios() -> Vec<(&'static str, &'static str, Vec<&'static str>,
(
"bigint_target",
r#"(+ "10" "20")"#,
vec!["prohibited", "BIGINT", "target"],
vec!["cannot", "create", "script", "bigint"],
"BIGINT target column should be rejected"
),
(
"date_target",
r#"(+ "10" "20")"#,
vec!["prohibited", "DATE", "target"],
vec!["cannot", "create", "script", "date"],
"DATE target column should be rejected"
),
(
"timestamp_target",
r#"(+ "10" "20")"#,
vec!["prohibited", "TIMESTAMPTZ", "target"],
vec!["cannot", "create", "script", "timestamptz"],
"TIMESTAMPTZ target column should be rejected"
),
(
"valid_numeric",
r#"(+ (steel_get_column "error_table" "text_col") "10")"#,
vec!["mathematical", "TEXT", "operations"],
vec!["mathematical", "text", "operations"],
"TEXT in mathematical operations should be rejected"
),
(
"valid_numeric",
r#"(* (steel_get_column "error_table" "boolean_col") "5")"#,
vec!["mathematical", "BOOLEAN", "operations"],
vec!["mathematical", "boolean", "operations"],
"BOOLEAN in mathematical operations should be rejected"
),
(
"valid_numeric",
r#"(/ (steel_get_column "error_table" "bigint_col") "2")"#,
vec!["mathematical", "BIGINT", "operations"],
vec!["mathematical", "bigint", "operations"],
"BIGINT in mathematical operations should be rejected"
),
(
"valid_numeric",
r#"(sqrt (steel_get_column "error_table" "date_col"))"#,
vec!["mathematical", "DATE", "operations"],
vec!["mathematical", "date", "operations"],
"DATE in mathematical operations should be rejected"
),
(
@@ -140,7 +140,7 @@ async fn test_comprehensive_error_scenarios(
table_definition_id: table_id,
target_column: target_column.to_string(),
script: script.to_string(),
description: Some(description.to_string()),
description: description.to_string(), // Fixed: removed Some()
};
let result = post_table_script(&pool, request).await;
@@ -178,7 +178,7 @@ async fn test_malformed_script_scenarios(
table_definition_id: table_id,
target_column: "result".to_string(),
script: script.to_string(),
description: Some(description.to_string()),
description: description.to_string(), // Fixed: removed Some()
};
let result = post_table_script(&pool, request).await;
@@ -209,7 +209,7 @@ async fn test_dependency_cycle_detection() {
table_definition_id: table_a_id,
target_column: "result_a".to_string(),
script: script_a.to_string(),
description: Some("First dependency".to_string()),
description: "First dependency".to_string(), // Fixed: removed Some()
};
let result_a = post_table_script(&pool, request_a).await;
@@ -221,7 +221,7 @@ async fn test_dependency_cycle_detection() {
table_definition_id: table_b_id,
target_column: "result_b".to_string(),
script: script_b.to_string(),
description: Some("Circular dependency attempt".to_string()),
description: "Circular dependency attempt".to_string(), // Fixed: removed Some()
};
let result_b = post_table_script(&pool, request_b).await;
@@ -265,7 +265,7 @@ async fn test_edge_case_identifiers(
table_definition_id: table_id,
target_column: "result".to_string(),
script,
description: Some(description.to_string()),
description: description.to_string(), // Fixed: removed Some()
};
let result = post_table_script(&pool, request).await;
@@ -307,7 +307,7 @@ async fn test_sql_injection_prevention() {
table_definition_id: table_id,
target_column: "result".to_string(),
script: script.to_string(),
description: Some("SQL injection attempt".to_string()),
description: "SQL injection attempt".to_string(), // Fixed: removed Some()
};
let result = post_table_script(&pool, request).await;
@@ -367,7 +367,7 @@ async fn test_performance_with_deeply_nested_expressions() {
table_definition_id: table_id,
target_column: "performance_result".to_string(),
script: deeply_nested_script.to_string(),
description: Some("Performance test with deeply nested expressions".to_string()),
description: "Performance test with deeply nested expressions".to_string(), // Fixed: removed Some()
};
let start_time = std::time::Instant::now();
@@ -404,7 +404,7 @@ async fn test_concurrent_script_creation() {
table_definition_id: table_id,
target_column: "result1".to_string(),
script: r#"(+ (steel_get_column "concurrent_test" "value") "10")"#.to_string(),
description: Some("Concurrent script 1".to_string()),
description: "Concurrent script 1".to_string(), // Fixed: removed Some()
};
post_table_script(&pool, request).await
}
@@ -416,7 +416,7 @@ async fn test_concurrent_script_creation() {
table_definition_id: table_id,
target_column: "result2".to_string(),
script: r#"(* (steel_get_column "concurrent_test" "value") "2")"#.to_string(),
description: Some("Concurrent script 2".to_string()),
description: "Concurrent script 2".to_string(), // Fixed: removed Some()
};
post_table_script(&pool, request).await
}
@@ -428,7 +428,7 @@ async fn test_concurrent_script_creation() {
table_definition_id: table_id,
target_column: "result3".to_string(),
script: r#"(/ (steel_get_column "concurrent_test" "value") "3")"#.to_string(),
description: Some("Concurrent script 3".to_string()),
description: "Concurrent script 3".to_string(), // Fixed: removed Some()
};
post_table_script(&pool, request).await
}
@@ -463,7 +463,7 @@ async fn test_error_message_localization_and_clarity() {
table_definition_id: table_id,
target_column: "result".to_string(),
script: script.to_string(),
description: Some("Error message clarity test".to_string()),
description: "Error message clarity test".to_string(), // Fixed: removed Some()
};
let result = post_table_script(&pool, request).await;

20
server/tests/table_script/mathematical_operations_tests.rs
View File

@@ -1,7 +1,7 @@
// tests/table_script/mathematical_operations_tests.rs
use crate::common::setup_isolated_db;
use multieko2_server::table_script::handlers::post_table_script::post_table_script;
use server::table_script::handlers::post_table_script::post_table_script; // Fixed import
use common::proto::multieko2::table_script::PostTableScriptRequest;
use rstest::*;
use serde_json::json;
@@ -106,7 +106,7 @@ async fn test_steel_decimal_literal_operations(
table_definition_id: table_id,
target_column: "result".to_string(),
script,
description: Some(format!("Steel decimal {} with literals", operation)),
description: format!("Steel decimal {} with literals", operation), // Fixed: removed Some()
};
let result = post_table_script(&pool, request).await;
@@ -158,7 +158,7 @@ async fn test_steel_decimal_column_operations(
table_definition_id: table_id,
target_column: "result".to_string(),
script,
description: Some(format!("Steel decimal {} with {} column", operation, column_type)),
description: format!("Steel decimal {} with {} column", operation, column_type), // Fixed: removed Some()
};
let result = post_table_script(&pool, request).await;
@@ -205,7 +205,7 @@ async fn test_complex_financial_calculation(
table_definition_id: table_id,
target_column: "compound_interest".to_string(),
script: compound_script.to_string(),
description: Some("Complex compound interest calculation".to_string()),
description: "Complex compound interest calculation".to_string(), // Fixed: removed Some()
};
let result = post_table_script(&pool, request).await;
@@ -239,7 +239,7 @@ async fn test_scientific_precision_calculations() {
table_definition_id: table_id,
target_column: "scientific_result".to_string(),
script: scientific_script.to_string(),
description: Some("High precision scientific calculation".to_string()),
description: "High precision scientific calculation".to_string(), // Fixed: removed Some()
};
let result = post_table_script(&pool, request).await;
@@ -272,7 +272,7 @@ async fn test_precision_boundary_conditions(
table_definition_id: table_id,
target_column: "result".to_string(),
script: script.to_string(),
description: Some(description.to_string()),
description: description.to_string(), // Fixed: removed Some()
};
let result = post_table_script(&pool, request).await;
@@ -305,7 +305,7 @@ async fn test_mixed_integer_and_numeric_operations() {
table_definition_id: table_id,
target_column: "total_with_tax".to_string(),
script: mixed_script.to_string(),
description: Some("Mixed INTEGER and NUMERIC calculation".to_string()),
description: "Mixed INTEGER and NUMERIC calculation".to_string(), // Fixed: removed Some()
};
let result = post_table_script(&pool, request).await;
@@ -351,7 +351,7 @@ async fn test_mathematical_edge_cases(
table_definition_id: table_id,
target_column: "result".to_string(),
script,
description: Some(description.to_string()),
description: description.to_string(), // Fixed: removed Some()
};
// Note: These operations should either succeed (if steel_decimal handles them gracefully)
@@ -402,7 +402,7 @@ async fn test_comparison_operations_with_valid_types() {
table_definition_id: table_id,
target_column: "comparison_result".to_string(),
script,
description: Some(format!("Comparison operation: {}", operation)),
description: format!("Comparison operation: {}", operation), // Fixed: removed Some()
};
let result = post_table_script(&pool, request).await;
@@ -445,7 +445,7 @@ async fn test_nested_mathematical_expressions() {
table_definition_id: table_id,
target_column: "nested_result".to_string(),
script: nested_script.to_string(),
description: Some("Deeply nested mathematical expression".to_string()),
description: "Deeply nested mathematical expression".to_string(), // Fixed: removed Some()
};
let result = post_table_script(&pool, request).await;

6
server/tests/table_script/mod.rs
View File

@@ -1,5 +1,9 @@
// tests/table_script/mod.rs
pub mod prohibited_types_test;
// pub mod post_scripts_integration_tests;
// pub mod prohibited_types_test;
// pub mod type_safety_comprehensive_tests;
// pub mod mathematical_operations_tests;
pub mod comprehensive_error_scenarios_tests;
// // tests/table_script/mod.rs

20
server/tests/table_script/post_scripts_integration_tests.rs
View File

@@ -1,11 +1,11 @@
// tests/table_script/post_scripts_integration_tests.rs
#[cfg(test)]
mod integration_tests {
use super::*;
use sqlx::PgPool;
use tokio_test;
use serde_json::json;
use common::proto::multieko2::table_script::{PostTableScriptRequest, TableScriptResponse};
use std::collections::HashMap;
use server::table_script::handlers::post_table_script::post_table_script;
/// Test utilities for table script integration testing
pub struct TableScriptTestHelper {
@@ -65,7 +65,7 @@ mod integration_tests {
table_definition_id: table_id,
target_column: target_column.to_string(),
script: script.to_string(),
description: Some("Test script".to_string()),
description: "Test script".to_string(), // Fixed: removed Some()
};
post_table_script(&self.pool, request).await
@@ -461,10 +461,10 @@ mod integration_tests {
#[cfg(test)]
mod steel_decimal_integration_tests {
use super::*;
use crate::steel::server::execution::execute_script;
use server::steel::server::execution::execute_script;
use std::sync::Arc;
use std::collections::HashMap;
use sqlx::PgPool; // Fixed: added PgPool import
#[tokio::test]
async fn test_steel_decimal_execution_with_valid_types() {
@@ -524,7 +524,7 @@ mod steel_decimal_integration_tests {
assert!(result.is_ok(), "Steel decimal should handle high precision calculations");
if let Ok(crate::steel::server::execution::Value::Strings(values)) = result {
if let Ok(server::steel::server::execution::Value::Strings(values)) = result {
assert!(!values.is_empty(), "Should return calculated values");
// The result should maintain precision
let result_value: f64 = values[0].parse().unwrap_or(0.0);
@@ -548,10 +548,8 @@ pub mod test_config {
.unwrap_or_else(|_| "postgresql://postgres:postgres@localhost/multieko2_test".to_string())
);
// Initialize logging for tests if needed
let _ = env_logger::builder()
.filter_level(log::LevelFilter::Warn)
.try_init();
// Initialize logging for tests if needed (removed env_logger dependency)
println!("Test environment initialized");
});
}
}

18
server/tests/table_script/type_safety_comprehensive_tests.rs
View File

@@ -1,7 +1,7 @@
// tests/table_script/type_safety_comprehensive_tests.rs
use crate::common::setup_isolated_db;
use multieko2_server::table_script::handlers::post_table_script::post_table_script;
use server::table_script::handlers::post_table_script::post_table_script;
use common::proto::multieko2::table_script::PostTableScriptRequest;
use rstest::*;
use serde_json::json;
@@ -148,7 +148,7 @@ async fn test_allowed_types_in_math_operations(
table_definition_id: table_id,
target_column: "result".to_string(),
script,
description: Some(description.to_string()),
description: description.to_string(),
};
let result = post_table_script(&pool, request).await;
@@ -197,7 +197,7 @@ async fn test_prohibited_types_in_math_operations(
table_definition_id: table_id,
target_column: "result".to_string(),
script,
description: Some(description.to_string()),
description: description.to_string(),
};
let result = post_table_script(&pool, request).await;
@@ -237,7 +237,7 @@ async fn test_prohibited_target_column_types(
table_definition_id: table_id,
target_column: target_column.to_string(),
script: script.to_string(),
description: Some(description.to_string()),
description: description.to_string(),
};
let result = post_table_script(&pool, request).await;
@@ -269,7 +269,7 @@ async fn test_system_column_restrictions(#[case] target_column: &str, #[case] de
table_definition_id: table_id,
target_column: target_column.to_string(),
script: script.to_string(),
description: Some(description.to_string()),
description: description.to_string(),
};
let result = post_table_script(&pool, request).await;
@@ -334,7 +334,7 @@ async fn test_comprehensive_type_matrix() {
table_definition_id: table_id,
target_column: target_col.to_string(),
script,
description: Some(format!("Matrix test: {} {} -> {}", source_col, operation, target_col)),
description: format!("Matrix test: {} {} -> {}", source_col, operation, target_col),
};
let result = post_table_script(&pool, request).await;
@@ -382,7 +382,7 @@ async fn test_complex_mathematical_expressions() {
table_definition_id: table_id,
target_column: "compound_result".to_string(),
script: complex_script.to_string(),
description: Some("Complex compound interest calculation".to_string()),
description: "Complex compound interest calculation".to_string(),
};
let result = post_table_script(&pool, request).await;
@@ -407,7 +407,7 @@ async fn test_nonexistent_column_reference() {
table_definition_id: table_id,
target_column: "result".to_string(),
script: script.to_string(),
description: Some("Test nonexistent column".to_string()),
description: "Test nonexistent column".to_string(),
};
let result = post_table_script(&pool, request).await;
@@ -439,7 +439,7 @@ async fn test_nonexistent_table_reference() {
table_definition_id: table_id,
target_column: "result".to_string(),
script: script.to_string(),
description: Some("Test nonexistent table".to_string()),
description: "Test nonexistent table".to_string(),
};
let result = post_table_script(&pool, request).await;