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

post table data not foreign key proper push

Browse Source
This commit is contained in:
filipriec
2025-03-17 12:08:58 +01:00
parent 3ecfcfee02
commit 65b254f4c2
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
server/src/tables_data/handlers/post_table_data.rs
View File

@@ -73,37 +73,33 @@ pub async fn post_table_data(
columns.push((name, sql_type)); columns.push((name, sql_type));
} }
// Get required relationships // Get all foreign key columns for this table
let required_links = sqlx::query!( let fk_columns = sqlx::query!(
r#"SELECT ltd.table_name r#"SELECT ltd.table_name
FROM table_definition_links tdl FROM table_definition_links tdl
JOIN table_definitions ltd ON tdl.linked_table_id = ltd.id JOIN table_definitions ltd ON tdl.linked_table_id = ltd.id
WHERE tdl.source_table_id = $1 AND tdl.is_required = true"#, WHERE tdl.source_table_id = $1"#,
table_def.id table_def.id
) )
.fetch_all(db_pool) .fetch_all(db_pool)
.await .await
.map_err(|e| Status::internal(format!("Link lookup error: {}", e)))?; .map_err(|e| Status::internal(format!("Foreign key lookup error: {}", e)))?;
// Build required columns list // Build system columns with foreign keys
let mut required_columns = vec![]; let mut system_columns = vec!["deleted".to_string()];
for link in required_links { for fk in fk_columns {
let base_name = link.table_name.split('_').last().unwrap_or(&link.table_name); let base_name = fk.table_name.split('_').last().unwrap_or(&fk.table_name);
required_columns.push(format!("{}_id", base_name)); system_columns.push(format!("{}_id", base_name));
} }
// Validate required columns // Convert to HashSet for faster lookups
for col in &required_columns { let system_columns_set: std::collections::HashSet<_> = system_columns.iter().map(|s| s.as_str()).collect();
if !data.contains_key(col) {
return Err(Status::invalid_argument(format!("Missing required column: {}", col)));
}
}
// Validate all data columns // Validate all data columns
let system_columns = ["deleted"];
let user_columns: Vec<&String> = columns.iter().map(|(name, _)| name).collect(); let user_columns: Vec<&String> = columns.iter().map(|(name, _)| name).collect();
for key in data.keys() { for key in data.keys() {
if !system_columns.contains(&key.as_str()) && !user_columns.contains(&key) { if !system_columns_set.contains(key.as_str()) &&
!user_columns.contains(&&key.to_string()) {
return Err(Status::invalid_argument(format!("Invalid column: {}", key))); return Err(Status::invalid_argument(format!("Invalid column: {}", key)));
} }
} }
@@ -169,9 +165,10 @@ pub async fn post_table_data(
let mut param_idx = 1; let mut param_idx = 1;
for (col, value) in data { for (col, value) in data {
let sql_type = if system_columns.contains(&col.as_str()) { let sql_type = if system_columns_set.contains(col.as_str()) {
match col.as_str() { match col.as_str() {
"deleted" => "BOOLEAN", "deleted" => "BOOLEAN",
_ if col.ends_with("_id") => "BIGINT", // Handle foreign keys
_ => return Err(Status::invalid_argument("Invalid system column")), _ => return Err(Status::invalid_argument("Invalid system column")),
} }
} else { } else {
@@ -206,6 +203,12 @@ pub async fn post_table_data(
params.add(dt.with_timezone(&Utc)) params.add(dt.with_timezone(&Utc))
.map_err(|e| Status::invalid_argument(format!("Failed to add timestamp parameter for {}: {}", col, e)))?; .map_err(|e| Status::invalid_argument(format!("Failed to add timestamp parameter for {}: {}", col, e)))?;
}, },
"BIGINT" => {
let val = value.parse::<i64>()
.map_err(|_| Status::invalid_argument(format!("Invalid integer for {}", col)))?;
params.add(val)
.map_err(|e| Status::invalid_argument(format!("Failed to add integer parameter for {}: {}", col, e)))?;
},
_ => return Err(Status::invalid_argument(format!("Unsupported type {}", sql_type))), _ => return Err(Status::invalid_argument(format!("Unsupported type {}", sql_type))),
} }