Skip to content

Implemented LIKE operator with escape char for PropertyFilter #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yeliu84 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Implemented LIKE operator with escape char for PropertyFilter #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 49 additions & 3 deletions lib/persistence.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1319,6 +1319,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) {
Expand Down Expand Up @@ -1488,10 +1526,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) {
Expand Down Expand Up @@ -1529,6 +1568,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;
}
};

Expand Down Expand Up @@ -1705,12 +1750,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);
Expand Down
10 changes: 10 additions & 0 deletions lib/persistence.store.sql.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,16 @@ function config(persistence, dialect) {
} else {
return aliasPrefix + '`' + this.property + "` NOT IN (" + qs.join(', ') + ")";
}
} else if (this.operator === 'like' || this.operator === 'not like') {
var result = aliasPrefix + '`' + this.property + '` ' + this.operator.toUpperCase() + ' ' + tm.outVar('?', sqlType);
values.push(this.value);

if (this.escapeChar) {
result += ' ESCAPE ' + tm.outVar('?', sqlType);
values.push(this.escapeChar);
}

return result;
} else {
var value = this.value;
if(value === true || value === false) {
Expand Down
24 changes: 23 additions & 1 deletion test/browser/test.persistence.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,29 @@ $(document).ready(function(){
equals(results.length, 2, "'in' filter test");
coll.filter("name", "not in", ["q", "x"]).list(function(results) {
equals(results.length, 24, "'not in' filter test");
callback();
coll.filter("name", "like", "%a%").list(function(results) {
equals(results.length, 1, "'like %a%' filter test");
coll.filter("name", "like", "%a").list(function(results) {
equals(results.length, 1, "'like %a' filter test");
coll.filter("name", "like", "a%").list(function(results) {
equals(results.length, 1, "'like a%' filter test");
coll.filter("name", "like", "_").list(function(results) {
equals(results.length, 26, "'like _' filter test");
coll.filter("name", "not like", "%a%").list(function(results) {
equals(results.length, 25, "'not like %a%' filter test");
coll.filter("name", "not like", "_").list(function(results) {
equals(results.length, 0, "'not like _' filter test");
coll.add(new Task({name: 'Task %'}));
coll.filter("name", "like", "%!%", "!").list(function(results) {
equals(results.length, 1, "'like with escape' filter test");
callback();
});
});
});
});
});
});
});
});
});
});
Expand Down