88 lines
2.7 KiB
Rust
88 lines
2.7 KiB
Rust
|
use log::{error, info};
|
||
|
|
use rhai::Dynamic;
|
||
|
|
use rhai::Engine;
|
||
|
|
use serde_json::{json, Value};
|
||
|
|
use sqlx::PgPool;
|
||
|
|
|
||
|
|
use crate::shared::state::AppState;
|
||
|
|
use crate::shared::utils;
|
||
|
|
use crate::shared::utils::row_to_json;
|
||
|
|
use crate::shared::utils::to_array;
|
||
|
|
|
||
|
|
pub fn find_keyword(state: &AppState, engine: &mut Engine) {
|
||
|
|
let db = state.db_custom.clone();
|
||
|
|
|
||
|
|
engine
|
||
|
|
.register_custom_syntax(&["FIND", "$expr$", ",", "$expr$"], false, {
|
||
|
|
let db = db.clone();
|
||
|
|
|
||
|
|
move |context, inputs| {
|
||
|
|
let table_name = context.eval_expression_tree(&inputs[0])?;
|
||
|
|
let filter = context.eval_expression_tree(&inputs[1])?;
|
||
|
|
let binding = db.as_ref().unwrap();
|
||
|
|
|
||
|
|
// Use the current async context instead of creating a new runtime
|
||
|
|
let binding2 = table_name.to_string();
|
||
|
|
let binding3 = filter.to_string();
|
||
|
|
let fut = execute_find(binding, &binding2, &binding3);
|
||
|
|
|
||
|
|
// Use tokio::task::block_in_place + tokio::runtime::Handle::current().block_on
|
||
|
|
let result =
|
||
|
|
tokio::task::block_in_place(|| tokio::runtime::Handle::current().block_on(fut))
|
||
|
|
.map_err(|e| format!("DB error: {}", e))?;
|
||
|
|
|
||
|
|
if let Some(results) = result.get("results") {
|
||
|
|
let array = to_array(utils::json_value_to_dynamic(results));
|
||
|
|
Ok(Dynamic::from(array))
|
||
|
|
} else {
|
||
|
|
Err("No results".into())
|
||
|
|
}
|
||
|
|
}
|
||
|
|
})
|
||
|
|
.unwrap();
|
||
|
|
}
|
||
|
|
|
||
|
|
pub async fn execute_find(
|
||
|
|
pool: &PgPool,
|
||
|
|
table_str: &str,
|
||
|
|
filter_str: &str,
|
||
|
|
) -> Result<Value, String> {
|
||
|
|
// Changed to String error like your Actix code
|
||
|
|
info!(
|
||
|
|
"Starting execute_find with table: {}, filter: {}",
|
||
|
|
table_str, filter_str
|
||
|
|
);
|
||
|
|
|
||
|
|
let (where_clause, params) = utils::parse_filter(filter_str).map_err(|e| e.to_string())?;
|
||
|
|
|
||
|
|
let query = format!(
|
||
|
|
"SELECT * FROM {} WHERE {} LIMIT 10",
|
||
|
|
table_str, where_clause
|
||
|
|
);
|
||
|
|
info!("Executing query: {}", query);
|
||
|
|
|
||
|
|
// Use the same simple pattern as your Actix code - no timeout wrapper
|
||
|
|
let rows = sqlx::query(&query)
|
||
|
|
.bind(¶ms[0]) // Simplified like your working code
|
||
|
|
.fetch_all(pool)
|
||
|
|
.await
|
||
|
|
.map_err(|e| {
|
||
|
|
error!("SQL execution error: {}", e);
|
||
|
|
e.to_string()
|
||
|
|
})?;
|
||
|
|
|
||
|
|
info!("Query successful, got {} rows", rows.len());
|
||
|
|
|
||
|
|
let mut results = Vec::new();
|
||
|
|
for row in rows {
|
||
|
|
results.push(row_to_json(row).map_err(|e| e.to_string())?);
|
||
|
|
}
|
||
|
|
|
||
|
|
Ok(json!({
|
||
|
|
"command": "find",
|
||
|
|
"table": table_str,
|
||
|
|
"filter": filter_str,
|
||
|
|
"results": results
|
||
|
|
}))
|
||
|
|
}
|