Implemented LIKE operator with escape char for PropertyFilter coresmart#145 - Jaux

Author: mdkwock

lib/persistence.js

@@ -24,37 +24,37 @@
  */
 
 if (typeof exports !== 'undefined') {
-	exports.createPersistence = function() {
-		return initPersistence({})
-	}
-	var singleton;
-	if (typeof (exports.__defineGetter__) === 'function') {
-	    exports.__defineGetter__("persistence", function () {
-	        if (!singleton)
-	            singleton = exports.createPersistence();
-	        return singleton;
-	    });
-	} else {
-	    Object.defineProperty(exports, "persistence", {
-	        get: function () {
-	            if (!singleton)
-	                singleton = exports.createPersistence();
-	            return singleton;
-	        },
-	        enumerable: true, configurable: true
-	    });
-	}
+  exports.createPersistence = function() {
+    return initPersistence({});
+  };
+  var singleton;
+  if (typeof (exports.__defineGetter__) === 'function') {
+      exports.__defineGetter__("persistence", function () {
+          if (!singleton)
+              singleton = exports.createPersistence();
+          return singleton;
+      });
+  } else {
+      Object.defineProperty(exports, "persistence", {
+          get: function () {
+              if (!singleton)
+                  singleton = exports.createPersistence();
+              return singleton;
+          },
+          enumerable: true, configurable: true
+      });
+  }
 
 }
 else {
-	window = window || {};
-	window.persistence = initPersistence(window.persistence || {});
+  window = window || {};
+  window.persistence = initPersistence(window.persistence || {});
 }
 
 
 function initPersistence(persistence) {
-	if (persistence.isImmutable) // already initialized
-		return persistence;
+  if (persistence.isImmutable) // already initialized
+    return persistence;
 
 /**
  * Check for immutable fields
@@ -104,7 +104,7 @@ persistence.get = function(arg1, arg2) {
 (function () {
     var entityMeta = {};
     var entityClassCache = {};
-    persistence.getEntityMeta = function() { return entityMeta; }
+    persistence.getEntityMeta = function() { return entityMeta; };
 
     // Per-session data
     persistence.trackedObjects = {};
@@ -137,7 +137,7 @@ persistence.get = function(arg1, arg2) {
       } else {
         this.globalPropertyListeners[key] = [coll];
       }
-    }
+    };
 
     persistence.unsubscribeFromGlobalPropertyListener = function(coll, entityName, property) {
       var key = entityName + '__' + property;
@@ -148,7 +148,7 @@ persistence.get = function(arg1, arg2) {
           return;
         }
       }
-    }
+    };
 
     persistence.propertyChanged = function(obj, property, oldValue, newValue) {
       if(!this.trackedObjects[obj.id]) return; // not yet added, ignore for now
@@ -169,7 +169,7 @@ persistence.get = function(arg1, arg2) {
           }
         }
       }
-    }
+    };
 
     persistence.objectRemoved = function(obj) {
       var entityName = obj._type;
@@ -184,7 +184,7 @@ persistence.get = function(arg1, arg2) {
           }
         }
       }
-    }
+    };
 
     /**
      * Retrieves metadata about entity, mostly for internal use
@@ -247,7 +247,7 @@ persistence.get = function(arg1, arg2) {
      */
     persistence.isDefined = function (entityName) {
         return !!entityMeta[entityName];
-    }
+    };
 
     /**
      * Define a mixin
@@ -745,7 +745,7 @@ persistence.get = function(arg1, arg2) {
         }, function() {
           callback(item);
         });
-      }; // End of buildJson
+      } // End of buildJson
 
       Entity.prototype.fetch = function(tx, rel, callback) {
         var args = argspec.getArgs(arguments, [
@@ -932,7 +932,7 @@ persistence.get = function(arg1, arg2) {
         Entity.all(session).filter(property, "=", value).one(tx, function(obj) {
             callback(obj);
           });
-      }
+      };
 
 
       Entity.index = function(cols,options) {
@@ -991,7 +991,7 @@ persistence.get = function(arg1, arg2) {
           if (meta.isMixin)
             otherMeta.fields[invRel + "_class"] = persistence.typeMapper ? persistence.typeMapper.classNameType : "TEXT";
         }
-      }
+      };
 
       Entity.hasOne = function (refName, otherEntity, inverseProperty) {
         meta.hasOne[refName] = {
@@ -1024,7 +1024,7 @@ persistence.get = function(arg1, arg2) {
             meta.hasMany[it] = mixinMeta.hasMany[it];
           }
         }
-      }
+      };
 
       // Allow decorator functions to add more stuff
       var fns = persistence.entityDecoratorHooks;
@@ -1327,6 +1327,44 @@ persistence.get = function(arg1, arg2) {
       }
     }
 
+     function stringLike(s, pattern, escapeChar) {
+        escapeChar = escapeChar || '';
+  
+        function isSpecial(c) {
+          return c === '%' || c === '_';
+        }
+ 
+       function isEscapeChar(c) {
+          return escapeChar && c === escapeChar;
+        }
+ 
+        function patternToRe() {
+          var re = '^';
+          var c;
+          for (var i = 0, len = pattern.length; i < len; i++) {
+            c = pattern[i];
+            if (isEscapeChar(c)) {
+              c = pattern[i + 1];
+              if (isSpecial(c) || isEscapeChar(c)) {
+                re += c;
+                i++;
+              }
+            } else if (isSpecial(c)) {
+              re += '.';
+              if (c === '%') {
+                re += '*';
+              }
+            } else {
+              re += '[' + c + ']';
+            }
+          }
+          re += '$';
+          return new RegExp(re, 'i');
+        }
+  
+        return patternToRe().test(s);
+      }
+
     ////////////////// QUERY COLLECTIONS \\\\\\\\\\\\\\\\\\\\\\\
 
     function Subscription(obj, eventType, fn) {
@@ -1496,10 +1534,11 @@ persistence.get = function(arg1, arg2) {
      * @param operator the operator to compare with
      * @param value the literal value to compare to
      */
