Removed support for regex from wallet query language.

Signed-off-by: Darko Kulic <[email protected]>

Author: dkulic

libindy/src/services/wallet/language.rs

@@ -68,7 +68,6 @@ pub enum Operator {
     Gte(TagName, TargetValue),
     Lt(TagName, TargetValue),
     Lte(TagName, TargetValue),
-    Regex(TagName, TargetValue),
     Like(TagName, TargetValue),
     In(TagName, Vec<TargetValue>),
 }
@@ -130,7 +129,6 @@ impl Operator {
             Operator::Lt(ref tag_name, ref tag_value) => format!(r#"{}:{{"$lt":{}}}"#, tag_name.to_string(), tag_value.to_string()),
             Operator::Lte(ref tag_name, ref tag_value) => format!(r#"{}:{{"$lte":{}}}"#, tag_name.to_string(), tag_value.to_string()),
             Operator::Like(ref tag_name, ref tag_value) => format!(r#"{}:{{"$like":{}}}"#, tag_name.to_string(), tag_value.to_string()),
-            Operator::Regex(ref tag_name, ref tag_value) => format!(r#"{}:{{"$regex":{}}}"#, tag_name.to_string(), tag_value.to_string()),
             Operator::Not(ref stmt) => format!(r#""$not":{}"#, stmt.to_json(true)),
             Operator::And(ref operators) => format!("{{{}}}", join_operator_strings(operators)),
             Operator::Or(ref operators) => if operators.len() > 0 { format!(r#""$or":[{}]"#, join_operator_strings(operators)) } else { "{}".to_string() },

libindy/src/services/wallet/query_encryption.rs

@@ -43,10 +43,6 @@ fn encrypt_operator(op: Operator, keys: &Keys) -> Result<Operator, WalletQueryEr
             let (encrypted_name, encrypted_value) = encrypt_name_value(&name, value, keys)?;
             Ok(Operator::Like(encrypted_name, encrypted_value))
         },
-        Operator::Regex(name, value) => {
-            let (encrypted_name, encrypted_value) = encrypt_name_value(&name, value, keys)?;
-            Ok(Operator::Regex(encrypted_name, encrypted_value))
-        },
         Operator::In(name, values) => {
             let name = match name {
                 TagName::EncryptedTagName(ref name) => {

libindy/src/services/wallet/storage/default/query.rs

@@ -42,7 +42,6 @@ fn operator_to_sql<'a>(op: &'a Operator, arguments: &mut Vec<&'a ToSql>) -> Resu
         Operator::Lt(ref tag_name, ref target_value) => lt_to_sql(tag_name, target_value, arguments),
         Operator::Lte(ref tag_name, ref target_value) => lte_to_sql(tag_name, target_value, arguments),
         Operator::Like(ref tag_name, ref target_value) => like_to_sql(tag_name, target_value, arguments),
-        Operator::Regex(ref tag_name, ref target_value) => regex_to_sql(tag_name, target_value, arguments),
         Operator::In(ref tag_name, ref target_values) => in_to_sql(tag_name, target_values, arguments),
         Operator::And(ref suboperators) => and_to_sql(suboperators, arguments),
         Operator::Or(ref suboperators) => or_to_sql(suboperators, arguments),