Skip to content

fix: handle proper SQL variable type for operators #1379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 17, 2025
Merged

fix: handle proper SQL variable type for operators #1379

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions src/alerts/alerts_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,14 @@ fn match_alert_operator(expr: &ConditionConfig) -> Expr {
// if it can be parsed as a number, then parse it
// else keep it as a string
if expr.value.as_ref().is_some_and(|v| !v.is_empty()) {
let value = expr.value.as_ref().unwrap();
let value = NumberOrString::from_string(value.clone());
let string_value = expr
.value
.as_ref()
.unwrap()
.replace("'", "\\'")
.replace('%', "\\%")
.replace('_', "\\_");
let value = NumberOrString::from_string(string_value.clone());

// for maintaining column case
let column = format!(r#""{}""#, expr.column);
Expand All @@ -451,28 +457,30 @@ fn match_alert_operator(expr: &ConditionConfig) -> Expr {
WhereConfigOperator::GreaterThan => col(column).gt(lit(value)),
WhereConfigOperator::LessThanOrEqual => col(column).lt_eq(lit(value)),
WhereConfigOperator::GreaterThanOrEqual => col(column).gt_eq(lit(value)),
WhereConfigOperator::ILike => col(column).ilike(lit(value)),
WhereConfigOperator::Contains => col(column).like(lit(value)),
WhereConfigOperator::ILike => col(column).ilike(lit(string_value)),
WhereConfigOperator::Contains => {
col(column).like(lit(format!("%{string_value}%")))
},
WhereConfigOperator::BeginsWith => Expr::BinaryExpr(BinaryExpr::new(
Box::new(col(column)),
Operator::RegexIMatch,
Box::new(lit(format!("^{value}"))),
Box::new(lit(format!("^{string_value}"))),
)),
WhereConfigOperator::EndsWith => Expr::BinaryExpr(BinaryExpr::new(
Box::new(col(column)),
Operator::RegexIMatch,
Box::new(lit(format!("{value}$"))),
Box::new(lit(format!("{string_value}$"))),
)),
WhereConfigOperator::DoesNotContain => col(column).not_ilike(lit(value)),
WhereConfigOperator::DoesNotContain => col(column).not_ilike(lit(string_value)),
WhereConfigOperator::DoesNotBeginWith => Expr::BinaryExpr(BinaryExpr::new(
Box::new(col(column)),
Operator::RegexNotIMatch,
Box::new(lit(format!("^{value}"))),
Box::new(lit(format!("^{string_value}"))),
)),
WhereConfigOperator::DoesNotEndWith => Expr::BinaryExpr(BinaryExpr::new(
Box::new(col(column)),
Operator::RegexNotIMatch,
Box::new(lit(format!("{value}$"))),
Box::new(lit(format!("{string_value}$"))),
)),
_ => unreachable!("value must not be null for operators other than `is null` and `is not null`. Should've been caught in validation")
}
Expand Down
Loading