Tweak regexp operations, fixes #282

Author: jenssegers

src/Jenssegers/Mongodb/Query/Builder.php

@@ -832,13 +832,30 @@ protected function compileWhereBasic($where)
             $operator = '=';
             $regex = str_replace('%', '', $value);
 
-            // Prepare regex
-            if (substr($value, 0, 1) != '%') $regex = '^' . $regex;
-            if (substr($value, -1) != '%')   $regex = $regex . '$';
+            // Convert like to regular expression.
+            if (starts_with($value, '%')) $regex = '^' . $regex;
+            if (ends_with($value, '%'))   $regex = $regex . '$';
 
             $value = new MongoRegex("/$regex/i");
         }
 
+        // Manipulate regexp operations.
+        elseif (in_array($operator, array('regexp', 'not regexp', 'regex', 'not regex')))
+        {
+            // Automatically convert regular expression strings to MongoRegex objects.
+            if ( ! $value instanceof MongoRegex)
+            {
+                $value = new MongoRegex($value);
+            }
+
+            // For inverse regexp operations, we can just use the $not operator
+            // and pass it a MongoRegex instence.
+            if (starts_with($operator, 'not'))
+            {
+                $operator = 'not';
+            }
+        }
+
         if ( ! isset($operator) or $operator == '=')
         {
             $query = array($column => $value);

tests/QueryBuilderTest.php

@@ -540,6 +540,12 @@ public function testOperators()
 		$results = DB::collection('users')->where('name', 'REGEX', $regex)->get();
 		$this->assertEquals(2, count($results));
 
+		$results = DB::collection('users')->where('name', 'regexp', '/.*doe/i')->get();
+		$this->assertEquals(2, count($results));
+
+		$results = DB::collection('users')->where('name', 'not regexp', '/.*doe/i')->get();
+		$this->assertEquals(1, count($results));
+
 		DB::collection('users')->insert(array(
 			array(
 				'name' => 'John Doe',