merge #308

balderdashy · Jan 25, 2016 · eb88f4b · eb88f4b
1 parent 44ead20
commit eb88f4b
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lib/query/index.js b/lib/query/index.js
@@ -217,31 +217,31 @@ Query.prototype.parseExpression = function parseExpression(field, expression) {
         // Handle `contains` by building up a case insensitive regex
         if(modifier === 'contains') {
           val = utils.caseInsensitive(val);
-          val =  '.*' + val + '.*';
+          val =  '[\\s\\S]*' + val + '[\\s\\S]*';
           obj['$regex'] = new RegExp('^' + val + '$', 'i');
           return obj;
         }
 
         // Handle `like`
         if(modifier === 'like') {
           val = utils.caseInsensitive(val);
-          val = val.replace(/%/g, '.*');
+          val = val.replace(/%/g, '[\\s\\S]*');
           obj['$regex'] = new RegExp('^' + val + '$', 'i');
           return obj;
         }
 
         // Handle `startsWith` by setting a case-insensitive regex
         if(modifier === 'startsWith') {
           val = utils.caseInsensitive(val);
-          val =  val + '.*';
+          val =  val + '[\\s\\S]*';
           obj['$regex'] = new RegExp('^' + val + '$', 'i');
           return obj;
         }
 
         // Handle `endsWith` by setting a case-insensitive regex
         if(modifier === 'endsWith') {
           val = utils.caseInsensitive(val);
-          val =  '.*' + val;
+          val =  '[\\s\\S]*' + val;
           obj['$regex'] = new RegExp('^' + val + '$', 'i');
           return obj;
         }
@@ -377,10 +377,10 @@ Query.prototype.parseValue = function parseValue(field, modifier, val) {
     if(!validator.isMongoId(val) && !this.config.caseSensitive) {
       // Replace Percent Signs, work in a case insensitive fashion by default
       val = utils.caseInsensitive(val);
-      val = val.replace(/%/g, '.*');
+      val = val.replace(/%/g, '[\\s\\S]*');
       val = new RegExp('^' + val + '$', 'i');
     }
-    
+
     return val;
   }