Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion lib/model.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,11 @@ Model.find = function (query, fields, options, callback) {
Object.keys(query).forEach(function (key) {
if(_.isArray(query[key])) {
q.where(key).in(query[key]);
} else {
}
else if ((_.isObject(query[key])) && query[key]['$regex']) {
q.where(key).regex(query[key]['$regex']);
}
else {
q.where(key).equals(query[key]);
}
});
Expand Down
12 changes: 12 additions & 0 deletions lib/query.js
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,14 @@ Query.prototype.in = function () {
return this;
};

Query.prototype.regex = function (regex) {
this.data.stmt.op = 'REGEXP';
// Strip the forward slashes from the JS RegExp object
regex = regex.source;
this.data.stmt.value = regex;
return this;
}

Query.prototype.like = function (value) {
this.data.stmt.op = 'LIKE';
this.data.stmt.value = value;
Expand Down Expand Up @@ -493,6 +501,10 @@ var opPatterns = {
return '('+values.map(function() { return '?'; }).join(',')+')';
},

'REGEXP': function (regex) {
return '?';
},

'IS': function () {
return 'NULL';
}
Expand Down
31 changes: 31 additions & 0 deletions test/query-select-regexp.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
var Query = require('../lib/query');
var assert = require('assert');
var seed = require('./fixtures/seed');
var db = seed.db;
require('mocha');

describe('Select Query', function () {
describe('regexp', function () {
var expectedSQL =
"SELECT "+
"`users`.`id` AS users_id, "+
"`users`.`name` AS users_name "+
"FROM `users` "+
"WHERE `users`.`name` REGEXP ?";
var expectedValues= ['.*[Ss]mith.*'];

it('should generate the proper SQL', function () {
var query = new Query(db.model('User'));
var regex = new RegExp('.*[Ss]mith.*');
query
.select('name')
.where('name')
.regex(regex);
var sql = query.toString();
assert.equal(expectedSQL, sql);
assert.deepEqual(expectedValues, query.values());
});

});
});