-    function PropertyFilter (property, operator, value) {
+    function PropertyFilter (property, operator, value, escapeChar) {
       this.property = property;
       this.operator = operator.toLowerCase();
       this.value = value;
+      this.escapeChar = escapeChar;
     }
 
     PropertyFilter.prototype.match = function (o) {
@@ -1537,6 +1576,12 @@ persistence.get = function(arg1, arg2) {
       case 'not in':
         return !arrayContains(value, propValue);
         break;
+      case 'like':
+        return stringLike(propValue, value, this.escapeChar);
+        break;
+      case 'not like':
+        return !stringLike(propValue, value, this.escapeChar);
+      break;
       }
     };
 
@@ -1593,7 +1638,7 @@ persistence.get = function(arg1, arg2) {
         this.queryCollectionCache[entityName][uniqueString] = coll;
       }
       return this.queryCollectionCache[entityName][uniqueString];
-    }
+    };
 
     /**
      * The constructor function of the _abstract_ QueryCollection
@@ -1653,7 +1698,7 @@ persistence.get = function(arg1, arg2) {
       this._session = session || persistence;
       // For observable
       this.subscribers = {};
-    }
+    };
 
     QueryCollection.prototype.toUniqueString = function() {
       var s = this._constructor.name + ": " + this._entityName;
@@ -1713,12 +1758,13 @@ persistence.get = function(arg1, arg2) {
      * @param property the property to filter on
      * @param operator the operator to use
      * @param value the literal value that the property should match
+     * @param escapeChar the escape character in pattern
      * @return the query collection with the filter added
      */
-    QueryCollection.prototype.filter = function (property, operator, value) {
+    QueryCollection.prototype.filter = function (property, operator, value, escapeChar) {
       var c = this.clone(true);
       c._filter = new AndFilter(this._filter, new PropertyFilter(property,
-          operator, value));
+          operator, value, escapeChar));
       // Add global listener (TODO: memory leak waiting to happen!)
       var session = this._session;
       c = session.uniqueQueryCollection(c);
@@ -1866,7 +1912,7 @@ persistence.get = function(arg1, arg2) {
       this._filter.makeFit(obj);
       this.triggerEvent('add', this, obj);
       this.triggerEvent('change', this, obj);
-    }
+    };
 
     /**
      * Adds an an array of objects to a collection
@@ -1880,7 +1926,7 @@ persistence.get = function(arg1, arg2) {
         this.triggerEvent('add', this, obj);
       }
       this.triggerEvent('change', this);
-    }
+    };
 
     /**
      * Removes an object from a collection
@@ -1893,7 +1939,7 @@ persistence.get = function(arg1, arg2) {
       this._filter.makeNotFit(obj);
       this.triggerEvent('remove', this, obj);
       this.triggerEvent('change', this, obj);
-    }
+    };
 
 
     /**
@@ -1923,7 +1969,7 @@ persistence.get = function(arg1, arg2) {
             eachFn(results[i]);
           }
         });
-    }
+    };
 
     // Alias
     QueryCollection.prototype.forEach = QueryCollection.prototype.each;
@@ -1945,7 +1991,7 @@ persistence.get = function(arg1, arg2) {
             oneFn(results[0]);
           }
         });
-    }
+    };
 
     DbQueryCollection.prototype = new QueryCollection();
 
@@ -2009,7 +2055,7 @@ persistence.get = function(arg1, arg2) {
         }
       }
       this.triggerEvent('change', this);
-    }
+    };
 
     ManyToManyDbQueryCollection.prototype.clone = function() {
       var c = DbQueryCollection.prototype.clone.call(this);
@@ -2064,7 +2110,7 @@ persistence.get = function(arg1, arg2) {
         }
       }
       this.triggerEvent('change', this);
-    }
+    };
 
     LocalQueryCollection.prototype.remove = function(obj) {
       var items = this._items;
@@ -2199,25 +2245,25 @@ var argspec = {};
         }
       }
       return argObj;
-    }
+    };
 
     argspec.hasProperty = function(name) {
       return function(obj) {
         return obj && obj[name] !== undefined;
       };
-    }
+    };
 
     argspec.hasType = function(type) {
       return function(obj) {
         return typeof obj === type;
       };
-    }
+    };
 
     argspec.isCallback = function() {
       return function(obj) {
         return obj && obj.apply;
       };
-    }
+    };
   }());
 
 persistence.argspec = argspec;