Added 'like' operator.

Removed unneeded whitespaces on queries.

Author: gbm25

canyon_crud/src/query_elements/operators.rs

@@ -1,5 +1,5 @@
 pub trait Operator {
-    fn as_str(&self) -> &'static str;
+    fn as_str(&self, placeholder_counter: usize) -> String;
 }
 
 /// Enumerated type for represent the comparison operations
@@ -16,17 +16,38 @@ pub enum Comp {
     /// Operator "<" less than value
     Lt,
     /// Operator "=<" less or equals than value
-    LtEq,
+    LtEq
 }
+
 impl Operator for Comp {
-    fn as_str(&self) -> &'static str {
+    fn as_str(&self, placeholder_counter: usize) -> String {
+        match *self {
+            Self::Eq => format!(" = ${placeholder_counter}"),
+            Self::Neq => format!(" <> ${placeholder_counter}"),
+            Self::Gt => format!(" > ${placeholder_counter}"),
+            Self::GtEq => format!(" >= ${placeholder_counter}"),
+            Self::Lt => format!(" < ${placeholder_counter}"),
+            Self::LtEq => format!(" <= ${placeholder_counter}")
+        }
+    }
+}
+
+pub enum Like {
+    /// Operator "LIKE"  as '%pattern%'
+    Full,
+    /// Operator "LIKE"  as '%pattern'
+    Left,
+    /// Operator "LIKE"  as 'pattern%'
+    Right
+}
+
+
+impl Operator for Like {
+    fn as_str(&self, placeholder_counter: usize) -> String {
         match *self {
-            Self::Eq => " = ",
-            Self::Neq => " <> ",
-            Self::Gt => " > ",
-            Self::GtEq => " >= ",
-            Self::Lt => " < ",
-            Self::LtEq => " <= ",
+            Like::Full => format!(" LIKE CONCAT('%', ${placeholder_counter} ,'%') "),
+            Like::Left => format!(" LIKE CONCAT('%', ${placeholder_counter}) "),
+            Like::Right => format!(" LIKE CONCAT(${placeholder_counter} ,'%') "),
         }
     }
 }

canyon_crud/src/query_elements/query_builder.rs

@@ -182,9 +182,7 @@ where
 
         let where_ = String::from(" WHERE ")
             + column_name
-            + op.as_str()
-            + "$"
-            + &(self.query.params.len() + 1).to_string();
+            + &op.as_str(self.query.params.len() + 1);
 
         self.query.sql.push_str(&where_);
         self.query.params.push(value);
@@ -195,10 +193,7 @@ where
 
         let and_ = String::from(" AND ")
             + column_name
-            + op.as_str()
-            + "$"
-            + &(self.query.params.len() + 1).to_string()
-            + " ";
+            + &op.as_str(self.query.params.len() + 1);
 
         self.query.sql.push_str(&and_);
         self.query.params.push(value);
@@ -209,10 +204,7 @@ where
 
         let and_ = String::from(" OR ")
             + column_name
-            + op.as_str()
-            + "$"
-            + &(self.query.params.len() + 1).to_string()
-            + " ";
+            + &op.as_str(self.query.params.len() + 1);
 
         self.query.sql.push_str(&and_);
         self.query.params.push(value);
@@ -246,7 +238,7 @@ where
             self.query.params.push(qp)
         });
 
-        self.query.sql.push_str(") ");
+        self.query.sql.push_str(")");
     }
 
     fn or_values_in<Z, Q>(&mut self, r#or: Z, values: &'a [Q])
@@ -277,7 +269,7 @@ where
             self.query.params.push(qp)
         });
 
-        self.query.sql.push_str(") ");
+        self.query.sql.push_str(")");
     }
 
     #[inline]

tests/crud/querybuilder_operations.rs

@@ -34,7 +34,7 @@ fn test_generated_sql_by_the_select_querybuilder() {
     // generated SQL by the SelectQueryBuilder<T> is the spected
     assert_eq!(
         select_with_joins.read_sql(),
-        "SELECT * FROM league INNER JOIN tournament ON league.id = tournament.league_id LEFT JOIN team ON tournament.id = player.tournament_id WHERE id > $1 AND name = $2  AND name IN ($2, $3) "
+        "SELECT * FROM league INNER JOIN tournament ON league.id = tournament.league_id LEFT JOIN team ON tournament.id = player.tournament_id WHERE id > $1 AND name = $2 AND name IN ($2, $3)"
     )
 }
 
@@ -239,7 +239,7 @@ fn test_or_clause_with_in_constraint() {
 
     assert_eq!(
         l.read_sql(),
-        "SELECT * FROM league WHERE name = $1 OR id IN ($1, $2, $3) "
+        "SELECT * FROM league WHERE name = $1 OR id IN ($1, $2, $3)"
     )
 }