sentry - db - validator_message - fix query

Author: elpiel

sentry/src/db/validator_message.rs

@@ -15,20 +15,16 @@ pub async fn get_validator_messages(
     let mut params: Vec<&(dyn ToSql + Sync)> = vec![&channel_id];
 
     if let Some(validator_id) = validator_id {
-        where_clauses.push(format!("from = ${}", params.len() + 1));
+        where_clauses.push(format!(r#""from" = ${}"#, params.len() + 1));
         params.push(validator_id);
     }
 
-    let message_types = message_types.iter().map(|s| format!("'{}'", s)).collect::<Vec<String>>().join(",");
-    if !message_types.is_empty() {
-        where_clauses.push(format!("msg->>'type' IN (${})", params.len() + 1));
-        params.push(dbg!(&message_types));
-    }
+    add_message_types_params(&mut where_clauses, &mut params, message_types);
 
     pool
         .run(move |connection| {
             async move {
-                let statement = format!("SELECT \"from\", msg, received FROM validator_messages WHERE {} ORDER BY received DESC LIMIT {}", where_clauses.join(" AND "), limit);
+                let statement = format!(r#"SELECT "from", msg, received FROM validator_messages WHERE {} ORDER BY received DESC LIMIT {}"#, where_clauses.join(" AND "), limit);
                 match connection.prepare(&statement).await {
                     Ok(select) => match connection.query(&select, params.as_slice()).await {
                         Ok(results) => {
@@ -42,3 +38,15 @@ pub async fn get_validator_messages(
         })
         .await
 }
+
+fn add_message_types_params<'a>(where_clauses: &mut Vec<String>, params: &mut Vec<&'a (dyn ToSql + Sync)>, message_types: &'a [String]) {
+    let mut msg_prep = vec![];
+    for message_type in message_types.iter() {
+        msg_prep.push(format!("${}", params.len() + 1));
+        params.push(message_type);
+    }
+
+    if !msg_prep.is_empty() {
+        where_clauses.push(format!("msg->>'type' IN ({})", msg_prep.join(",")));
+    }
+}